Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into deni-dev(pc)

src/api/index.js

@@ -206,6 +206,7 @@ const create = (type = "") => {
   const getCompanySubmitted = (body) => api.post('transaction/master_budget/get_company_submitted', body)
   const getLastPeriod = (idCompany) => api.get(`transaction/master_budget/get_last_periode/${idCompany}`) 
   const getSubmitMasterBudget = (body) => api.post('transaction/master_budget/get_latest_periode_submit', body)
+  const createPeriodeRevision = (body) => api.post('transaction/master_budget/create_periode_revision', body)
 
   const getIdDeleteFromExcel = (body) => api.post('transaction/master_budget/delete_from_excel', body)
   const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body)
@@ -371,7 +372,8 @@ const create = (type = "") => {
     approvalSubmission,
     getCompanySubmitted,
     getLastPeriod,
-    getSubmitMasterBudget
+    getSubmitMasterBudget,
+    createPeriodeRevision
   }
 }
 

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -398,7 +398,7 @@ export default class CorporateAnnualTarget extends Component {
         console.log(this.state.dataTable)
         this.state.dataTable.map(i => {
             data.push({
-                "item_report_id": i[1] == "" ? null : i[1],
+                "item_report_id": i[1] == "" || i[1] == null? 0 : i[1],
                 "item_report": String(i[6]),
                 "weight": String(i[7]),
                 "uom": String(i[8]),
@@ -815,7 +815,7 @@ export default class CorporateAnnualTarget extends Component {
             // this.setState({dataTable: dataTable2})
         }
 
-        const handleAction = (idParent, typeReport) => {
+        const handleAction = (idParent, typeReport, tableMeta) => {
             if (idParent !== null) {
                 let indexsss = dataTable2.findIndex((val) => val[1] == idParent)
                 if (dataTable2[indexsss][6] == 'CUSTOMER PERSPECTIVE' || dataTable2[indexsss][6] == 'INTERNAL BUSINESS PROCESS PERSPECTIVE') {
@@ -826,6 +826,13 @@ export default class CorporateAnnualTarget extends Component {
             } else {
                 if (typeReport == null) {
                     return true
+                } else if (tableMeta !== undefined && tableMeta.rowData[0] == 1) {
+                    let indexID = dataTable2.findIndex((val) => val[2] == tableMeta.rowData[1])
+                    if (indexID !== -1) {
+                        return false
+                    } else {
+                        return true
+                    }
                 } else {
                     return false
                 }
@@ -841,7 +848,7 @@ export default class CorporateAnnualTarget extends Component {
                     newData.push([
                         3,
                         "",
-                        item[2],
+                        item[2] == null? item[1] : item[2],
                         item[3],
                         item[4],
                         "",
@@ -889,7 +896,7 @@ export default class CorporateAnnualTarget extends Component {
             this.setState({ dataTable: dataTable2, dataDelete }, () => {
                 setTimeout(() => {
                     this.setState({ loading: false })
-                }, 500)
+                }, 100)
             })
         }
 
@@ -949,7 +956,7 @@ export default class CorporateAnnualTarget extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         // handleAction(tableMeta.rowData[2]) && 
-                        handleAction(tableMeta.rowData[2], tableMeta.rowData[0]) && <div style={{ display: 'flex' }}>
+                        handleAction(tableMeta.rowData[2], tableMeta.rowData[0], tableMeta) && <div style={{ display: 'flex' }}>
                             {/* {tableMeta.rowData[6] === "Active" ? */}
                             {<span>
                                 <LightTooltip title={'Add'} arrow>

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -630,7 +630,7 @@ export default class FixedAssetsMovement extends Component {
                 display: false
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[1] : "Account",
+            name: "Account",
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 300 }}>
@@ -668,7 +668,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[2] : `31 Dec ${Number(this.props.periode) - 1} Actual`,
+            name: `31 Dec ${Number(this.props.periode) - 1} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -704,7 +704,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[3] : `Jan ${this.props.periode}`,
+            name: `Jan ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -792,7 +792,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[4] : `Feb ${this.props.periode}`,
+            name: `Feb ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -881,7 +881,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[5] : `Mar ${this.props.periode}`,
+            name: `Mar ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -970,7 +970,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[6] : `Apr ${this.props.periode}`,
+            name: `Apr ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1059,7 +1059,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[7] : `May ${this.props.periode}`,
+            name: `May ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1148,7 +1148,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[8] : `Jun ${this.props.periode}`,
+            name: `Jun ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1237,7 +1237,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[9] : `Jul ${this.props.periode}`,
+            name: `Jul ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1326,7 +1326,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[10] : `Aug ${this.props.periode}`,
+            name: `Aug ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1415,7 +1415,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[11] : `Sep ${this.props.periode}`,
+            name: `Sep ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1504,7 +1504,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[12] : `Oct ${this.props.periode}`,
+            name: `Oct ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1593,7 +1593,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[13] : `Nov ${this.props.periode}`,
+            name: `Nov ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1682,7 +1682,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[14] : `Dec ${this.props.periode}`,
+            name: `Dec ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1771,7 +1771,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[15] : "Current Total",
+            name: "Current Total",
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -1809,7 +1809,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[16] : `31 Dec ${Number(this.props.periode) + 1} Total`,
+            name: `31 Dec ${Number(this.props.periode) + 1} Total`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -1898,7 +1898,7 @@ export default class FixedAssetsMovement extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[17] : `31 Dec ${Number(this.props.periode) + 2} Total`,
+            name: `31 Dec ${Number(this.props.periode) + 2} Total`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>

src/container/BudgetTahunan/ProfitLoss.js

@@ -602,7 +602,7 @@ export default class ProfitLoss extends Component {
                 display: false
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[1] : "Account",
+            name: "Account",
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 300 }}>
@@ -640,7 +640,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[2] : "Notes",
+            name: "Notes",
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -678,7 +678,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[3] : `31 Dec ${Number(this.props.periode) - 1} Actual`,
+            name: `31 Dec ${Number(this.props.periode) - 1} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -715,7 +715,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[4] : `Jan ${this.props.periode}`,
+            name: `Jan ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -804,7 +804,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[5] : `Feb ${this.props.periode}`,
+            name: `Feb ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -894,7 +894,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[6] : `Mar ${this.props.periode}`,
+            name: `Mar ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -984,7 +984,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[7] : `Apr ${this.props.periode}`,
+            name: `Apr ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1074,7 +1074,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[8] : `May ${this.props.periode}`,
+            name: `May ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1164,7 +1164,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[9] : `Jun ${this.props.periode}`,
+            name: `Jun ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1254,7 +1254,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[10] : `Jul ${this.props.periode}`,
+            name: `Jul ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1344,7 +1344,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[11] : `Aug ${this.props.periode}`,
+            name: `Aug ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1434,7 +1434,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[12] : `Sep ${this.props.periode}`,
+            name: `Sep ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1524,7 +1524,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[13] : `Oct ${this.props.periode}`,
+            name: `Oct ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1614,7 +1614,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[14] : `Nov ${this.props.periode}`,
+            name: `Nov ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1704,7 +1704,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[15] : `Dec ${this.props.periode}`,
+            name: `Dec ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
@@ -1794,7 +1794,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[16] : "Current Total",
+            name: "Current Total",
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -1841,7 +1841,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[17] : `31 Dec ${Number(this.props.periode) + 1} Total`,
+            name: `31 Dec ${Number(this.props.periode) + 1} Total`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
@@ -1931,7 +1931,7 @@ export default class ProfitLoss extends Component {
                 }
             }
         }, {
-            name: this.state.judulColumn !== null ? this.state.judulColumn[18] : `31 Dec ${Number(this.props.periode) + 2} Total`,
+            name: `31 Dec ${Number(this.props.periode) + 2} Total`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>

src/container/DocumentManagement/AllDocument.js

@@ -10,6 +10,7 @@ import PopUpDelete from "./PopUpDelete";
 import api from '../../api';
 import CreateManagementDoc from './CreateManagementDoc';
 import EditManagementDoc from './EditManagementDoc';
+import PropagateLoader from "react-spinners/PropagateLoader"
 
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -168,7 +169,7 @@ export default class getAllDocument extends Component {
     }
 
     updateDocument(payload) {
-        this.setState({ loading: true })
+        this.setState({ visibleEdit: false, loading: true })
         api.create().updateDocument(payload).then(response => {
             console.log(response)
             if (response.data) {
@@ -223,7 +224,7 @@ export default class getAllDocument extends Component {
                                     </button>
                                 </a>
                                 <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
-                            {this.props.btnedit && <span>
+                            {this.props.btnedit && this.props.allsubcoEdit && <span>
                             <a data-tip={'Edit'} data-for="edit">
                                 <button
                                     style={{
@@ -282,7 +283,16 @@ export default class getAllDocument extends Component {
         "Type", "File Size", "Created By", "Created Date"
         ]
 
-        
+        const loadingComponent = (
+            <div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
+                <PropagateLoader
+                    // css={override}
+                    size={20}
+                    color={"#274B80"}
+                    loading={this.state.loading}
+                />
+            </div>
+        ); 
 
         return (
             <div style={{ width: '100%' }}>
@@ -293,7 +303,7 @@ export default class getAllDocument extends Component {
                             {this.state.messageAlert}
                         </Alert>
                     </Snackbar>
-                    
+                    {this.state.loading && loadingComponent}
                     <MuiThemeProvider theme={getMuiTheme()}>
                         <MUIDataTable
                             // theme={getMuiTheme()}

src/container/DocumentManagement/DocumentManagement.js

@@ -93,19 +93,17 @@ export default class DocumentManagement extends Component {
     }
 
     createDocument(payload, settingID, menuName) {
-        this.setState({ loading: true })
+        // this.setState({ visibleCreate: false, loading: true })
         api.create().uploadDocument(payload).then(response => {
             console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.message === "The Document Already Exists in The System, Do You Want to Overwrite It?") {
-                        this.setState({ formData: payload, docId: response.data.data.document_id, settingID, menuName, loading: false }, () => {
-                            this.setState({ konfirmasi: true })
-                        })
+                        this.setState({ konfirmasi: true, formData: payload, docId: response.data.data.document_id, settingID, menuName, loading: false })
                     }
                     else if (response.data.message === "Data was Saved Successfully") {
                         this.getDataDocument(settingID, menuName)
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success', settingID, menuName, visibleCreate: false,  loading: false})
+                        this.setState({ visibleCreate: false,  loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', settingID, menuName})
                     }
                     else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
@@ -127,6 +125,7 @@ export default class DocumentManagement extends Component {
     }
 
     createUploadDocument() {
+        this.setState({ visibleCreate: false, konfirmasi: false })
         const formData = this.state.formData
         formData.append("documentId", this.state.docId)
         formData.append("updated", 1)
@@ -137,7 +136,7 @@ export default class DocumentManagement extends Component {
                 if (response.ok) {
                     if (response.data.status === "success") {
                         this.getDataDocument(this.state.settingID, this.state.menuName)
-                        this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleCreate: false })
+                        this.setState({ konfirmasi: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success', visibleCreate: false, loading: false })
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
@@ -253,7 +252,7 @@ export default class DocumentManagement extends Component {
                 {this.state.loading && loadingComponent}
                     <Paper style={{ padding: 20 }}>
                         <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-                        {(this.state.btncreate && this.state.btnadd) && <span>
+                        {(this.state.btncreate) && <span>
                             <a data-tip={'Add'} data-for="add">
                                 <div style={{ display: 'grid', justifyContent: 'flex-end' }}>
                                     <button
@@ -295,6 +294,8 @@ export default class DocumentManagement extends Component {
                                     load={this.state.load}
                                     setId={this.state.id}
                                     userCompActive={this.state.userCompActive}
+                                    allsubcoEdit={this.state.btnadd}
+                                    handleLoading={this.handleLoading.bind(this)}
                                 />
                                 // this.state.id === 68542 ?
                                 //     <AuditTahunan
@@ -359,6 +360,7 @@ export default class DocumentManagement extends Component {
                         setting_id={this.state.id}
                         name={this.state.name}
                         handleLoading={this.handleLoading.bind(this)}
+                        allsubcoCreate={this.state.btnadd}
                     />
                 )}
             </div>

src/container/DocumentManagement/EditManagementDoc.js

@@ -291,11 +291,11 @@ export default class EditManagementDoc extends Component {
                 this.setState({ errorPeriode: true, msgErrorPeriode: 'Period Cannot be Empty' })
             }  else if (R.isNil(this.state.monthId)) {
                 this.setState({ errorMonth: true, msgErrorMonth: 'Month Cannot be Empty' })
-            } 
+            } else if (R.isNil(this.state.getPerusahaan)) {
+                this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty' })
+            }
         }
-        if (R.isNil(this.state.getPerusahaan)) {
-            this.setState({ errorPerusahaan: true, msgErrorPerusahaan: 'Company Cannot be Empty' })
-        } else if (R.isNil(this.state.getDocument)) {
+        if (R.isNil(this.state.getDocument)) {
             this.setState({ errorDocument: true, msgErrorDocument: 'Category Cannot be Empty' })
         } else if (R.isNil(this.state.file)) {
             this.setState({ alert: true, messageAlert: 'File Cannot be Empty', tipeAlert: 'warning' })
@@ -313,11 +313,13 @@ export default class EditManagementDoc extends Component {
             if (String(this.props.name).includes('Manual Book TIA')){
                 formData.append("documentMonth", null);
                 formData.append("documentPeriode", null);
+                formData.append("companyId", 1);
+
             } else {
                 formData.append("documentMonth", this.state.monthId.month_id);
                 formData.append("documentPeriode", this.state.periode.periode);
+                formData.append("companyId", this.state.getPerusahaan.company_id);
             }
-            formData.append("companyId", this.state.getPerusahaan.company_id);
             formData.append("settingId", this.state.getDocument.document_category_id);
             formData.append("description", this.state.description);
             formData.append("extension", this.state.fileType);
@@ -359,6 +361,7 @@ export default class EditManagementDoc extends Component {
                         </div>
 
                         <div className="grid grid-2x grid-mobile-none gap-15px" style={{ paddingLeft: 20, paddingRight: 20, paddingTop: 20 }}>
+                            {this.state.disabledPeriode === false ?
                             <div className="column-1">
                                 <div style={{ padding: 10, borderRadius: 5 }}>
                                     <Autocomplete
@@ -378,6 +381,8 @@ export default class EditManagementDoc extends Component {
                                     />
                                 </div>
                             </div>
+                            :true}
+                            {this.state.disabledPeriode === false ?
                             <div className="column-2">
                                 <div style={{ padding: 10, borderRadius: 5 }}>
                                     <Autocomplete
@@ -402,8 +407,33 @@ export default class EditManagementDoc extends Component {
                                     />
                                 </div>
                             </div>
+                            :
+                            <div className="column-1">
+                                <div style={{ padding: 10, borderRadius: 5 }}>
+                                    <Autocomplete
+                                        {...this.state.document}
+                                        // debug
+                                        clearOnEscape
+                                        id="tipe"
+                                        onChange={(event, newInputValue) => this.setState({ getDocument: newInputValue }, 
+                                        () => newInputValue === null ? this.setState({ disabledPeriode: false })
+                                            : newInputValue.document_category_name === 'Manual Book TIA 4.0' ?
+                                                this.setState({ disabledPeriode: true }, () => this.clearMessage())
+                                            : this.setState({ disabledPeriode: false }, () => this.clearMessage())
+                                        )}
+                                        renderInput={(params) =>
+                                            <TextField {...params}
+                                                error={this.state.errorDocument}
+                                                helperText={this.state.msgErrorDocument}
+                                                InputProps={{ ...params.InputProps, style: { fontSize: 11 } }}
+                                                InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }}
+                                                label="Category" />}
+                                        value={this.state.getDocument}
+                                    />
+                                </div>
+                            </div>
+                            }
                             {this.state.disabledPeriode === false ?
-                            // {String(this.state.name).includes('Manual Book TIA') ? false : (
                             <div className="column-1">
                                 <div style={{ padding: 10, borderRadius: 5 }}>
                                     <Autocomplete
@@ -424,10 +454,8 @@ export default class EditManagementDoc extends Component {
                                     />
                                 </div>
                             </div>
-                            // )}
                             : true }
                             {this.state.disabledPeriode === false ?
-                            // {String(this.state.name).includes('Manual Book TIA') ? false : (
                             <div className="column-2">
                                 <div style={{ padding: 10, borderRadius: 5 }}>
                                     <Autocomplete
@@ -448,7 +476,6 @@ export default class EditManagementDoc extends Component {
                                     />
                                 </div>
                             </div>
-                            // )}
                             : true}
                         </div>
                         <div style={{ paddingLeft: 30, paddingRight: 30, paddingTop: 10 }}>

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -696,6 +696,7 @@ export default class Perusahaan extends Component {
                         {this.state.messageAlert}
                     </Alert>
                 </Snackbar>
+                {this.state.loading && loadingComponent}
                 {this.state.visiblePerusahaan === true ?
                     this.state.load && (
                         <div>
@@ -790,7 +791,6 @@ export default class Perusahaan extends Component {
                                 </div>
                             </div>
                             <div style={{ padding: 25 }}>
-                            {this.state.loading && loadingComponent}
                                 <MuiThemeProvider theme={getMuiTheme()}>
                                     <MUIDataTable
                                         theme={getMuiTheme()}
@@ -811,6 +811,7 @@ export default class Perusahaan extends Component {
                             onClickClose={() => this.setState({ visibleVisual: false, visiblePerusahaan: true })}
                             height={this.props.height}
                             updateHierarchy={this.updateHierarchy.bind(this)}
+                            handleLoading={() => this.setState({loading: true}, () => console.log('aksdkas'))}
                         />
                         :
                         <div>

src/container/MasterData/Perusahaan/VisualPerusahaan.js

@@ -185,7 +185,10 @@ export default class VisualPerusahaan extends Component {
                                     <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                         <span style={{ color: '#354960', fontSize: 11 }} >Cancel</span>
                                     </div>
-                                    <div onClick={() => this.handleSave()} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
+                                    <div onClick={() => {
+                                        this.props.handleLoading()
+                                        this.handleSave()
+                                        }} style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                         <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                     </div>
                                 </div>

src/container/MasterData/ReportItems.js

@@ -63,7 +63,7 @@ export default class ReportItems extends Component {
             invalidTemplate: false,
             loading: false
         }
-
+        this.myRef = React.createRef()
         this.fileHandler = this.fileHandler.bind(this);
     }
 
@@ -824,6 +824,8 @@ export default class ReportItems extends Component {
         this.setState({ alert: false })
     }
 
+    scrollToMyRef = () => window.scrollTo(0, this.myRef.current.offsetTop)
+
     render() {
         const columns = [{
             name: "Action",
@@ -1049,7 +1051,7 @@ export default class ReportItems extends Component {
             </div>
         );
         return (
-            <div style={{ height: this.props.height }}>
+            <div style={{ height: this.props.height }} ref={this.myRef}>
                 {/* <Row> */}
                 <div className={"main-color"} style={{ height: 195, width: '100%' }} />
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
@@ -1057,6 +1059,7 @@ export default class ReportItems extends Component {
                         {this.state.messageAlert}
                     </Alert>
                 </Snackbar>
+                {this.state.loading && loadingComponent}
                 {this.state.itemReport === true ?
                     this.state.load && (
                         <div>
@@ -1150,7 +1153,6 @@ export default class ReportItems extends Component {
                                 </div>
                             </div>
                             <div style={{ padding: 25 }}>
-                                {this.state.loading && loadingComponent}
                                 <MuiThemeProvider theme={getMuiTheme()}>
                                     <MUIDataTable
                                         theme={getMuiTheme()}
@@ -1170,6 +1172,8 @@ export default class ReportItems extends Component {
                             buttonEdit={this.state.buttonEdit}
                             onClickClose={() => this.setState({ visualisasi: false, itemReport: true }, () => this.getData())}
                             height={this.props.height}
+                            handleLoading={() => this.setState({ loading: true })}
+                            scrollToTop={() => this.scrollToMyRef()}
                         />
                         :
                         <div>

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -27,6 +27,7 @@ export default class CreateReportItems extends Component {
             uom: '',
             weight: '',
             formula: '',
+            formulasum: '',
             realVal: '',
             condition: null,
             date: new Date(),
@@ -57,6 +58,7 @@ export default class CreateReportItems extends Component {
             msgErrorSD: '',
             msgErrorED: '',
             disabledFormula: true,
+            disabledFormulaSum: true,
             disabledCondt: true,
             disabledValue: true,
             options: ['WARNING', 'STOPPER'],
@@ -761,6 +763,15 @@ export default class CreateReportItems extends Component {
                                                         condition: '',
                                                         realVal: ''
                                                     }, () => this.clearMessage())
+                                                    : newInputValue.type_item_report_name === 'Formula - Summary' ?
+                                                    this.setState({
+                                                        disabledFormula: false,
+                                                        disabledCondt: true,
+                                                        disabledValue: true,
+                                                        formula: '',
+                                                        condition: '',
+                                                        realVal: ''
+                                                    }, () => this.clearMessage())
                                                     : this.setState({
                                                         disabledFormula: true,
                                                         disabledCondt: true,

src/container/MasterData/formReportItems/EditReportItems.js

@@ -783,7 +783,7 @@ export default class EditReportItems extends Component {
                                     style={{ width: '100%' }}
                                     id="formula"
                                     label="Formula"
-                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_item_report_name === 'Formula' || this.state.InputType.type_item_report_name === 'Validation' ? false : true)}
+                                    disabled={this.state.InputType == null ? true : (this.state.InputType.type_item_report_name === 'Formula' || this.state.InputType.type_item_report_name === 'Validation' || this.state.InputType.type_item_report_name === 'Formula - Summary' ? false : true)}
                                     name="formula"
                                     error={this.state.errorFormula}
                                     helperText={this.state.msgErrorFormula}

src/container/MasterData/formReportItems/VisualReportItems.js

@@ -334,7 +334,10 @@ export default class VisualReportItems extends Component {
                                     <div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                         <span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
                                     </div>
-                                    <button onClick={() => this.handleSave()}>
+                                    <button onClick={() => {
+                                        this.props.handleLoading() 
+                                        this.props.scrollToTop()
+                                        this.handleSave()}}>
                                         <div style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
                                             <span style={{ color: '#fff', fontSize: 11 }}>Save</span>
                                         </div>

src/container/OprIndicator/OperatingIndicator.js

@@ -315,10 +315,20 @@ export default class OperatingIndicator extends Component {
                         return (
                             <div style={{ display: 'flex' }}>
                                 {val === "submitted" || val === "approved" ?
-                                    <img src={Images.ceklis} style={{ width: 31, height: 24 }} /> :
-                                    val === "revision" ? 
-                                    <span>Revisi</span> :
-                                    null
+                                    <span>COMPLETED</span> :
+                                    val === "draft" ?
+                                        <span>DRAFT</span> :
+                                        val === "revision" ?
+                                            <span>REVISION</span> :
+                                            val === "approval_proccess" ?
+                                                <span>APPROVAL PROCCESS</span> :
+                                                val === "approval_review" ?
+                                                    <span>APPROVAL REVIEW</span> :
+                                                    val === "not-yet" ?
+                                                        <span>OPEN</span> :
+                                                        val === "CLOSED" ?
+                                                            <span>CLOSED</span> :
+                                                            <img src={Images.cross} style={{ width: 31, height: 24 }} />
                                 }
                             </div >
                         );

src/library/Array.js

@@ -28,7 +28,7 @@ const arraySide = [
     {
         img: Images.outlookperformance,
         label: 'Outlook Performance Appraisal',
-        path: 'beranda',
+        path: 'outlook-performance',
         subItem: null
     },
     {