Initial commit

src/FormApproverDocument.js

@@ -101,7 +101,6 @@ class FormApprover extends Component {
                             let dataRevision = responseDataRevision.data.revisionCollection.revision;
                             // Check is user valid to open the document
                             if (
-                                JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("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("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 - Management Representative" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Management Representative")) ||
@@ -745,7 +744,7 @@ class FormApprover extends Component {
                 for (let i = 0; i < dataRevision.length; i++) {
                     if (dataRevision[i].rev_code == this.state.revisionCode) {
                         let subject, emailCc, emailSend, message, tracking, usr;
-                        if (dataRevision[i].status.includes(JSON.parse(this.state.approver).EmpFullName)) {
+                        if (dataRevision[i].status == "Waiting for Approval - " + JSON.parse(this.state.approver).EmpFullName) {
                             subject = "Approval Review dan Approval Dokumen " + this.state.businessUnit + "-" + this.state.documentType + "-" + this.state.revisionCode + "-" + this.state.subject;
                             emailCc = "";
                             emailSend = this.state.creator_email;
@@ -1461,7 +1460,7 @@ class FormApprover extends Component {
             for (let i = 0; i < dataRevision.length; i++) {
                 if (dataRevision[i].rev_code == this.state.revisionCode) {
                     let subject, emailCc, emailSend, message, tracking, usr;
-                    if (dataRevision[i].status.includes(JSON.parse(this.state.approver).EmpFullName)) {
+                    if (dataRevision[i].status == "Waiting for Approval - " + JSON.parse(this.state.approver).EmpFullName) {
                         subject = "Approval Review dan Approval Dokumen " + this.state.businessUnit + "-" + this.state.documentType + "-" + this.state.revisionCode + "-" + this.state.subject;
                         emailCc = "";
                         emailSend = this.state.creator_email;

src/FormCreateDocument.js

@@ -737,24 +737,6 @@ class FormCreate extends Component {
             await this.setState({ submitForm: true, validPage: this.state.validPage });
             var js2xmlparser = require('js2xmlparser');
             var parseString = require('xml2js').parseString;
-            // //Send Email Notification
-            // let postdataEmail = {
-            //     "subject": "Permintaan Review dan Approval Dokumen",
-            //     "emailcc": "freezingfrost519@gmail.com",//JSON.parse(localStorage.getItem("dataLogin")).email[0]
-            //     "emailsend": "fajar.ayu.int@visionet.co.id",//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 berikut ini <a href='http://10.10.86.48:3000' target='_blank'>Link Dokumen</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>"
-            // }
-            // //process.env.REACT_APP_MAIN_APIURL
-            // let responseSendEmail = await fetch(process.env.REACT_APP_MAIN_APIURL + '/email', {
-            //     headers: { 'Content-Type': 'application/json' },
-            //     method: 'POST',
-            //     body: JSON.stringify(postdataEmail)
-            // })
             let user_id, doc_id;
             user_id = JSON.parse(localStorage.getItem("dataLogin")).user_id[0];
             //Get data manager creator
@@ -893,8 +875,8 @@ class FormCreate extends Component {
             // //Send Email Notification
             // let postdataEmail = {
             //     "subject": "Permintaan Review dan Approval Dokumen",
-            //     "emailcc": "freezingfrost519@gmail.com",//JSON.parse(localStorage.getItem("dataLogin")).email[0]
-            //     "emailsend": "fajar.ayu.int@visionet.co.id",//dataApprover[0].EMail[0]
+            //     "emailcc": JSON.parse(localStorage.getItem("dataLogin")).email[0],
+            //     "emailsend": 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 berikut ini <a href='http://10.10.86.48:3000' target='_blank'>Link Dokumen</a></p> \
             //     <p>Terimakasih</p> \
@@ -902,7 +884,8 @@ class FormCreate extends Component {
             //     <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', {
+            // //process.env.REACT_APP_MAIN_APIURL
+            // let responseSendEmail = await fetch('http://localhost:9000/email', {
             //     headers: { 'Content-Type': 'application/json' },
             //     method: 'POST',
             //     body: JSON.stringify(postdataEmail)

src/PreviewDocument.js

@@ -153,26 +153,26 @@ class PreviewDocument extends Component {
         // //     }
         // // });
         
-        // let paper1 = document.getElementById('paper1');
-        // let paper2 = document.getElementById('paper2');
-        // let paper3 = document.getElementById('paper3');
-        // let paper4 = document.getElementById('paper4');
-        // let canvas1 = await html2canvas(paper1);
-        // let canvas2 = await html2canvas(paper2);
-        // let canvas3 = await html2canvas(paper3);
-        // let canvas4 = await html2canvas(paper4);
-        // let imagePaper1 = canvas1.toDataURL('image/png');
-        // let imagePaper2 = canvas2.toDataURL('image/png');
-        // let imagePaper3 = canvas3.toDataURL('image/png');
-        // let imagePaper4 = canvas4.toDataURL('image/png');
-        // pdf.addImage(imagePaper1, 'PNG', 0, 0);
-        // pdf.addPage();
-        // pdf.addImage(imagePaper2, 'PNG', 0, 0);
-        // pdf.addPage();
-        // pdf.addImage(imagePaper3, 'PNG', 0, 0);
-        // pdf.addPage();
-        // pdf.addImage(imagePaper4, 'PNG', 0, 0);
-        // pdf.save(title + ".pdf");
+        let paper1 = document.getElementById('paper1');
+        let paper2 = document.getElementById('paper2');
+        let paper3 = document.getElementById('paper3');
+        let paper4 = document.getElementById('paper4');
+        let canvas1 = await html2canvas(paper1);
+        let canvas2 = await html2canvas(paper2);
+        let canvas3 = await html2canvas(paper3);
+        let canvas4 = await html2canvas(paper4);
+        let imagePaper1 = canvas1.toDataURL('image/png');
+        let imagePaper2 = canvas2.toDataURL('image/png');
+        let imagePaper3 = canvas3.toDataURL('image/png');
+        let imagePaper4 = canvas4.toDataURL('image/png');
+        pdf.addImage(imagePaper1, 'PNG', 0, 0);
+        pdf.addPage();
+        pdf.addImage(imagePaper2, 'PNG', 0, 0);
+        pdf.addPage();
+        pdf.addImage(imagePaper3, 'PNG', 0, 0);
+        pdf.addPage();
+        pdf.addImage(imagePaper4, 'PNG', 0, 0);
+        pdf.save(title + ".pdf");
     }
     showApproval = (approval) => {
         let approvalDocument;

src/YourDocument.js

@@ -70,12 +70,11 @@ 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 (
-                            JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("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("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 - Management Representative" && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Management 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.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 = "";