Merge branch 'ENV-DEV' into 'ENV-STAGING'

Env dev

See merge request !2359

package.json

 {
   "name": "my-app",
   "version": "0.1.0",
-  "homepage": "http://localhost:8080/web-staging/", 
+  "homepage": "http://localhost:8080/web/", 
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",

src/api/index.js

@@ -492,6 +492,11 @@ const create = (type = "") => {
   const getDetailDocument = (id) => api.get(`document/get_document_by_id/${id}`)
   const deleteDocument = (id) => api.post(`document/delete_document/${id}`)
   const uploadCarfmDocument = (body) => api.post('document/upload_cafrm_document', body)
+  const getChcmDocumentBySubmenu = (body) => api.post('document/get_chcm_document_by_submenu', body);
+  const uploadChcmDocument = (body) => api.post('document/upload_chcm_document', body)
+  const deleteReportChcm = (id) => api.post(`document/delete_chcm_document/${id}`)
+  const getDetailReportChcm = (id) => api.get(`document/get_chcm_document_by_id/${id}`)
+  const updateReportChcm = (body) => api.post('document/update_chcm_document', body)
 
 
   // Monitoring
@@ -673,6 +678,11 @@ const create = (type = "") => {
     getAllDocument,
     uploadDocument,
     uploadCarfmDocument,
+    getChcmDocumentBySubmenu,
+    uploadChcmDocument,
+    deleteReportChcm,
+    getDetailReportChcm,
+    updateReportChcm,
     updateDocument,
     downloadDocument,
     getPerusahaanUserActive,

src/assets/sass/app.css

 .main-color{
-  background-color: #0b6b24 !important;
+  background-color: #273b80 !important;
 }
 
+/* for staging */
+/* .main-color{
+  background-color: #0b6b24 !important;
+} */
+
 .sub-color{
   background-color: #f0f1f3 !important;
 }

src/container/CAFRM/CafrmDocument.js

@@ -149,7 +149,7 @@ export default class CafrmDocument extends Component {
                     let compActive = []
                     let userCompActive = []
                     this.state.userCompany.map((item, index) => {
-                        if (index !== -1 && String(data[index].status).toLocaleLowerCase() == 'active'){
+                        if (index !== -1 && String(data[index]?.status).toLocaleLowerCase() == 'active'){
                             userCompActive.push(item)
                         }
                     })

src/container/CHCM/PopUpDelete.js

+import React, { Component } from 'react';
+import Images from '../../assets/Images';
+import { Typography } from '@material-ui/core';
+import api from "../../api";
+import Constant from '../../library/Constant';
+
+export default class PopUpDelete extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            id: '',
+            getApprovedBy: null,
+            getTypes: null,
+        }
+    }
+
+    componentDidMount() {
+        console.log(this.props);
+        
+        if (this.props.type === 'delete') {
+            // console.log(this.props.idoc)
+            // console.log(this.props.data)
+        }
+    }
+
+    onClickDelete() {
+        if (this.props.type == 'delete') {
+            let payload = this.props.idoc
+            this.props.deleteDoc(payload)
+        }
+    }
+    
+    render() {
+        return (
+            <div className="test app-popup-show">
+                <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
+                    <div style={{ display: 'flex', justifyContent: 'center', paddingTop: 20 }}>
+                        <img src={Images.failed} />
+                    </div>
+                    <div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}>
+                        <span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', fontFamily: 'Nunito Sans, sans-serif' }}>
+                            Delete {this.props.data[1]} ?
+                        </span>
+                    </div>
+                    <div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
+                        <div className="column-1" style={{ alignSelf: 'center' }}>
+                            <button
+                                type="button"
+                                onClick={() => this.props.onClickClose()}
+                            >
+                                <div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
+                                    <span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
+                                </div>
+                            </button>
+                        </div>
+                        <div className="column-2" style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
+                            <button
+                                type="button"
+                                onClick={() => 
+                                    this.setState({ loading: true }, () => {
+                                        setTimeout(() => {
+                                            this.onClickDelete()
+                                        }, 100);
+                                    })
+                                }
+                            >
+                                <div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
+                                    <span style={{ color: '#fff', fontSize: 11 }}>Delete</span>
+                                </div>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+}

src/container/Menu/Home.js

@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({
       easing: theme.transitions.easing.sharp,
       duration: theme.transitions.duration.enteringScreen,
     }),
-    backgroundColor: '#0b6b24'
+    backgroundColor: '#273b80'
   },
   topleftClose: {
     borderRight: 0,
@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({
     },
     padding: 20,
     display: 'flex',
-    backgroundColor: '#0b6b24'
+    backgroundColor: '#273b80'
   },
   drawerOpen: {
     width: drawerWidth,

src/router/homeRoutes.js

@@ -25,6 +25,7 @@ import CafrmDocument from "../container/CAFRM/CafrmDocument";
 import ReportCafrm from "../container/ReportCarfm/RepotrCafrm";
 import Maintenance from "../container/Auth/Maintenance";
 import DownloadReport from "../container/DownloadReport/DownloadReport"
+import ChcmDocument from '../container/CHCM/ChcmDocument';
 
 const routes = [
   {
@@ -139,6 +140,14 @@ const routes = [
     path: "/home/download-report",
     main: DownloadReport
   },
+  {
+    path: "/home/report-talent-management-tm",
+    main: ChcmDocument
+  },
+  {
+    path: "/home/report-trec",
+    main: ChcmDocument
+  },
   {
     path: "*",
     main: screen404