Initial commit

src/FormApproverDocument.js

@@ -94,9 +94,9 @@ class FormApprover extends Component {
                             // Check is user valid to open the document
                             if (
                                 (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - " + JSON.parse(localStorage.getItem("dataLogin")).user_name[0] && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Approver") && JSON.parse(localStorage.getItem("dataLDAP"))["Login Name"] == JSON.parse(approver).LoginName) ||
-                                (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Compliance Officer" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer")) ||
-                                (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Manager Representative" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Manager Representative")) ||
-                                (dataRevision[dataRevision.length - 1].status == "Waiting for Additional Approver" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer") ||
+                                (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - " + JSON.parse(localStorage.getItem("dataLogin")).user_name[0] && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer")) ||
+                                (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - " + JSON.parse(localStorage.getItem("dataLogin")).user_name[0] && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Manager Representative")) ||
+                                (dataRevision[dataRevision.length - 1].status == "Waiting for Additional Approver" && JSON.parse(localStorage.getItem("dataLogin")).user_name[0] == "Fery Afanto" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer") ||
                                 (dataRevision[dataRevision.length - 1].status.includes(JSON.parse(localStorage.getItem('dataLogin')).user_name[0])) && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Additional Approver"))
                             ) {
                                 isDocFound = true;
@@ -233,7 +233,7 @@ class FormApprover extends Component {
                     this.setState({ isNotValidLocation: true });
                 }
             } else {
-                this.setState({ isNotValidLocation: true })
+                this.setState({ isNotValidLocation: true });
             }
             if (!this.state.isFormAdditionalApprover) {
                 var self = this;
@@ -699,11 +699,11 @@ class FormApprover extends Component {
                         let tracking, usr;
                         if (dataRevision[i].status.includes(JSON.parse(this.state.approver).EmpFullName)) {
                             usr = "Approver";
-                            tracking = "Waiting for Approval - Compliance Officer";
-                        } else if (dataRevision[i].status == "Waiting for Approval - Compliance Officer") {
+                            tracking = "Waiting for Approval - Fery Afanto";
+                        } else if (dataRevision[i].status == "Waiting for Approval - Fery Afanto") {
                             usr = "Compliance Officer";
-                            tracking = "Waiting for Approval - Manager Representative";
-                        } else if (dataRevision[i].status == "Waiting for Approval - Manager Representative") {
+                            tracking = "Waiting for Approval - Ezra Kurniadi Gunawan";
+                        } else if (dataRevision[i].status == "Waiting for Approval - Ezra Kurniadi Gunawan") {
                             usr = "Manager Representative";
                             if (this.state.documentType == "WI") {
                                 tracking = "Waiting for Publish";
@@ -806,10 +806,10 @@ class FormApprover extends Component {
             let tracking;
             if (dataRevision[dataRevision.length - 1].status.includes(JSON.parse(this.state.approver).EmpFullName)) {
                 tracking = "Document Rejected By " + JSON.parse(this.state.approver).EmpFullName;
-            } else if (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Compliance Officer") {
-                tracking = "Document Rejected By Compliance Officer";
-            } else if (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Manager Representative") {
-                tracking = "Document Rejected By Manager Representative";
+            } else if (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Fery Afanto") {
+                tracking = "Document Rejected By Fery Afanto";
+            } else if (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Ezra Kurniadi Gunawan") {
+                tracking = "Document Rejected By Ezra Kurniadi Gunawan";
             }
             let dataInsertRevision = {
                 "doc_id": this.state.doc_id,
@@ -1277,11 +1277,11 @@ class FormApprover extends Component {
                 if (dataRevision[i].rev_code == this.state.revisionCode) {
                     let tracking, usr = "Approver";
                     if (dataRevision[i].status.includes(JSON.parse(this.state.approver).EmpFullName)) {
-                        tracking = "Waiting for Approval - Compliance Officer";
-                    } else if (dataRevision[i].status == "Waiting for Approval - Compliance Officer") {
+                        tracking = "Waiting for Approval - Fery Afanto";
+                    } else if (dataRevision[i].status == "Waiting for Approval - Fery Afanto") {
                         usr = "Compliance Officer";
-                        tracking = "Waiting for Approval - Manager Representative";
-                    } else if (dataRevision[i].status == "Waiting for Approval - Manager Representative") {
+                        tracking = "Waiting for Approval - Ezra Kurniadi Gunawan";
+                    } else if (dataRevision[i].status == "Waiting for Approval - Ezra Kurniadi Gunawan") {
                         usr = "Manager Representative";
                         if (this.state.documentType == "WI") {
                             tracking = "Waiting for Publish";

src/FormCreateDocument.js

@@ -831,22 +831,22 @@ class FormCreate extends Component {
             let postDataTrail = js2xmlparser.parse("_posttrailinsert", dataTrail);
             let responseInsertTrail = await axios.post(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/trailinsert', postDataTrail, { headers: { 'Content-Type': 'text/xml' } })
             //Send Email Notification
-            let postdataEmail = {
-                "subject": "New Approval Request Document",
-                "name": dataApprover[0].EmpFullName[0],
-                "email": dataApprover[0].EMail[0],
-                "message": "<p>Dengan hormat,</p> \
-                <p>Terdapat pengajuan dokumen dengan No." + this.state.businessUnit + "-" + this.state.documentType + "-" + this.state.revisionCode + " " + this.state.subject + " yang diajukan oleh " + JSON.parse(localStorage.getItem("user"))["Full Name"] + ".<br /> Untuk review dan approval silahkan klik link <a href='http://10.10.86.48:3000'>document management</a></p> \
-                <p>Terimakasih</p> \
-                <p>Regards, \
-                <p>Admin</p><br /> \
-                <p><i>Ini adalah email otomatis, harap jangan me-reply ke alamat email ini</i></p>"
-            }
-            let responseSendEmail = await fetch(process.env.REACT_APP_MAIN_APIURL + '/email', {
-                headers: { 'Content-Type': 'application/json' },
-                method: 'POST',
-                body: JSON.stringify(postdataEmail)
-            })
+            // let postdataEmail = {
+            //     "subject": "New Approval Request Document",
+            //     "name": dataApprover[0].EmpFullName[0],
+            //     "email": dataApprover[0].EMail[0],
+            //     "message": "<p>Dengan hormat,</p> \
+            //     <p>Terdapat pengajuan dokumen dengan No." + this.state.businessUnit + "-" + this.state.documentType + "-" + this.state.revisionCode + " " + this.state.subject + " yang diajukan oleh " + JSON.parse(localStorage.getItem("user"))["Full Name"] + ".<br /> Untuk review dan approval silahkan klik link <a href='http://10.10.86.48:3000'>document management</a></p> \
+            //     <p>Terimakasih</p> \
+            //     <p>Regards, \
+            //     <p>Admin</p><br /> \
+            //     <p><i>Ini adalah email otomatis, harap jangan me-reply ke alamat email ini</i></p>"
+            // }
+            // let responseSendEmail = await fetch(process.env.REACT_APP_MAIN_APIURL + '/email', {
+            //     headers: { 'Content-Type': 'application/json' },
+            //     method: 'POST',
+            //     body: JSON.stringify(postdataEmail)
+            // })
             await this.setState({ submitForm: false });
             alert("Document has been successfully submited");
             this.props.history.push("/yourdocument");

src/YourDocument.js

@@ -50,10 +50,10 @@ class YourDocument extends Component {
                     if ((dataRevision[dataRevision.length - 1].status.includes("Waiting for Approval") || dataRevision[dataRevision.length - 1].status.includes("Waiting for Approver") || dataRevision[dataRevision.length - 1].status.includes("Additional Approver")) && dataAllDocument[i].doc_status[0] == "New") {
                         if (
                             (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - " + JSON.parse(localStorage.getItem("dataLogin")).user_name[0] && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Approver") && JSON.parse(localStorage.getItem("dataLDAP"))["Login Name"] == JSON.parse(dataAllDocument[i].approver[0]).LoginName) ||
-                            (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Compliance Officer" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer")) ||
-                            (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - Manager Representative" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Manager Representative")) ||
-                            (dataRevision[dataRevision.length - 1].status == "Waiting for Additional Approver" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer") ||
-                                (dataRevision[dataRevision.length - 1].status.includes(JSON.parse(localStorage.getItem('dataLogin')).user_name[0])) && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Additional Approver"))
+                            (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - " + JSON.parse(localStorage.getItem("dataLogin")).user_name[0] && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer")) ||
+                            (dataRevision[dataRevision.length - 1].status == "Waiting for Approval - " + JSON.parse(localStorage.getItem("dataLogin")).user_name[0] && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Manager Representative")) ||
+                            (dataRevision[dataRevision.length - 1].status == "Waiting for Additional Approver" && JSON.parse(localStorage.getItem("dataLogin")).user_name[0] == "Fery Afanto" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer") ||
+                            (dataRevision[dataRevision.length - 1].status.includes(JSON.parse(localStorage.getItem('dataLogin')).user_name[0])) && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Additional Approver"))
                         ) {
                             let datarow2 = [];
                             let user_name = "";