Initial commit

package-lock.json

@@ -8767,6 +8767,11 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
     },
+    "konva": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/konva/-/konva-2.5.1.tgz",
+      "integrity": "sha512-YdHEWqmbWPieqIZuLx7JFGm9Ui08hSUaSJ2k2Ml8o5giFgJ0WmxAS0DPXIM+Ty2ADRagOHZfXSJ/skwYqqlwgQ=="
+    },
     "last-call-webpack-plugin": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
@@ -11614,6 +11619,14 @@
         "whatwg-fetch": "^3.0.0"
       }
     },
+    "react-avatar-edit": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/react-avatar-edit/-/react-avatar-edit-0.8.3.tgz",
+      "integrity": "sha512-QEedh6DjDCSI7AUsUHHtfhxApCWC5hJAoywxUA5PtUdw03iIjEurgVqPOIt1UBHhU/Zk/9amElRF3oepN9JZSg==",
+      "requires": {
+        "konva": "2.5.1"
+      }
+    },
     "react-dev-utils": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.0.0.tgz",

package.json

@@ -14,6 +14,7 @@
     "node-gyp": "^6.1.0",
     "query-string": "^6.10.1",
     "react": "^16.10.2",
+    "react-avatar-edit": "^0.8.3",
     "react-dom": "^16.10.2",
     "react-expand-collapse": "^0.2.0",
     "react-loading": "^2.0.3",

src/CreateDocumentRoute.js

