Initial commit

src/FormApproverDocument.js

@@ -100,12 +100,13 @@ class FormApprover extends Component {
                                     (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;
-                                console.log(dataRevision)
+                                let responseDataUser = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/userkeyid/' + user_id, { headers: { 'Content-Type': 'application/xml' } })
+                                let dataUser = responseDataUser.data.user_dataCollection.user_data;
                                 for (let i = 0; i < dataRevision.length; i++) {
                                     let dataRevisionTable = {
                                         "rev_code": dataRevision[i].rev_code,
                                         "remark": dataRevision[i].remark,
-                                        "creator": JSON.parse(localStorage.getItem("dataLogin")).user_name[0],
+                                        "creator": dataUser[0].user_name,
                                         "approval": dataRevision[i].approval
                                     }
                                     this.state.dataRevisionHistory.push(dataRevisionTable);

src/FormRevisionDocument.js

@@ -87,11 +87,13 @@ class FormRevision extends Component {
                                 isDocFound = true;
                                 let responseDataRevision = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/revisionkey/' + doc_id, { headers: { 'Content-Type': 'application/xml' } })
                                 let dataRevision = responseDataRevision.data.revisionCollection.revision;
+                                let responseDataUser = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/userkeyid/' + user_id, { headers: { 'Content-Type': 'application/xml' } })
+                                let dataUser = responseDataUser.data.user_dataCollection.user_data;
                                 for (let i = 0; i < dataRevision.length; i++) {
                                     let dataRevisionTable = {
                                         "rev_code": dataRevision[i].rev_code,
                                         "remark": dataRevision[i].remark,
-                                        "creator": JSON.parse(localStorage.getItem("dataLogin")).user_name[0],
+                                        "creator": dataUser[0].user_name,
                                         "approval": dataRevision[i].approval
                                     }
                                     this.state.dataRevisionHistory.push(dataRevisionTable);