@@ -7,7 +7,7 @@ const CreateDocumentRoute = ({ component: Component, ...rest }) => {
             {...rest}
             render={
                 props =>
-                localStorage.getItem("user") && localStorage.getItem("loginUserRole").includes("Creator") ? (
+                localStorage.getItem("user") && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Creator") ? (
                     <Component {...props} />
                 ) : (
                     <Redirect to={{ pathname: '/', state: { from: props.location } }} />

src/DataTableApprovalDocument.js

+import React, { Component } from 'react';
+import axios from 'axios';
+
+const $ = require('jquery');
+$.DataTable = require('datatables.net');
+
+export class DataTableApprovalDocument extends Component {
+    componentDidMount = () => {
+        this.$el = $(this.el)
+        var table = this.$el.DataTable({
+            data: this.props.data,
+            columns: [
+                { title: "No", width: 30 },
+                { title: "Code" },
+                { title: "Subject" },
+                { title: "Status" },
+                { title: "Tracking" },
+                { title: "Creator" },
+            ],
+            columnDefs: [
+                {
+                    searchable: false,
+                    orderable: false,
+                    targets: 0
+                },
+                {
+                    orderable: false,
+                    targets: 1,
+                    render: function (data, type, row) {
+                        return "<a class='text-decoration-none' href='#'>" + data + "</a>";
+                    }
+                },
+                {
+                    orderable: false,
+                    targets: 2
+                },
+                {
+                    orderable: false,
+                    targets: 3
+                },
+                {
+                    orderable: false,
+                    targets: 4
+                },
+                {
+                    orderable: false,
+                    targets: 5
+                },
+            ],
+            order: [[1, "asc"]],
+            lengthMenu: [[25, 50, 75, 100], [25, 50, 75, 100]]
+        })
+        table.on("order.dt search.dt", function () {
+            table.column(0, { search: "applied", order: "applied" }).nodes().each(function (cell, i) {
+                cell.innerHTML = i + 1;
+            });
+        }).draw();
+        table.on("click", "a", function (e) {
+            e.preventDefault();
+            let data = table.row($(this).parents("tr")).data();
+            window.open("http://10.10.86.48:3000/previewdocument?subject=" + data[2], "_blank");
+        })
+    }
+    componentWillUnmount = () => {
+        this.$el.DataTable.destroy(true);
+    }
+    render() {
+        return (
+            <div>
+                <table className="display" width="100%" ref={el => this.el = el}></table>
+            </div>
+        )
+    }
+}
\ No newline at end of file

src/DataTableYourDocument.js → src/DataTableMyDocument.js

@@ -4,7 +4,7 @@ import axios from 'axios';
 const $ = require('jquery');
 $.DataTable = require('datatables.net');
 
-export class DataTableYourDocument extends Component {
+export class DataTableMyDocument extends Component {
     componentDidMount = () => {
         this.$el = $(this.el)
         var table = this.$el.DataTable({
@@ -16,7 +16,7 @@ export class DataTableYourDocument extends Component {
                 { title: "Status" },
                 { title: "Tracking" },
                 { title: "Creator" },
-                { title: "Withdraw" }
+                { title: "Withdraw", width: 50 }
             ],
             columnDefs: [
                 {

src/DocumentManagement.css

@@ -23,7 +23,7 @@
     width: 90px;
 }
 .button-2 {
-    width: 100px;
+    width: 120px;
 }
 .background-grey {
     background: rgb(50, 50, 50);

src/FormLogin.js

@@ -14,6 +14,7 @@ class FormLogin extends Component {
             submitted: false,
             loggingIn: false,
             isLoginFailed: false,
+            pictures: [],
             errMessage: ""
         }
     }
@@ -49,13 +50,22 @@ class FormLogin extends Component {
                         dataUser = result.user_dataCollection.user_data;
                     })
                     if (dataUser != undefined) {
-                        localStorage.setItem('loginUserDpt', dataUser[0].user_dpt[0]);
-                        localStorage.setItem('loginEmail', dataUser[0].email[0]);
-                        localStorage.setItem('loginUserRole', dataUser[0].user_role[0]);
-                        let store = createStore(sessionReducer);
-                        let todoAction = { type: "add_session", payload: responseDataLoginLDAP.data };
-                        store.dispatch(todoAction);
-                        this.props.history.push("/home"); 
+                        let responseDataProfile = await axios.get('/profile', {
+                            params: {
+                                uid: responseDataLoginLDAP.data["Login Name"],
+                                token: responseDataLoginLDAP.data["Token"],
+                            }
+                        })
+                        if (responseDataProfile != undefined) {
+                            localStorage.setItem('dataProfile', JSON.stringify(responseDataProfile.data));
+                            localStorage.setItem('dataLogin', JSON.stringify(dataUser[0]));
+                            let store = createStore(sessionReducer);
+                            let todoAction = { type: "add_session", payload: responseDataLoginLDAP.data };
+                            store.dispatch(todoAction);
+                            this.props.history.push("/home");
+                        } else {
+                            this.setState({ isLoginFailed: true, loggingIn: false, errMessage: "Your account is not Registered!" })
+                        }
                     } else {
                         this.setState({ isLoginFailed: true, loggingIn: false, errMessage: "Your account is not Registered!" })
                     }

src/ManageUserRoute.js

@@ -7,7 +7,7 @@ const ManageUserRoute = ({ component: Component, ...rest }) => {
             {...rest}
             render={
                 props =>
-                localStorage.getItem("user") && localStorage.getItem("loginUserRole").includes("Admin") ? (
+                localStorage.getItem("user") && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Admin") ? (
                     <Component {...props} />
                 ) : (
                     <Redirect to={{ pathname: '/', state: { from: props.location } }} />

src/YourDocument.js

@@ -2,41 +2,70 @@ import React, { Component } from 'react';
 import { Button } from 'reactstrap';
 import axios from 'axios';
 import Navbar1 from './Navbar';
-import { DataTableYourDocument } from './DataTableYourDocument';
+import { DataTableMyDocument } from './DataTableMyDocument';
+import { DataTableApprovalDocument } from './DataTableApprovalDocument';
 
 class YourDocument extends Component {
     constructor(props) {
         super(props)
         this.state = {
             fetchStatus: false,
-            dataDocument: []
+            dataDocument: [],
+            dataApprovalDocument: [],
         }
     }
     componentDidMount = async () => {
         try {
-            let response1 = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/userkey/' + JSON.parse(localStorage.getItem("user")).Email, { headers: { 'accept': 'application/xml' } });
             var parseString = require('xml2js').parseString;
-            let user_id;
-            parseString(response1.data, function (err, result) {
-                user_id = result.user_dataCollection.user_data[0].user_id[0];
+            let user_id = JSON.parse(localStorage.getItem("dataLogin")).user_id[0];
+            let responseMyDocument = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/mydocument/' + user_id, { headers: { 'accept': 'application/xml' } });
+            let dataMyDocument;
+            parseString(responseMyDocument.data, function (err, result) {
+                dataMyDocument = result.documentCollection.document;
             })
-            let response2 = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/yourdocument/' + user_id, { headers: { 'accept': 'application/xml' } });
-            let data;
-            parseString(response2.data, function (err, result) {
-                data = result.documentCollection.document;
-            })
-            if (data != undefined) {
-                for (let i = 0; i < data.length; i++) {
+            if (dataMyDocument != undefined) {
+                for (let i = 0; i < dataMyDocument.length; i++) {
                     let datarow = [];
                     datarow.push("");
-                    datarow.push(data[i].doc_code[0]);
-                    datarow.push(data[i].subject[0]);
-                    datarow.push(data[i].doc_status[0]);
-                    datarow.push(data[i].tracking[0]);
+                    datarow.push(dataMyDocument[i].doc_code[0]);
+                    datarow.push(dataMyDocument[i].subject[0]);
+                    datarow.push(dataMyDocument[i].doc_status[0]);
+                    datarow.push(dataMyDocument[i].tracking[0] + " - " + JSON.parse(dataMyDocument[i].approver[0]).EmpFullName);
                     datarow.push(JSON.parse(localStorage.getItem("user"))["Full Name"])
                     this.state.dataDocument.push(datarow);
                 }
             }
+            let responseDataUser = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/user', { headers: { 'accept': 'application/xml' } });
+            let dataUser;
+            parseString(responseDataUser.data, function (err, result) {
+                dataUser = result.user_dataCollection.user_data;
+            })
+            let responseApprovalDocument = await axios.get(process.env.REACT_APP_MAIN_APIURL + '/DocumentManagement/approvaldocument', { headers: { 'accept': 'application/xml' } });
+            let dataApprovalDocument;
+            parseString(responseApprovalDocument.data, function (err, result) {
+                dataApprovalDocument = result.documentCollection.document;
+            })
+            if (dataApprovalDocument != undefined) {
+                for (let i = 0; i < dataApprovalDocument.length; i++) {
+                    if (JSON.parse(localStorage.getItem("dataProfile")).LoginName == JSON.parse(dataApprovalDocument[i].approver[0]).LoginName) {
+                        let datarow = [];
+                        let user_name;
+                        for (let j = 0; j < dataUser.length; j++) {
+                            if (dataUser[i].user_id[0] == dataApprovalDocument[i].user_id[0]) {
+                                user_name = dataUser[i].user_name[0];
+                                break;
+                            }
+                        }
+                        datarow.push("");
+                        datarow.push(dataApprovalDocument[i].doc_code[0]);
+                        datarow.push(dataApprovalDocument[i].subject[0]);
+                        datarow.push(dataApprovalDocument[i].doc_status[0]);
+                        datarow.push(dataApprovalDocument[i].tracking[0] + " - " + JSON.parse(dataApprovalDocument[i].approver[0]).EmpFullName);
+                        datarow.push(user_name)
+                        this.state.dataApprovalDocument.push(datarow);
+                    }
+                }
+            }
             this.setState({ fetchStatus: true })
         } catch (error) {
             this.setState({ fetchStatus: true })
@@ -51,12 +80,30 @@ class YourDocument extends Component {
                 <div className="container-fluid">
                     <div className="form-group row">
                         <div className="col-xl-12 col-lg-12 col-md-12 col-sm-12">
-                            <Button className="center-block" color="primary" href="/formcreatedocument" disabled={ !localStorage.getItem("loginUserRole").includes("Creator") }>Create New Document</Button>
+                            <Button className="center-block" color="primary" href="/formcreatedocument" disabled={!JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Creator")}>Create New Document</Button>
                         </div>
                     </div>
                     {
-                        this.state.fetchStatus == true &&
-                        <DataTableYourDocument data={this.state.dataDocument}></DataTableYourDocument>
+                        this.state.fetchStatus == true && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Creator") &&
+                        <div>
+                            <div className="form-group row">
+                                <div className="col-xl-12 col-lg-12 col-md-12 col-sm-12">
+                                    <h3>My Document</h3>
+                                </div>
+                            </div>
+                            <DataTableMyDocument data={this.state.dataDocument}></DataTableMyDocument>
+                        </div>
+                    }
+                    {
+                        this.state.fetchStatus == true && JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Approver") &&
+                        <div>
+                            <div className="form-group row">
+                                <div className="col-xl-12 col-lg-12 col-md-12 col-sm-12">
+                                    <h3>Approval Document</h3>
+                                </div>
+                            </div>
+                            <DataTableApprovalDocument data={this.state.dataApprovalDocument}></DataTableApprovalDocument>
+                        </div>
                     }
                 </div>
             </div>

src/YourDocumentRoute.js

@@ -7,10 +7,11 @@ const YourDocumentRoute = ({ component: Component, ...rest }) => {
             {...rest}
             render={
                 props =>
-                localStorage.getItem("user") && (localStorage.getItem("loginUserRole").includes("Approver") ||
-                localStorage.getItem("loginUserRole").includes("Compliance Officer") || 
-                localStorage.getItem("loginUserRole").includes("Creator") ||
-                localStorage.getItem("loginUserRole").includes("Manager Representative")) ? (
+                localStorage.getItem("user") && (   
+                    JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Approver") ||
+                    JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Compliance Officer") ||
+                    JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Creator") ||
+                    JSON.parse(localStorage.getItem('dataLogin')).user_role[0].includes("Manager Representative")) ? (
                     <Component {...props} />
                 ) : (
                     <Redirect to={{ pathname: '/', state: { from: props.location } }} />