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

src/api/index.js

@@ -434,10 +434,10 @@ const create = (type = "") => {
     getSubmitOI,
     getLastPeriodOI,
     getDashboardUser,
+    getHierarkiMontlyReport
     getDetailReportCF,
     getReportHierarkiPL,
     getMonthlyReportID,
-    getHierarkiMontlyReport
   }
 }
 

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -452,7 +452,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -462,10 +462,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -479,7 +479,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -489,10 +489,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -506,7 +506,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -516,10 +516,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -563,7 +563,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ visibleAM: true, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -573,10 +573,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -595,7 +595,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -605,10 +605,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }

src/container/BudgetTahunan.js

@@ -66,7 +66,8 @@ export default class BudgetTahunan extends Component {
             latestPeriode: '',
             minDateRevision: new Date(),
             maxDateRevision: new Date(),
-            btnApprove: false
+            btnApprove: false,
+            isAdmin: false
         }
         this.myRef = React.createRef()
         this.fileHandler = this.fileHandler.bind(this);
@@ -80,7 +81,7 @@ export default class BudgetTahunan extends Component {
         })
         this.props.selectIndex('Master Budget & CAT')
         if (this.props.location.state !== undefined) {
-            // console.log(this.props);
+            // // console.log(this.props);
             this.setState({ userType: this.props.location.state.userType, intent: 'Home', lastPeriod: this.props.location.state.rawData.periode, rawData: this.props.location.state.rawData }, () => {
                 this.checkApprover()
             })
@@ -89,15 +90,45 @@ export default class BudgetTahunan extends Component {
         }
     }
 
+    getRole(id) {
+        api.create().getDetailRole(id).then((response) => {
+            if (response.data) {
+                if (response.ok) {
+                    if (response.data.status === 'success') {
+                        // this.setState({ tempData: response.data.data, privileges: response.data.data.privileges })
+                        // // console.log(response.data.data)
+                        if (String(response.data.data.role_name).toLocaleLowerCase() == 'superadmin') {
+                            this.setState({isAdmin: true})
+                        }
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+            }
+        })
+    }
+
     componentWillUnmount() {
         document.body.style.overflow = 'unset';
     }
 
     checkApprover() {
         api.create().checkApprover().then(response => {
+            // console.log(response.data.data)
           if (response.data) {
              if (response.data.status === "success") {
-                 // console.log(response);
+                 // // console.log(response);
                  if (response.data.data.is_approver === true) {
                      this.setState({ isApprover: true, checkApprover: true }, () =>
                          this.getPeriode())
@@ -126,7 +157,7 @@ export default class BudgetTahunan extends Component {
             "periode": this.state.periode.periode
         }
         api.create().getCompanySubmitted(body).then(response => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data) {
                 if (response.data.status === 'success') {
                     if (response.data.data.length > 0) {
@@ -148,7 +179,7 @@ export default class BudgetTahunan extends Component {
                         }
 
                         this.setState({ listCompany: defaultProps, company: indexID == null? companyData[0] : companyData[indexID]}, () => {
-                            // console.log(response.data.data);
+                            // // console.log(response.data.data);
                             if (response.data.data.length > 0) {
                                 this.getRevision()
                             } else {
@@ -184,13 +215,13 @@ export default class BudgetTahunan extends Component {
             "revision": this.state.revision.revision,
         }
         api.create().getMasterBudgetAtt(payload).then(response => {
-            // console.log(response)
+            // // console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({ listAttachment: response.data.data })
                 }
             }
-            // console.log(response);
+            // // console.log(response);
         })
     }
 
@@ -201,7 +232,7 @@ export default class BudgetTahunan extends Component {
             "report_type": "Master Budget",
         }
         api.create().getReportTypeBody(payload).then(response => {
-            console.log(response);
+            // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     let dataTable = response.data.data.map((item, index) => {
@@ -225,7 +256,7 @@ export default class BudgetTahunan extends Component {
                         ])
                       }
                     })
-                    // console.log(dataTableRevision);
+                    // // console.log(dataTableRevision);
                     this.setState({ dataTable, loading: false, dataTableRevision, dataForRevision: response.data.data }, ()=> {
                         document.body.style.overflow = 'unset';
                     })
@@ -244,7 +275,7 @@ export default class BudgetTahunan extends Component {
             "periode": this.state.periode.periode
         }
         api.create().getSubmitMasterBudget(body).then(response => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({ isSubmit: response.data.data.is_can_submit }, () => {
@@ -262,6 +293,7 @@ export default class BudgetTahunan extends Component {
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === 'success') {
+                        this.getRole(response.data.data.role_id)
                         this.setState({ userCompany: response.data.data.company }, () => {
                             this.getCompanyActive()
                         })
@@ -273,7 +305,7 @@ export default class BudgetTahunan extends Component {
 
     getCompanyActive() {
         api.create().getPerusahaanActive().then((response) => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data) {
                 if (response.data.status === 'success') {
                     let data = response.data.data
@@ -319,7 +351,7 @@ export default class BudgetTahunan extends Component {
 
     getLastPeriod() {
         api.create().getLastPeriod(this.state.company.company_id).then(response => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data.status === "success") {
                 this.setState({ lastPeriod: response.data.data.last_periode, latestPeriode: response.data.data.latest_periode }, () => {
                     this.getPeriode()
@@ -333,7 +365,7 @@ export default class BudgetTahunan extends Component {
             // let dateNow = new Date
             // let year = this.state.rawData ? this.state.rawData.periode : format(dateNow, 'yyyy')
             let currentYear = new Date().getFullYear()
-            // console.log(currentYear)
+            // // console.log(currentYear)
             if (response.data) {
                 if (response.data.status === "success") {
                     let data = []
@@ -359,10 +391,10 @@ export default class BudgetTahunan extends Component {
                     };
                     let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod)
                     let index = data.sort((a, b) => a - b).findIndex((val) => val === periode)
-                    // console.log(data)
-                    // console.log(this.state.latestPeriode)
-                    // console.log(periodeData)
-                    // console.log(index)
+                    // // console.log(data)
+                    // // console.log(this.state.latestPeriode)
+                    // // console.log(periodeData)
+                    // // console.log(index)
                     this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => {
                         if (this.state.isApprover === true) {
                             this.getCompanySubmitted()
@@ -381,7 +413,7 @@ export default class BudgetTahunan extends Component {
             "periode": this.state.periode.periode
         }
         api.create().getRevision(payload).then(response => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     let data = response.data.data
@@ -423,7 +455,7 @@ export default class BudgetTahunan extends Component {
             "is_approver": this.state.isApprover
         }
         api.create().getSubmission(payload).then(response => {
-            // console.log(response)
+            // console.log(response.data.data.last_status)
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
@@ -435,11 +467,11 @@ export default class BudgetTahunan extends Component {
                         btnApprove: response.data.data.is_submit,
                         // loading: false
                     }, () => {
-                        // console.log(this.state.lastStatus);
+                        // // console.log(this.state.lastStatus);
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
                         api.create().checkApprover().then(response => {
-                            // console.log(response);
+                            // // console.log(response);
                             if (response.data.data.is_approver === true) {
                                 this.setState({ isApprover: true, checkApprover: true })
                             } else {
@@ -471,7 +503,7 @@ export default class BudgetTahunan extends Component {
             "periode": this.state.periode.periode
         }
         api.create().historyApproval(body).then(response => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data.data.length > 0) {
                 let dataTableHistory = response.data.data.map(item => {
                     return [
@@ -502,15 +534,16 @@ export default class BudgetTahunan extends Component {
             "min_periode": moment(this.state.minDateRevision).format('YYYY-MM-DD'),
             "max_periode": moment(this.state.maxDateRevision).format('YYYY-MM-DD')
         }
-        // console.log(payload)
+        // // console.log(payload)
+        // // console.log(body)
         api.create().approvalSubmission(body).then((res) => {
-            // console.log(res)
+            // // console.log(res)
             // this.setState({ loading: false }, () => {
-            this.getSubmission()
             // })
             if (type == 'revision') {
                 api.create().createPeriodeRevision(payload).then((res))
             }
+            this.getSubmission()
         })
     }
 
@@ -521,7 +554,7 @@ export default class BudgetTahunan extends Component {
         } else {
             items = item
         }
-        // console.log(this.state.dataForRevision);
+        // // console.log(this.state.dataForRevision);
         this.state.dataForRevision.map(i => {
             if (i.report_name === items) {
                 if (i.revision !== revision) {
@@ -608,9 +641,9 @@ export default class BudgetTahunan extends Component {
     fileHandler = (event) => {
         let fileObj = event
         ExcelRenderer(fileObj, (err, resp) => {
-            // console.log(resp)
+            // // console.log(resp)
             if (err) {
-                // console.log(err);
+                // // console.log(err);
             }
             else {
                 const formData = new FormData();
@@ -637,7 +670,7 @@ export default class BudgetTahunan extends Component {
 
     deleteAttachment(item) {
         api.create().deleteAttachment(item.attachment_id).then(response => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     this.getSubmission()
@@ -654,9 +687,9 @@ export default class BudgetTahunan extends Component {
         this.setState({ loading: true }, ()=> {
             document.body.style.overflow = 'hidden';
         })
-        // console.log(JSON.stringify(data));
+        // // console.log(JSON.stringify(data));
         api.create('UPLOAD').createSubmitReport(data).then(response => {
-            // console.log(response);
+            // // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     this.getSubmission()
@@ -678,9 +711,9 @@ export default class BudgetTahunan extends Component {
     async downloadAttachment(fileurl, name) {
         let length = name.split(".").length
         let fileType = name.split(".")[length - 1]
-        // console.log(fileType);
+        // // console.log(fileType);
         let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
-        // console.log(url);
+        // // console.log(url);
         let res = await fetch(
             `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
         )
@@ -721,7 +754,7 @@ export default class BudgetTahunan extends Component {
                 submission_id: this.state.submissionID
             }
             api.create().submitMasterBudget(body).then(response => {
-                // console.log(response);
+                // // console.log(response);
                 if (response.data) {
                     if (response.data.status === "success") {
                         this.getSubmission()
@@ -734,9 +767,9 @@ export default class BudgetTahunan extends Component {
             })
         }
         // if (array.includes("not-yet" || "draft")) {
-        //     console.log('gagal');
+        //     // console.log('gagal');
         // } else {
-        //     console.log('masuk');
+        //     // console.log('masuk');
         // }
 
     }
@@ -750,7 +783,7 @@ export default class BudgetTahunan extends Component {
                 remarksKosong += 1
             }
         })
-        console.log(arrayRevisi)
+        // console.log(arrayRevisi)
         if (arrayRevisi.length == 0 || remarksKosong > 0) {
             this.setState({ alert: true, messageAlert: 'Remarks Cannot be Empty', tipeAlert: 'error' })
         } else {
@@ -781,7 +814,7 @@ export default class BudgetTahunan extends Component {
                                         <Select
                                             value={val}
                                             onChange={event => {
-                                                // console.log(event.target)
+                                                // // console.log(event.target)
                                                 updateValue(event.target.value)
                                                 this.handleChange(event.target.value, tableMeta)
                                             }}
@@ -909,10 +942,10 @@ export default class BudgetTahunan extends Component {
                                             defaultValue={value}
                                             color={"#5198ea"}
                                             onBlur={(event) => {
-                                                // console.log(event.target.value)
+                                                // // console.log(event.target.value)
                                                 // updateValue(event.target.value)
                                                 handleChangeText(event.target.value, tableMeta)
-                                                // console.log(dataTable2)
+                                                // // console.log(dataTable2)
                                             }}
                                         />}
                                 />
@@ -950,7 +983,7 @@ export default class BudgetTahunan extends Component {
                 detailRevisiCheck.splice(indexId, 1)
             }
             this.setState({ detailRevisiCheck })
-            // console.log(detailRevisiCheck)
+            // // console.log(detailRevisiCheck)
         }
 
         const options = {
@@ -1198,7 +1231,41 @@ export default class BudgetTahunan extends Component {
                                         </div>
                                     )}
                                 </div>
-                                {this.state.checkApprover === true ?
+                                {this.state.isAdmin && this.state.lastStatus == 'APPROVED'? 
+                                    <div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}>
+                                        <div className="col-1" />
+                                        <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
+                                            <button
+                                                style={{
+                                                    backgroundColor: 'transparent',
+                                                    cursor: 'pointer',
+                                                    borderColor: 'transparent',
+                                                    outline: 'none',
+                                                    marginRight: 20
+                                                }}
+                                                onClick={() => this.setState({ visibleRevision: true })}
+                                            >
+                                                <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
+                                                    <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Revision</Typography>
+                                                </div>
+                                            </button>
+                                            {/* <button
+                                                style={{
+                                                    backgroundColor: 'transparent',
+                                                    cursor: 'pointer',
+                                                    borderColor: 'transparent',
+                                                    outline: 'none',
+                                                }}
+                                                onClick={() => this.approvalSubmission('approve')}
+                                            >
+                                                <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
+                                                    <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Approve</Typography>
+                                                </div>
+                                            </button> */}
+                                        </div>
+                                    </div>
+                                :
+                                this.state.checkApprover === true ?
                                     this.state.lastStatus === 'WAITING FOR REVIEW' ?
                                         <div style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', display: 'flex', justifyContent: 'flex-end' }} >
                                             <button

src/container/BudgetTahunan/CashFlow.js

-import { createMuiTheme, FormControlLabel, MuiThemeProvider, Paper, TableCell, Tooltip, Typography, withStyles } from '@material-ui/core'
+import { createMuiTheme, FormControlLabel, MuiThemeProvider, Paper, Snackbar, TableCell, Tooltip, Typography, withStyles } from '@material-ui/core'
 import MUIDataTable from 'mui-datatables';
 import React, { Component } from 'react'
 import NumberFormat from 'react-number-format';
@@ -7,6 +7,8 @@ import api from '../../api';
 import Images from '../../assets/Images';
 import * as R from 'ramda'
 import { PropagateLoader } from 'react-spinners';
+import Constant from '../../library/Constant';
+import { Alert } from '@material-ui/lab';
 
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable3());
@@ -78,84 +80,103 @@ export default class CashFlow extends Component {
         // console.log(JSON.stringify(payload))
         api.create().getDetailReportCF(payload).then(response => {
             let dataTable = []
-            console.log(response)
-            let res = response.data.data
-            const handlePushChild = (item) => {
-                dataTable.push([
-                    item.type_report_id,
-                    item.id,
-                    item.parent,
-                    item.formula,
-                    item.level,
-                    item.description,
-                    item.cash_flow.total_actual_before === null ? "0" : item.cash_flow.total_actual_before === "" ? "0" : item.cash_flow.total_actual_before,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.january, formula: item.cash_flow.january_formula } : item.cash_flow.january,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.february, formula: item.cash_flow.february_formula } : item.cash_flow.february,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.march, formula: item.cash_flow.march_formula } : item.cash_flow.march,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.april, formula: item.cash_flow.april_formula } : item.cash_flow.april,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.may, formula: item.cash_flow.may_formula } : item.cash_flow.may,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.june, formula: item.cash_flow.june_formula } : item.cash_flow.june,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.july, formula: item.cash_flow.july_formula } : item.cash_flow.july,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.august, formula: item.cash_flow.august_formula } : item.cash_flow.august,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.september, formula: item.cash_flow.september_formula } : item.cash_flow.september,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.october, formula: item.cash_flow.october_formula } : item.cash_flow.october,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.november, formula: item.cash_flow.november_formula } : item.cash_flow.november,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.december, formula: item.cash_flow.december_formula } : item.cash_flow.december,
-                    item.cash_flow.total_current_year,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_next_year,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_more_year,
-                    item.order,
-                    item.condition_it_should_be,
-                    item.condition_if_wrong,
-                    item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
-                ])
-
-                if (item.children !== null) {
-                    if (item.children.length > 0) {
-                        item.children.map((items, indexs) => {
-                            handlePushChild(items)
+            // console.log(response)
+            if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
+                        let res = response.data.data
+                        const handlePushChild = (item) => {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.id,
+                                item.parent,
+                                item.formula,
+                                item.level,
+                                item.description,
+                                item.cash_flow.total_actual_before === null ? "0" : item.cash_flow.total_actual_before === "" ? "0" : item.cash_flow.total_actual_before,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.january, formula: item.cash_flow.january_formula } : item.cash_flow.january,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.february, formula: item.cash_flow.february_formula } : item.cash_flow.february,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.march, formula: item.cash_flow.march_formula } : item.cash_flow.march,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.april, formula: item.cash_flow.april_formula } : item.cash_flow.april,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.may, formula: item.cash_flow.may_formula } : item.cash_flow.may,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.june, formula: item.cash_flow.june_formula } : item.cash_flow.june,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.july, formula: item.cash_flow.july_formula } : item.cash_flow.july,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.august, formula: item.cash_flow.august_formula } : item.cash_flow.august,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.september, formula: item.cash_flow.september_formula } : item.cash_flow.september,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.october, formula: item.cash_flow.october_formula } : item.cash_flow.october,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.november, formula: item.cash_flow.november_formula } : item.cash_flow.november,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.december, formula: item.cash_flow.december_formula } : item.cash_flow.december,
+                                item.cash_flow.total_current_year,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_next_year,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_more_year,
+                                item.order,
+                                item.condition_it_should_be,
+                                item.condition_if_wrong,
+                                item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
+                            ])
+            
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
+                        }
+                        res.map((item, index) => {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.id,
+                                item.parent,
+                                item.formula,
+                                item.level,
+                                item.description,
+                                item.cash_flow.total_actual_before === null ? "0" : item.cash_flow.total_actual_before === "" ? "0" : item.cash_flow.total_actual_before,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.january, formula: item.cash_flow.january_formula } : item.cash_flow.january,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.february, formula: item.cash_flow.february_formula } : item.cash_flow.february,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.march, formula: item.cash_flow.march_formula } : item.cash_flow.march,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.april, formula: item.cash_flow.april_formula } : item.cash_flow.april,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.may, formula: item.cash_flow.may_formula } : item.cash_flow.may,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.june, formula: item.cash_flow.june_formula } : item.cash_flow.june,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.july, formula: item.cash_flow.july_formula } : item.cash_flow.july,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.august, formula: item.cash_flow.august_formula } : item.cash_flow.august,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.september, formula: item.cash_flow.september_formula } : item.cash_flow.september,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.october, formula: item.cash_flow.october_formula } : item.cash_flow.october,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.november, formula: item.cash_flow.november_formula } : item.cash_flow.november,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.december, formula: item.cash_flow.december_formula } : item.cash_flow.december,
+                                item.cash_flow.total_current_year,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_next_year,
+                                item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_more_year,
+                                item.order,
+                                item.condition_it_should_be,
+                                item.condition_if_wrong,
+                                item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
+                            ])
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
                         })
-                    }
-                }
-            }
-            res.map((item, index) => {
-                dataTable.push([
-                    item.type_report_id,
-                    item.id,
-                    item.parent,
-                    item.formula,
-                    item.level,
-                    item.description,
-                    item.cash_flow.total_actual_before === null ? "0" : item.cash_flow.total_actual_before === "" ? "0" : item.cash_flow.total_actual_before,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.january, formula: item.cash_flow.january_formula } : item.cash_flow.january,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.february, formula: item.cash_flow.february_formula } : item.cash_flow.february,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.march, formula: item.cash_flow.march_formula } : item.cash_flow.march,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.april, formula: item.cash_flow.april_formula } : item.cash_flow.april,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.may, formula: item.cash_flow.may_formula } : item.cash_flow.may,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.june, formula: item.cash_flow.june_formula } : item.cash_flow.june,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.july, formula: item.cash_flow.july_formula } : item.cash_flow.july,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.august, formula: item.cash_flow.august_formula } : item.cash_flow.august,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.september, formula: item.cash_flow.september_formula } : item.cash_flow.september,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.october, formula: item.cash_flow.october_formula } : item.cash_flow.october,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.november, formula: item.cash_flow.november_formula } : item.cash_flow.november,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? { value: item.cash_flow.december, formula: item.cash_flow.december_formula } : item.cash_flow.december,
-                    item.cash_flow.total_current_year,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_next_year,
-                    item.type_report_id == 5 || item.type_report_id == 6 || item.type_report_id == 7 ? 0 : item.cash_flow.total_more_year,
-                    item.order,
-                    item.condition_it_should_be,
-                    item.condition_if_wrong,
-                    item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
-                ])
-                if (item.children !== null) {
-                    if (item.children.length > 0) {
-                        item.children.map((items, indexs) => {
-                            handlePushChild(items)
+                        this.setState({ dataTable, loading: false, dataReal: res, editable: true })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
                         })
-                    }
+                    } 
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false})
                 }
-            })
-            this.setState({ dataTable, loading: false, dataReal: res, editable: true })
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+            }
         })
     }
 
@@ -180,6 +201,10 @@ export default class CashFlow extends Component {
         }
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     render() {
         let dataTable2 = this.state.dataTable
         let loading = false
@@ -2049,6 +2074,11 @@ export default class CashFlow extends Component {
                 <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
                     <Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography>
                 </div>
+                <Snackbar open={this.state.alert} autoHideDuration={3000} onClose={() => this.closeAlert()}>
+                    <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
+                        {this.state.messageAlert}
+                    </Alert>
+                </Snackbar>
                 <div style={{ flex: 1, padding: 20, width: '100%' }}>
                     <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
                         <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -104,123 +104,144 @@ export default class CorporateAnnualTarget extends Component {
             "company_id": this.props.company.company_id,
             "submission_id": this.props.submissionID
         }
-        // // console.log(JSON.stringify(payload))
+        console.log(JSON.stringify(payload))
         api.create().getDetailReportMB(payload).then(response => {
             let dataTable = []
             let dataCustomerPrs = []
             let dataInternalBsn = []
-            // // console.log(response)
-            let res = response.data.data
-            const handlePushChild = (item) => {
-                let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
-                if (indexIDzz === -1) {
-                    let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
-                    
-                    if (item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE') {
-                        if (item.type_report_id !== 4) {
-                            dataInternalBsn.push({
-                                id: item.id,
-                                name: item.description,
-                                check: false
-                            })
-                        }
-                    } 
-
-                    if (item.parent_name == 'CUSTOMER PERSPECTIVE') {
-                        if (item.type_report_id !== 4) {
-                            dataCustomerPrs.push({
-                                id: item.id,
-                                name: item.description,
-                                check: false
-                            }) 
+            // // console.log(response)\
+            if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
+                        let res = response.data.data
+                        const handlePushChild = (item) => {
+                            let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
+                            if (indexIDzz === -1) {
+                                let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
+                                
+                                if (item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE') {
+                                    if (item.type_report_id !== 4) {
+                                        dataInternalBsn.push({
+                                            id: item.id,
+                                            name: item.description,
+                                            check: false
+                                        })
+                                    }
+                                } 
+            
+                                if (item.parent_name == 'CUSTOMER PERSPECTIVE') {
+                                    if (item.type_report_id !== 4) {
+                                        dataCustomerPrs.push({
+                                            id: item.id,
+                                            name: item.description,
+                                            check: false
+                                        }) 
+                                    }
+                                }
+            
+                                dataTable.push([
+                                    item.type_report_id,
+                                    item.id,
+                                    item.parent,
+                                    item.formula,
+                                    item.level,
+                                    "",
+                                    item.description,
+                                    item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(item.cat.weight).indexOf(".") == -1 ? item.cat.weight : `${Number(item.weight) * 100}%`),
+                                    parentTrue ? item.cat.uom : item.uom,
+                                    parentTrue ? item.cat.kpi_type == "" ? null : { value: item.cat.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type },
+                                    parentTrue ? item.cat.max_ach == "" ? null : { value: titleCase(item.cat.max_ach) } : item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
+                                    parentTrue ? item.cat.formula == "" ? null : { value: item.cat.formula } : item.formula_ytd == "" ? null : { value: item.formula_ytd },
+                                    item.cat.total_actual_before == "" ? item.cat.total_actual_before : String(item.cat.total_actual_before).indexOf(".") == -1 ? Number(item.cat.total_actual_before) : Number(item.cat.total_actual_before).toFixed(1),
+                                    item.cat.january == "" ? item.cat.january : String(item.cat.january).indexOf(".") == -1 ? Number(item.cat.january) : Number(item.cat.january).toFixed(1),
+                                    item.cat.february == "" ? item.cat.february : String(item.cat.february).indexOf(".") == -1 ? Number(item.cat.february) : Number(item.cat.february).toFixed(1),
+                                    item.cat.march == "" ? item.cat.march : String(item.cat.march).indexOf(".") == -1 ? Number(item.cat.march) : Number(item.cat.march).toFixed(1),
+                                    item.cat.april == "" ? item.cat.april : String(item.cat.april).indexOf(".") == -1 ? Number(item.cat.april) : Number(item.cat.april).toFixed(1),
+                                    item.cat.may == "" ? item.cat.may : String(item.cat.may).indexOf(".") == -1 ? Number(item.cat.may) : Number(item.cat.may).toFixed(1),
+                                    item.cat.june == "" ? item.cat.june : String(item.cat.june).indexOf(".") == -1 ? Number(item.cat.june) : Number(item.cat.june).toFixed(1),
+                                    item.cat.july == "" ? item.cat.july : String(item.cat.july).indexOf(".") == -1 ? Number(item.cat.july) : Number(item.cat.july).toFixed(1),
+                                    item.cat.august == "" ? item.cat.august : String(item.cat.august).indexOf(".") == -1 ? Number(item.cat.august) : Number(item.cat.august).toFixed(1),
+                                    item.cat.september == "" ? item.cat.september : String(item.cat.september).indexOf(".") == -1 ? Number(item.cat.september) : Number(item.cat.september).toFixed(1),
+                                    item.cat.october == "" ? item.cat.october : String(item.cat.october).indexOf(".") == -1 ? Number(item.cat.october) : Number(item.cat.october).toFixed(1),
+                                    item.cat.november == "" ? item.cat.november : String(item.cat.november).indexOf(".") == -1 ? Number(item.cat.november) : Number(item.cat.november).toFixed(1),
+                                    item.cat.december == "" ? item.cat.december : String(item.cat.december).indexOf(".") == -1 ? Number(item.cat.december) : Number(item.cat.december).toFixed(1),
+                                    item.cat.total_current_year == "" ? item.cat.total_current_year : String(item.cat.total_current_year).indexOf(".") == -1 ? Number(item.cat.total_current_year) : Number(item.cat.total_current_year).toFixed(1),
+                                    item.cat.total_next_year == "" ? item.cat.total_next_year : String(item.cat.total_next_year).indexOf(".") == -1 ? Number(item.cat.total_next_year) : Number(item.cat.total_next_year).toFixed(1),
+                                    item.cat.total_more_year == "" ? item.cat.total_more_year : String(item.cat.total_more_year).indexOf(".") == -1 ? Number(item.cat.total_more_year) : Number(item.cat.total_more_year).toFixed(1),
+                                    item.cat.strategic,
+                                    item.cat.pic
+                                ])
+                            }
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
                         }
-                    }
-
-                    dataTable.push([
-                        item.type_report_id,
-                        item.id,
-                        item.parent,
-                        item.formula,
-                        item.level,
-                        "",
-                        item.description,
-                        item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(item.cat.weight).indexOf(".") == -1 ? item.cat.weight : `${Number(item.weight) * 100}%`),
-                        parentTrue ? item.cat.uom : item.uom,
-                        parentTrue ? item.cat.kpi_type == "" ? null : { value: item.cat.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type },
-                        parentTrue ? item.cat.max_ach == "" ? null : { value: titleCase(item.cat.max_ach) } : item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
-                        parentTrue ? item.cat.formula == "" ? null : { value: item.cat.formula } : item.formula_ytd == "" ? null : { value: item.formula_ytd },
-                        item.cat.total_actual_before == "" ? item.cat.total_actual_before : String(item.cat.total_actual_before).indexOf(".") == -1 ? Number(item.cat.total_actual_before) : Number(item.cat.total_actual_before).toFixed(1),
-                        item.cat.january == "" ? item.cat.january : String(item.cat.january).indexOf(".") == -1 ? Number(item.cat.january) : Number(item.cat.january).toFixed(1),
-                        item.cat.february == "" ? item.cat.february : String(item.cat.february).indexOf(".") == -1 ? Number(item.cat.february) : Number(item.cat.february).toFixed(1),
-                        item.cat.march == "" ? item.cat.march : String(item.cat.march).indexOf(".") == -1 ? Number(item.cat.march) : Number(item.cat.march).toFixed(1),
-                        item.cat.april == "" ? item.cat.april : String(item.cat.april).indexOf(".") == -1 ? Number(item.cat.april) : Number(item.cat.april).toFixed(1),
-                        item.cat.may == "" ? item.cat.may : String(item.cat.may).indexOf(".") == -1 ? Number(item.cat.may) : Number(item.cat.may).toFixed(1),
-                        item.cat.june == "" ? item.cat.june : String(item.cat.june).indexOf(".") == -1 ? Number(item.cat.june) : Number(item.cat.june).toFixed(1),
-                        item.cat.july == "" ? item.cat.july : String(item.cat.july).indexOf(".") == -1 ? Number(item.cat.july) : Number(item.cat.july).toFixed(1),
-                        item.cat.august == "" ? item.cat.august : String(item.cat.august).indexOf(".") == -1 ? Number(item.cat.august) : Number(item.cat.august).toFixed(1),
-                        item.cat.september == "" ? item.cat.september : String(item.cat.september).indexOf(".") == -1 ? Number(item.cat.september) : Number(item.cat.september).toFixed(1),
-                        item.cat.october == "" ? item.cat.october : String(item.cat.october).indexOf(".") == -1 ? Number(item.cat.october) : Number(item.cat.october).toFixed(1),
-                        item.cat.november == "" ? item.cat.november : String(item.cat.november).indexOf(".") == -1 ? Number(item.cat.november) : Number(item.cat.november).toFixed(1),
-                        item.cat.december == "" ? item.cat.december : String(item.cat.december).indexOf(".") == -1 ? Number(item.cat.december) : Number(item.cat.december).toFixed(1),
-                        item.cat.total_current_year == "" ? item.cat.total_current_year : String(item.cat.total_current_year).indexOf(".") == -1 ? Number(item.cat.total_current_year) : Number(item.cat.total_current_year).toFixed(1),
-                        item.cat.total_next_year == "" ? item.cat.total_next_year : String(item.cat.total_next_year).indexOf(".") == -1 ? Number(item.cat.total_next_year) : Number(item.cat.total_next_year).toFixed(1),
-                        item.cat.total_more_year == "" ? item.cat.total_more_year : String(item.cat.total_more_year).indexOf(".") == -1 ? Number(item.cat.total_more_year) : Number(item.cat.total_more_year).toFixed(1),
-                        item.cat.strategic,
-                        item.cat.pic
-                    ])
-                }
-                if (item.children !== null) {
-                    if (item.children.length > 0) {
-                        item.children.map((items, indexs) => {
-                            handlePushChild(items)
+                        res.map((item, index) => {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.id,
+                                item.parent,
+                                item.formula,
+                                item.level,
+                                "",
+                                item.description,
+                                item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : item.cat.weight,
+                                item.cat.uom,
+                                item.kpi_type == "" ? null : { value: item.kpi_type },
+                                item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
+                                item.formula == "" ? null : { value: item.formula_ytd },
+                                item.cat.total_actual_before == "" ? item.cat.total_actual_before : String(item.cat.total_actual_before).indexOf(".") == -1 ? Number(item.cat.total_actual_before) : Number(item.cat.total_actual_before).toFixed(1),
+                                item.cat.january == "" ? item.cat.january : String(item.cat.january).indexOf(".") == -1 ? Number(item.cat.january) : Number(item.cat.january).toFixed(1),
+                                item.cat.february == "" ? item.cat.february : String(item.cat.february).indexOf(".") == -1 ? Number(item.cat.february) : Number(item.cat.february).toFixed(1),
+                                item.cat.march == "" ? item.cat.march : String(item.cat.march).indexOf(".") == -1 ? Number(item.cat.march) : Number(item.cat.march).toFixed(1),
+                                item.cat.april == "" ? item.cat.april : String(item.cat.april).indexOf(".") == -1 ? Number(item.cat.april) : Number(item.cat.april).toFixed(1),
+                                item.cat.may == "" ? item.cat.may : String(item.cat.may).indexOf(".") == -1 ? Number(item.cat.may) : Number(item.cat.may).toFixed(1),
+                                item.cat.june == "" ? item.cat.june : String(item.cat.june).indexOf(".") == -1 ? Number(item.cat.june) : Number(item.cat.june).toFixed(1),
+                                item.cat.july == "" ? item.cat.july : String(item.cat.july).indexOf(".") == -1 ? Number(item.cat.july) : Number(item.cat.july).toFixed(1),
+                                item.cat.august == "" ? item.cat.august : String(item.cat.august).indexOf(".") == -1 ? Number(item.cat.august) : Number(item.cat.august).toFixed(1),
+                                item.cat.september == "" ? item.cat.september : String(item.cat.september).indexOf(".") == -1 ? Number(item.cat.september) : Number(item.cat.september).toFixed(1),
+                                item.cat.october == "" ? item.cat.october : String(item.cat.october).indexOf(".") == -1 ? Number(item.cat.october) : Number(item.cat.october).toFixed(1),
+                                item.cat.november == "" ? item.cat.november : String(item.cat.november).indexOf(".") == -1 ? Number(item.cat.november) : Number(item.cat.november).toFixed(1),
+                                item.cat.december == "" ? item.cat.december : String(item.cat.december).indexOf(".") == -1 ? Number(item.cat.december) : Number(item.cat.december).toFixed(1),
+                                item.cat.total_current_year == "" ? item.cat.total_current_year : String(item.cat.total_current_year).indexOf(".") == -1 ? Number(item.cat.total_current_year) : Number(item.cat.total_current_year).toFixed(1),
+                                item.cat.total_next_year == "" ? item.cat.total_next_year : String(item.cat.total_next_year).indexOf(".") == -1 ? Number(item.cat.total_next_year) : Number(item.cat.total_next_year).toFixed(1),
+                                item.cat.total_more_year == "" ? item.cat.total_more_year : String(item.cat.total_more_year).indexOf(".") == -1 ? Number(item.cat.total_more_year) : Number(item.cat.total_more_year).toFixed(1),
+                                item.cat.strategic,
+                                item.cat.pic
+                            ])
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
                         })
-                    }
-                }
-            }
-            res.map((item, index) => {
-                dataTable.push([
-                    item.type_report_id,
-                    item.id,
-                    item.parent,
-                    item.formula,
-                    item.level,
-                    "",
-                    item.description,
-                    item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : item.cat.weight,
-                    item.cat.uom,
-                    item.kpi_type == "" ? null : { value: item.kpi_type },
-                    item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
-                    item.formula == "" ? null : { value: item.formula_ytd },
-                    item.cat.total_actual_before == "" ? item.cat.total_actual_before : String(item.cat.total_actual_before).indexOf(".") == -1 ? Number(item.cat.total_actual_before) : Number(item.cat.total_actual_before).toFixed(1),
-                    item.cat.january == "" ? item.cat.january : String(item.cat.january).indexOf(".") == -1 ? Number(item.cat.january) : Number(item.cat.january).toFixed(1),
-                    item.cat.february == "" ? item.cat.february : String(item.cat.february).indexOf(".") == -1 ? Number(item.cat.february) : Number(item.cat.february).toFixed(1),
-                    item.cat.march == "" ? item.cat.march : String(item.cat.march).indexOf(".") == -1 ? Number(item.cat.march) : Number(item.cat.march).toFixed(1),
-                    item.cat.april == "" ? item.cat.april : String(item.cat.april).indexOf(".") == -1 ? Number(item.cat.april) : Number(item.cat.april).toFixed(1),
-                    item.cat.may == "" ? item.cat.may : String(item.cat.may).indexOf(".") == -1 ? Number(item.cat.may) : Number(item.cat.may).toFixed(1),
-                    item.cat.june == "" ? item.cat.june : String(item.cat.june).indexOf(".") == -1 ? Number(item.cat.june) : Number(item.cat.june).toFixed(1),
-                    item.cat.july == "" ? item.cat.july : String(item.cat.july).indexOf(".") == -1 ? Number(item.cat.july) : Number(item.cat.july).toFixed(1),
-                    item.cat.august == "" ? item.cat.august : String(item.cat.august).indexOf(".") == -1 ? Number(item.cat.august) : Number(item.cat.august).toFixed(1),
-                    item.cat.september == "" ? item.cat.september : String(item.cat.september).indexOf(".") == -1 ? Number(item.cat.september) : Number(item.cat.september).toFixed(1),
-                    item.cat.october == "" ? item.cat.october : String(item.cat.october).indexOf(".") == -1 ? Number(item.cat.october) : Number(item.cat.october).toFixed(1),
-                    item.cat.november == "" ? item.cat.november : String(item.cat.november).indexOf(".") == -1 ? Number(item.cat.november) : Number(item.cat.november).toFixed(1),
-                    item.cat.december == "" ? item.cat.december : String(item.cat.december).indexOf(".") == -1 ? Number(item.cat.december) : Number(item.cat.december).toFixed(1),
-                    item.cat.total_current_year == "" ? item.cat.total_current_year : String(item.cat.total_current_year).indexOf(".") == -1 ? Number(item.cat.total_current_year) : Number(item.cat.total_current_year).toFixed(1),
-                    item.cat.total_next_year == "" ? item.cat.total_next_year : String(item.cat.total_next_year).indexOf(".") == -1 ? Number(item.cat.total_next_year) : Number(item.cat.total_next_year).toFixed(1),
-                    item.cat.total_more_year == "" ? item.cat.total_more_year : String(item.cat.total_more_year).indexOf(".") == -1 ? Number(item.cat.total_more_year) : Number(item.cat.total_more_year).toFixed(1),
-                    item.cat.strategic,
-                    item.cat.pic
-                ])
-                if (item.children !== null) {
-                    if (item.children.length > 0) {
-                        item.children.map((items, indexs) => {
-                            handlePushChild(items)
+                        this.setState({ dataTable, loading: false, dataReal: res, editable: true, dataCustomerPrs, dataInternalBsn }, () => {
+                            // console.log(dataCustomerPrs)
+                        })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
                         })
                     }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
-            })
-            this.setState({ dataTable, loading: false, dataReal: res, editable: true, dataCustomerPrs, dataInternalBsn }, () => {
-                // console.log(dataCustomerPrs)
-            })
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+            }
+        
+                
         })
     }
 
@@ -352,83 +373,98 @@ export default class CorporateAnnualTarget extends Component {
         })
         // console.log(JSON.stringify(this.state.payload))
         api.create().checkUploadMB(this.state.payload).then(response => {
-            // // // console.log(JSON.stringify(this.state.payload));
+            // console.log(JSON.stringify(this.state.payload));
             // console.log(response)
             if (response.data) {
-                if (response.data.status === 'success') {
-                    // this.setState({ visibleUpload: false, visibleCAT: false })
-                    this.setState({ visibleUpload: false, visibleCAT: false })
-                    let dataTable = []
-                    let custoId = 0
-                    let bisnsId = 0
-                    let dataDelete = this.state.dataDelete
-                    response.data.data.map((item, index) => {
-                        if (item.item_report == 'CUSTOMER PERSPECTIVE') {
-                            custoId = item.item_report_id
-                        }
-
-                        if (item.item_report == 'INTERNAL BUSINESS PROCESS PERSPECTIVE') {
-                            bisnsId = item.item_report_id
-                        }
-
-                        if (item.type_report_id !== 4 && item.parent !== null && (item.parent == custoId || item.parent == bisnsId)) {
-                            let indexCust = this.state.dataCustomerPrs.findIndex((val) => val.name == item.item_report)
-                            let indexBisn = this.state.dataInternalBsn.findIndex((val) => val.name == item.item_report)
-                            if (indexCust !== -1 && item.item_report_id == 0) {
-                                dataDelete.push(this.state.dataCustomerPrs[indexCust].id)
+                if (response. ok) {
+                    if (response.data.status === 'success') {
+                        // this.setState({ visibleUpload: false, visibleCAT: false })
+                        this.setState({ visibleUpload: false, visibleCAT: false })
+                        let dataTable = []
+                        let custoId = 0
+                        let bisnsId = 0
+                        let dataDelete = this.state.dataDelete
+                        response.data.data.map((item, index) => {
+                            if (item.item_report == 'CUSTOMER PERSPECTIVE') {
+                                custoId = item.item_report_id
                             }
-
-                            if (indexBisn !== -1 && item.item_report_id == 0) {
-                                dataDelete.push(this.state.dataInternalBsn[indexBisn].id)
+    
+                            if (item.item_report == 'INTERNAL BUSINESS PROCESS PERSPECTIVE') {
+                                bisnsId = item.item_report_id
                             }
-                        }
-
-                        dataTable.push([
-                            item.type_report_id,
-                            item.item_report_id,
-                            item.parent,
-                            item.formula,
-                            item.level == null ? 1 : item.level,
-                            "",
-                            item.item_report,
-                            item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(item.weight).indexOf(".") == -1 ? item.weight : `${Number(item.weight) * 100}%`),
-                            item.uom,
-                            item.kpi_type == "" || item.kpi_type == null ? null : { value: item.kpi_type },
-                            item.max_ach == "" || item.max_ach == null ? null : { value: titleCase(item.max_ach) },
-                            item.formula_ytd == "" || item.formula_ytd == null ? null : { value: item.formula_ytd },
-                            item.total_actual_before == "" ? item.total_actual_before : String(item.total_actual_before).indexOf(".") == -1 ? Number(item.total_actual_before) : Number(item.total_actual_before).toFixed(1),
-                            item.january == "" ? item.january : String(item.january).indexOf(".") == -1 ? Number(item.january) : Number(item.january).toFixed(1),
-                            item.february == "" ? item.february : String(item.february).indexOf(".") == -1 ? Number(item.february) : Number(item.february).toFixed(1),
-                            item.march == "" ? item.march : String(item.march).indexOf(".") == -1 ? Number(item.march) : Number(item.march).toFixed(1),
-                            item.april == "" ? item.april : String(item.april).indexOf(".") == -1 ? Number(item.april) : Number(item.april).toFixed(1),
-                            item.may == "" ? item.may : String(item.may).indexOf(".") == -1 ? Number(item.may) : Number(item.may).toFixed(1),
-                            item.june == "" ? item.june : String(item.june).indexOf(".") == -1 ? Number(item.june) : Number(item.june).toFixed(1),
-                            item.july == "" ? item.july : String(item.july).indexOf(".") == -1 ? Number(item.july) : Number(item.july).toFixed(1),
-                            item.august == "" ? item.august : String(item.august).indexOf(".") == -1 ? Number(item.august) : Number(item.august).toFixed(1),
-                            item.september == "" ? item.september : String(item.september).indexOf(".") == -1 ? Number(item.september) : Number(item.september).toFixed(1),
-                            item.october == "" ? item.october : String(item.october).indexOf(".") == -1 ? Number(item.october) : Number(item.october).toFixed(1),
-                            item.november == "" ? item.november : String(item.november).indexOf(".") == -1 ? Number(item.november) : Number(item.november).toFixed(1),
-                            item.december == "" ? item.december : String(item.december).indexOf(".") == -1 ? Number(item.december) : Number(item.december).toFixed(1),
-                            item.total_current_year == "" ? item.total_current_year : String(item.total_current_year).indexOf(".") == -1 ? Number(item.total_current_year) : Number(item.total_current_year).toFixed(1),
-                            item.total_next_year == "" ? item.total_next_year : String(item.total_next_year).indexOf(".") == -1 ? Number(item.total_next_year) : Number(item.total_next_year).toFixed(1),
-                            item.total_more_year == "" ? item.total_more_year : String(item.total_more_year).indexOf(".") == -1 ? Number(item.total_more_year) : Number(item.total_more_year).toFixed(1),
-                            item.strategic,
-                            item.pic,
-                            item.error
-                        ])
-                    })
-                    // console.log(dataTable)
-                    // // console.log(this.state.buttonError)
-                    this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, dataDelete }, () => {
-                        this.state.dataTable.map(item => {
-                            if (item[30].length > 0) {
-                                // // console.log('masuk')
-                                this.setState({ buttonError: true, errorPreview: true, editable: true })
+    
+                            if (item.type_report_id !== 4 && item.parent !== null && (item.parent == custoId || item.parent == bisnsId)) {
+                                let indexCust = this.state.dataCustomerPrs.findIndex((val) => val.name == item.item_report)
+                                let indexBisn = this.state.dataInternalBsn.findIndex((val) => val.name == item.item_report)
+                                if (indexCust !== -1 && item.item_report_id == 0) {
+                                    dataDelete.push(this.state.dataCustomerPrs[indexCust].id)
+                                }
+    
+                                if (indexBisn !== -1 && item.item_report_id == 0) {
+                                    dataDelete.push(this.state.dataInternalBsn[indexBisn].id)
+                                }
                             }
+    
+                            dataTable.push([
+                                item.type_report_id,
+                                item.item_report_id,
+                                item.parent,
+                                item.formula,
+                                item.level == null ? 1 : item.level,
+                                "",
+                                item.item_report,
+                                item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(item.weight).indexOf(".") == -1 ? item.weight : `${Number(item.weight) * 100}%`),
+                                item.uom,
+                                item.kpi_type == "" || item.kpi_type == null ? null : { value: item.kpi_type },
+                                item.max_ach == "" || item.max_ach == null ? null : { value: titleCase(item.max_ach) },
+                                item.formula_ytd == "" || item.formula_ytd == null ? null : { value: item.formula_ytd },
+                                item.total_actual_before == "" ? item.total_actual_before : String(item.total_actual_before).indexOf(".") == -1 ? Number(item.total_actual_before) : Number(item.total_actual_before).toFixed(1),
+                                item.january == "" ? item.january : String(item.january).indexOf(".") == -1 ? Number(item.january) : Number(item.january).toFixed(1),
+                                item.february == "" ? item.february : String(item.february).indexOf(".") == -1 ? Number(item.february) : Number(item.february).toFixed(1),
+                                item.march == "" ? item.march : String(item.march).indexOf(".") == -1 ? Number(item.march) : Number(item.march).toFixed(1),
+                                item.april == "" ? item.april : String(item.april).indexOf(".") == -1 ? Number(item.april) : Number(item.april).toFixed(1),
+                                item.may == "" ? item.may : String(item.may).indexOf(".") == -1 ? Number(item.may) : Number(item.may).toFixed(1),
+                                item.june == "" ? item.june : String(item.june).indexOf(".") == -1 ? Number(item.june) : Number(item.june).toFixed(1),
+                                item.july == "" ? item.july : String(item.july).indexOf(".") == -1 ? Number(item.july) : Number(item.july).toFixed(1),
+                                item.august == "" ? item.august : String(item.august).indexOf(".") == -1 ? Number(item.august) : Number(item.august).toFixed(1),
+                                item.september == "" ? item.september : String(item.september).indexOf(".") == -1 ? Number(item.september) : Number(item.september).toFixed(1),
+                                item.october == "" ? item.october : String(item.october).indexOf(".") == -1 ? Number(item.october) : Number(item.october).toFixed(1),
+                                item.november == "" ? item.november : String(item.november).indexOf(".") == -1 ? Number(item.november) : Number(item.november).toFixed(1),
+                                item.december == "" ? item.december : String(item.december).indexOf(".") == -1 ? Number(item.december) : Number(item.december).toFixed(1),
+                                item.total_current_year == "" ? item.total_current_year : String(item.total_current_year).indexOf(".") == -1 ? Number(item.total_current_year) : Number(item.total_current_year).toFixed(1),
+                                item.total_next_year == "" ? item.total_next_year : String(item.total_next_year).indexOf(".") == -1 ? Number(item.total_next_year) : Number(item.total_next_year).toFixed(1),
+                                item.total_more_year == "" ? item.total_more_year : String(item.total_more_year).indexOf(".") == -1 ? Number(item.total_more_year) : Number(item.total_more_year).toFixed(1),
+                                item.strategic,
+                                item.pic,
+                                item.error
+                            ])
                         })
-                        // // // console.log(this.state.dataTable);
-                    })
+                        // console.log(dataTable)
+                        // // console.log(this.state.buttonError)
+                        this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, dataDelete }, () => {
+                            this.state.dataTable.map(item => {
+                                if (item[30].length > 0) {
+                                    // // console.log('masuk')
+                                    this.setState({ buttonError: true, errorPreview: true, editable: true })
+                                }
+                            })
+                            // // // console.log(this.state.dataTable);
+                        })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    } 
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -493,14 +529,25 @@ export default class CorporateAnnualTarget extends Component {
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
             // // console.log(response);
             if (response.data) {
-                if (response.data.status === "success") {
-                    this.props.onClickClose()
-                    this.props.getReport()
+                if (response.ok) {
+                    if (response.data.status === "success") {
+                        this.props.onClickClose()
+                        this.props.getReport()
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
                 } else {
-                    alert(response.data.status)
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -746,7 +793,6 @@ export default class CorporateAnnualTarget extends Component {
                                 }, 1000);
                             }
                         })
-                        // alert(response.data.message)
                     }
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -9,6 +9,7 @@ import ReactTooltip from 'react-tooltip';
 import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
+import Constant from '../../library/Constant';
 import * as R from 'ramda'
 
 const LightTooltip = withStyles((theme) => ({
@@ -90,85 +91,100 @@ export default class FixedAssetsMovement extends Component {
             // console.log(response);
             let dataTable = []
             if (response.data) {
-                let res = response.data.data
-                const handlePushChild = (item) => {
-                    let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
-                    if (indexIDzz === -1) {
-                        dataTable.push([
-                            item.type_report_id,
-                            item.id,
-                            item.parent,
-                            item.formula,
-                            item.level,
-                            item.description,
-                            item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : item.fixed_asset_movement.january,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : item.fixed_asset_movement.february,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : item.fixed_asset_movement.march,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : item.fixed_asset_movement.april,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : item.fixed_asset_movement.may,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : item.fixed_asset_movement.june,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : item.fixed_asset_movement.july,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : item.fixed_asset_movement.august,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : item.fixed_asset_movement.september,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : item.fixed_asset_movement.october,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : item.fixed_asset_movement.november,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : item.fixed_asset_movement.december,
-                            item.fixed_asset_movement.total_current_year,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_next_year,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_more_year,
-                            item.order,
-                            item.fixed_asset_movement.forecast_formula,
-                            item.fixed_asset_movement.before_formula
-                        ])
-                    }
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                if (response.ok) {
+                    if (response.data.status === 'success') {
+                        let res = response.data.data
+                        const handlePushChild = (item) => {
+                            let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
+                            if (indexIDzz === -1) {
+                                dataTable.push([
+                                    item.type_report_id,
+                                    item.id,
+                                    item.parent,
+                                    item.formula,
+                                    item.level,
+                                    item.description,
+                                    item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : item.fixed_asset_movement.january,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : item.fixed_asset_movement.february,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : item.fixed_asset_movement.march,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : item.fixed_asset_movement.april,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : item.fixed_asset_movement.may,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : item.fixed_asset_movement.june,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : item.fixed_asset_movement.july,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : item.fixed_asset_movement.august,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : item.fixed_asset_movement.september,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : item.fixed_asset_movement.october,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : item.fixed_asset_movement.november,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : item.fixed_asset_movement.december,
+                                    item.fixed_asset_movement.total_current_year,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_next_year,
+                                    item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_more_year,
+                                    item.order,
+                                    item.fixed_asset_movement.forecast_formula,
+                                    item.fixed_asset_movement.before_formula
+                                ])
+                            }
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
                         }
+                        res.map((item, index) => {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.id,
+                                item.parent,
+                                item.formula,
+                                item.level,
+                                item.description,
+                                item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : item.fixed_asset_movement.january,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : item.fixed_asset_movement.february,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : item.fixed_asset_movement.march,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : item.fixed_asset_movement.april,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : item.fixed_asset_movement.may,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : item.fixed_asset_movement.june,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : item.fixed_asset_movement.july,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : item.fixed_asset_movement.august,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : item.fixed_asset_movement.september,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : item.fixed_asset_movement.october,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : item.fixed_asset_movement.november,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : item.fixed_asset_movement.december,
+                                item.fixed_asset_movement.total_current_year,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_next_year,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_more_year,
+                                item.order,
+                                item.fixed_asset_movement.forecast_formula,
+                                item.fixed_asset_movement.before_formula
+                            ])
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
+                        })
+                        this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
                     }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false})
                 }
-                res.map((item, index) => {
-                    dataTable.push([
-                        item.type_report_id,
-                        item.id,
-                        item.parent,
-                        item.formula,
-                        item.level,
-                        item.description,
-                        item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : item.fixed_asset_movement.january,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : item.fixed_asset_movement.february,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : item.fixed_asset_movement.march,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : item.fixed_asset_movement.april,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : item.fixed_asset_movement.may,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : item.fixed_asset_movement.june,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : item.fixed_asset_movement.july,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : item.fixed_asset_movement.august,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : item.fixed_asset_movement.september,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : item.fixed_asset_movement.october,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : item.fixed_asset_movement.november,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : item.fixed_asset_movement.december,
-                        item.fixed_asset_movement.total_current_year,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_next_year,
-                        item.type_report_id == 5 || item.type_report_id == 6 ? 0 : item.fixed_asset_movement.total_more_year,
-                        item.order,
-                        item.fixed_asset_movement.forecast_formula,
-                        item.fixed_asset_movement.before_formula
-                    ])
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
-                        }
-                    }
-                })
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
             } else {
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -304,48 +320,63 @@ export default class FixedAssetsMovement extends Component {
             // // console.log(JSON.stringify(this.state.payload));
             // // console.log(response)
             if (response.data) {
-                if (response.data.status === 'success') {
-                    this.setState({ visibleUpload: false, visibleFixedAssetsMovement: false, loading: true })
-                    let dataTable = response.data.data.map((item, index) => {
-                        return [
-                            item.type_report_id,
-                            item.item_report_id,
-                            item.parent,
-                            item.formula,
-                            item.level,
-                            item.item_report,
-                            item.total_actual_before,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.january, formula: item.january_formula } : item.january,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.february, formula: item.february_formula } : item.february,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.march, formula: item.march_formula } : item.march,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.april, formula: item.april_formula } : item.april,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.may, formula: item.may_formula } : item.may,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.june, formula: item.june_formula } : item.june,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.july, formula: item.july_formula } : item.july,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.august, formula: item.august_formula } : item.august,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.september, formula: item.september_formula } : item.september,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.october, formula: item.october_formula } : item.october,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.november, formula: item.november_formula } : item.november,
-                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.december, formula: item.december_formula } : item.december,
-                            item.total_current_year,
-                            item.total_next_year,
-                            item.total_more_year,
-                            item.orders,
-                            item.forecast_formula,
-                            item.before_formula,
-                            item.error
-                        ]
-                    })
-                    this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true }, () => {
-                        this.state.dataTable.map(item => {
-                            if (item[24].length > 0) {
-                                // // console.log('masuk')
-                                this.setState({ buttonError: true, errorPreview: true, editable: true })
+                if (response.ok) {
+                    if (response.data.status === 'success') {
+                        this.setState({ visibleUpload: false, visibleFixedAssetsMovement: false, loading: true })
+                        let dataTable = response.data.data.map((item, index) => {
+                            return [
+                                item.type_report_id,
+                                item.item_report_id,
+                                item.parent,
+                                item.formula,
+                                item.level,
+                                item.item_report,
+                                item.total_actual_before,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.january, formula: item.january_formula } : item.january,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.february, formula: item.february_formula } : item.february,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.march, formula: item.march_formula } : item.march,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.april, formula: item.april_formula } : item.april,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.may, formula: item.may_formula } : item.may,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.june, formula: item.june_formula } : item.june,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.july, formula: item.july_formula } : item.july,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.august, formula: item.august_formula } : item.august,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.september, formula: item.september_formula } : item.september,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.october, formula: item.october_formula } : item.october,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.november, formula: item.november_formula } : item.november,
+                                item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.december, formula: item.december_formula } : item.december,
+                                item.total_current_year,
+                                item.total_next_year,
+                                item.total_more_year,
+                                item.orders,
+                                item.forecast_formula,
+                                item.before_formula,
+                                item.error
+                            ]
+                        })
+                        this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true }, () => {
+                            this.state.dataTable.map(item => {
+                                if (item[24].length > 0) {
+                                    // // console.log('masuk')
+                                    this.setState({ buttonError: true, errorPreview: true, editable: true })
+                                }
+                            })
+                            // // console.log(this.state.dataTable);
+                        })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
                             }
                         })
-                        // // console.log(this.state.dataTable);
-                    })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -385,15 +416,27 @@ export default class FixedAssetsMovement extends Component {
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
             // // console.log(response);
             if (response.data) {
-                if (response.data.status === "success") {
-                    this.props.onClickClose()
-                    this.props.getReport()
+                if (response.ok) {
+                    if (response.data.status === "success") {
+                        this.props.onClickClose()
+                        this.props.getReport()
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
                 } else {
-                    alert(response.data.status)
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ loading: false })
-                alert(response.problem)
+                // this.setState({ loading: false })
+                // alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/ProfitLoss.js

@@ -10,6 +10,7 @@ import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -106,86 +107,100 @@ export default class ProfitLoss extends Component {
             let dataTable = []
             this.setState({ visibleProfitLoss: true })
             if (response.data) {
-                let res = response.data.data
-                const handlePushChild = (item) => {
-                    let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
-                    if (indexIDzz === -1) {
-                        dataTable.push([
-                            item.type_report_id,
-                            item.id,
-                            item.parent,
-                            item.formula,
-                            item.level,
-                            item.description,
-                            item.profit_loss.notes === "" ? null : item.profit_loss.notes,
-                            item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
-                            item.profit_loss.january,
-                            item.profit_loss.february,
-                            item.profit_loss.march,
-                            item.profit_loss.april,
-                            item.profit_loss.may,
-                            item.profit_loss.june,
-                            item.profit_loss.july,
-                            item.profit_loss.august,
-                            item.profit_loss.september,
-                            item.profit_loss.october,
-                            item.profit_loss.november,
-                            item.profit_loss.december,
-                            item.profit_loss.total_current_year,
-                            item.profit_loss.total_next_year,
-                            item.profit_loss.total_more_year,
-                            item.order
-                        ])
-                    }
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                if (response.ok) {
+                    if (response.data.status === 'success') {
+                        let res = response.data.data
+                        const handlePushChild = (item) => {
+                            let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
+                            if (indexIDzz === -1) {
+                                dataTable.push([
+                                    item.type_report_id,
+                                    item.id,
+                                    item.parent,
+                                    item.formula,
+                                    item.level,
+                                    item.description,
+                                    item.profit_loss.notes === "" ? null : item.profit_loss.notes,
+                                    item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
+                                    item.profit_loss.january,
+                                    item.profit_loss.february,
+                                    item.profit_loss.march,
+                                    item.profit_loss.april,
+                                    item.profit_loss.may,
+                                    item.profit_loss.june,
+                                    item.profit_loss.july,
+                                    item.profit_loss.august,
+                                    item.profit_loss.september,
+                                    item.profit_loss.october,
+                                    item.profit_loss.november,
+                                    item.profit_loss.december,
+                                    item.profit_loss.total_current_year,
+                                    item.profit_loss.total_next_year,
+                                    item.profit_loss.total_more_year,
+                                    item.order
+                                ])
+                            }
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
                         }
+                        res.map((item, index) => {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.id,
+                                item.parent,
+                                item.formula,
+                                item.level,
+                                item.description,
+                                item.profit_loss.notes === "" ? null : item.profit_loss.notes,
+                                item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
+                                item.profit_loss.january,
+                                item.profit_loss.february,
+                                item.profit_loss.march,
+                                item.profit_loss.april,
+                                item.profit_loss.may,
+                                item.profit_loss.june,
+                                item.profit_loss.july,
+                                item.profit_loss.august,
+                                item.profit_loss.september,
+                                item.profit_loss.october,
+                                item.profit_loss.november,
+                                item.profit_loss.december,
+                                item.profit_loss.total_current_year,
+                                item.profit_loss.total_next_year,
+                                item.profit_loss.total_more_year,
+                                item.order
+                            ])
+                            if (item.children !== null) {
+                                if (item.children.length > 0) {
+                                    item.children.map((items, indexs) => {
+                                        handlePushChild(items)
+                                    })
+                                }
+                            }
+                        })
+                        // console.log(dataTable)
+                        this.setState({ dataTable, loading: false, buttonError: true, editable: true }, () => {
+                        })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
                     }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
-                res.map((item, index) => {
-                    dataTable.push([
-                        item.type_report_id,
-                        item.id,
-                        item.parent,
-                        item.formula,
-                        item.level,
-                        item.description,
-                        item.profit_loss.notes === "" ? null : item.profit_loss.notes,
-                        item.profit_loss.total_actual_before === null ? "0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
-                        item.profit_loss.january,
-                        item.profit_loss.february,
-                        item.profit_loss.march,
-                        item.profit_loss.april,
-                        item.profit_loss.may,
-                        item.profit_loss.june,
-                        item.profit_loss.july,
-                        item.profit_loss.august,
-                        item.profit_loss.september,
-                        item.profit_loss.october,
-                        item.profit_loss.november,
-                        item.profit_loss.december,
-                        item.profit_loss.total_current_year,
-                        item.profit_loss.total_next_year,
-                        item.profit_loss.total_more_year,
-                        item.order
-                    ])
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
-                        }
-                    }
-                })
-                // console.log(dataTable)
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true }, () => {
-                    // console.log(dataTable)
-                })
             } else {
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
 
         })
@@ -406,17 +421,25 @@ export default class ProfitLoss extends Component {
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
             // console.log(response);
             if (response.data) {
-                if (response.data.status === "success") {
-                    this.props.onClickClose()
-                    this.props.getReport()
+                if (response.ok) {
+                    if (response.data.status === "success") {
+                        this.props.onClickClose()
+                        this.props.getReport()
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
                 } else {
-                    alert(response.data.status)
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
-                this.setState({ loading: false })
-                alert(response.problem)
-                // this.props.onClickClose()
-                // this.props.getReport()
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/TaxPlanning.js

@@ -12,6 +12,7 @@ import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -116,10 +117,54 @@ export default class TaxPlanning extends Component {
             // console.log(response);
             let dataTable = []
             if (response.data) {
-                let res = response.data.data
-                const handlePushChild = (item) => {
-                    let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
-                    if (indexIDzz === -1) {
+                if (response.data.status == 'success') {
+                    let res = response.data.data
+                    const handlePushChild = (item) => {
+                        let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
+                        if (indexIDzz === -1) {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.type_report_tax.value_tbc.type_report_id,
+                                item.type_report_tax.value_fc.type_report_id,
+                                item.type_report_tax.value_tbf.type_report_id,
+                                item.id,
+                                item.parent,
+                                { tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
+                                item.level,
+                                item.description,
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.january.tbc, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.january.fcp, formula: item.tax_planning.january_formula } : item.tax_planning.january.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.january.tbf, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.february.tbc, formula: item.tax_planning.february_formula } : item.tax_planning.february.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.february.fcp, formula: item.tax_planning.february_formula } : item.tax_planning.february.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.february.tbf, formula: item.tax_planning.february_formula } : item.tax_planning.february.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.march.tbc, formula: item.tax_planning.march_formula } : item.tax_planning.march.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.march.fcp, formula: item.tax_planning.march_formula } : item.tax_planning.march.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.march.tbf, formula: item.tax_planning.march_formula } : item.tax_planning.march.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.april.tbc, formula: item.tax_planning.april_formula } : item.tax_planning.april.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.april.fcp, formula: item.tax_planning.april_formula } : item.tax_planning.april.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.april.tbf, formula: item.tax_planning.april_formula } : item.tax_planning.april.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.may.tbc, formula: item.tax_planning.may_formula } : item.tax_planning.may.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.may.fcp, formula: item.tax_planning.may_formula } : item.tax_planning.may.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.may.tbf, formula: item.tax_planning.may_formula } : item.tax_planning.may.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.june.tbc, formula: item.tax_planning.june_formula } : item.tax_planning.june.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.june.fcp, formula: item.tax_planning.june_formula } : item.tax_planning.june.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.june.tbf, formula: item.tax_planning.june_formula } : item.tax_planning.june.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.july.tbc, formula: item.tax_planning.july_formula } : item.tax_planning.july.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.july.fcp, formula: item.tax_planning.july_formula } : item.tax_planning.july.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.july.tbf, formula: item.tax_planning.july_formula } : item.tax_planning.july.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.august.tbc, formula: item.tax_planning.august_formula } : item.tax_planning.august.tbc === null ? "0" : item.tax_planning.august.tbc === "" ? "0" : item.tax_planning.august.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.august.fcp, formula: item.tax_planning.august_formula } : item.tax_planning.august.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.august.tbf, formula: item.tax_planning.august_formula } : item.tax_planning.august.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.september.tbc, formula: item.tax_planning.september_formula } : item.tax_planning.september.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.september.fcp, formula: item.tax_planning.september_formula } : item.tax_planning.september.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.september.tbf, formula: item.tax_planning.september_formula } : item.tax_planning.september.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.october.tbc, formula: item.tax_planning.october_formula } : item.tax_planning.october.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.october.fcp, formula: item.tax_planning.october_formula } : item.tax_planning.october.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.october.tbf, formula: item.tax_planning.october_formula } : item.tax_planning.october.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.november.tbc, formula: item.tax_planning.november_formula } : item.tax_planning.november.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.november.fcp, formula: item.tax_planning.november_formula } : item.tax_planning.november.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.november.tbf, formula: item.tax_planning.november_formula } : item.tax_planning.november.tbf },
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.december.tbc, formula: item.tax_planning.december_formula } : item.tax_planning.december.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.december.fcp, formula: item.tax_planning.december_formula } : item.tax_planning.december.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.december.tbf, formula: item.tax_planning.december_formula } : item.tax_planning.december.tbf },
+                                item.tax_planning.total_current_year,
+                                // { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.total_next_year.tbc } : item.tax_planning.total_next_year.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.total_next_year.fcp } : item.tax_planning.total_next_year.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.total_next_year.tbf } : item.tax_planning.total_next_year.tbf },
+                                { tbc: item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf },
+                                { tbc: item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf },
+                                item.order,
+                                { tbc: item.condition_it_should_be_tax.value_tbc, fcp: item.condition_it_should_be_tax.value_fc, tbf: item.condition_it_should_be_tax.value_tbf },
+                                { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
+                                item.tax_planning.forecast_tbc_formula,
+                                item.tax_planning.forecast_fcp_formula,
+                                item.tax_planning.forecast_tbf_formula,
+                            ])
+                        }
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
+                        }
+                    }
+                    res.map((item, index) => {
                         dataTable.push([
                             item.type_report_id,
                             item.type_report_tax.value_tbc.type_report_id,
@@ -151,61 +196,28 @@ export default class TaxPlanning extends Component {
                             { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
                             item.tax_planning.forecast_tbc_formula,
                             item.tax_planning.forecast_fcp_formula,
-                            item.tax_planning.forecast_tbf_formula,
+                            item.tax_planning.forecast_tbf_formula
                         ])
-                    }
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
                         }
-                    }
-                }
-                res.map((item, index) => {
-                    dataTable.push([
-                        item.type_report_id,
-                        item.type_report_tax.value_tbc.type_report_id,
-                        item.type_report_tax.value_fc.type_report_id,
-                        item.type_report_tax.value_tbf.type_report_id,
-                        item.id,
-                        item.parent,
-                        { tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
-                        item.level,
-                        item.description,
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.january.tbc, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.january.fcp, formula: item.tax_planning.january_formula } : item.tax_planning.january.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.january.tbf, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.february.tbc, formula: item.tax_planning.february_formula } : item.tax_planning.february.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.february.fcp, formula: item.tax_planning.february_formula } : item.tax_planning.february.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.february.tbf, formula: item.tax_planning.february_formula } : item.tax_planning.february.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.march.tbc, formula: item.tax_planning.march_formula } : item.tax_planning.march.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.march.fcp, formula: item.tax_planning.march_formula } : item.tax_planning.march.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.march.tbf, formula: item.tax_planning.march_formula } : item.tax_planning.march.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.april.tbc, formula: item.tax_planning.april_formula } : item.tax_planning.april.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.april.fcp, formula: item.tax_planning.april_formula } : item.tax_planning.april.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.april.tbf, formula: item.tax_planning.april_formula } : item.tax_planning.april.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.may.tbc, formula: item.tax_planning.may_formula } : item.tax_planning.may.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.may.fcp, formula: item.tax_planning.may_formula } : item.tax_planning.may.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.may.tbf, formula: item.tax_planning.may_formula } : item.tax_planning.may.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.june.tbc, formula: item.tax_planning.june_formula } : item.tax_planning.june.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.june.fcp, formula: item.tax_planning.june_formula } : item.tax_planning.june.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.june.tbf, formula: item.tax_planning.june_formula } : item.tax_planning.june.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.july.tbc, formula: item.tax_planning.july_formula } : item.tax_planning.july.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.july.fcp, formula: item.tax_planning.july_formula } : item.tax_planning.july.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.july.tbf, formula: item.tax_planning.july_formula } : item.tax_planning.july.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.august.tbc, formula: item.tax_planning.august_formula } : item.tax_planning.august.tbc === null ? "0" : item.tax_planning.august.tbc === "" ? "0" : item.tax_planning.august.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.august.fcp, formula: item.tax_planning.august_formula } : item.tax_planning.august.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.august.tbf, formula: item.tax_planning.august_formula } : item.tax_planning.august.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.september.tbc, formula: item.tax_planning.september_formula } : item.tax_planning.september.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.september.fcp, formula: item.tax_planning.september_formula } : item.tax_planning.september.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.september.tbf, formula: item.tax_planning.september_formula } : item.tax_planning.september.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.october.tbc, formula: item.tax_planning.october_formula } : item.tax_planning.october.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.october.fcp, formula: item.tax_planning.october_formula } : item.tax_planning.october.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.october.tbf, formula: item.tax_planning.october_formula } : item.tax_planning.october.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.november.tbc, formula: item.tax_planning.november_formula } : item.tax_planning.november.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.november.fcp, formula: item.tax_planning.november_formula } : item.tax_planning.november.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.november.tbf, formula: item.tax_planning.november_formula } : item.tax_planning.november.tbf },
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.december.tbc, formula: item.tax_planning.december_formula } : item.tax_planning.december.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.december.fcp, formula: item.tax_planning.december_formula } : item.tax_planning.december.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.december.tbf, formula: item.tax_planning.december_formula } : item.tax_planning.december.tbf },
-                        item.tax_planning.total_current_year,
-                        // { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.total_next_year.tbc } : item.tax_planning.total_next_year.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.total_next_year.fcp } : item.tax_planning.total_next_year.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.total_next_year.tbf } : item.tax_planning.total_next_year.tbf },
-                        { tbc: item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf },
-                        { tbc: item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf },
-                        item.order,
-                        { tbc: item.condition_it_should_be_tax.value_tbc, fcp: item.condition_it_should_be_tax.value_fc, tbf: item.condition_it_should_be_tax.value_tbf },
-                        { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
-                        item.tax_planning.forecast_tbc_formula,
-                        item.tax_planning.forecast_fcp_formula,
-                        item.tax_planning.forecast_tbf_formula
-                    ])
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                    })
+                    // console.log(dataTable)
+                    this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                } else {
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
                         }
-                    }
-                })
-                // console.log(dataTable)
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                    })
+                }
             } else {
                 this.setState({ dataTable, loading: false, buttonError: true, editable: true })
             }
@@ -600,11 +612,18 @@ export default class TaxPlanning extends Component {
                     this.props.onClickClose()
                     this.props.getReport()
                 } else {
-                    alert(response.data.status)
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
+                        }
+                    })
+                    // alert(response.data.status)
                 }
             } else {
-                this.setState({ loading: false })
-                alert(response.problem)
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }

src/container/DocumentManagement/DocumentManagement.js

@@ -82,11 +82,9 @@ export default class DocumentManagement extends Component {
                         loadTable: true,
                         refresh: id === undefined ? '' : 'create'
                     })
-                } else {
-
                 }
             } else {
-
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/Laporan/SubHolding.js

@@ -451,91 +451,91 @@ export default class SubHolding extends Component {
                 }
             })
         } else if (this.state.report.value === 4) {
-            api.create().getDetailReportMB(payload).then(response => {
-                console.log(payload);
+            api.create().getReportHierarkiFR(payload).then(response => {
+                // console.log(payload);
                 console.log(response);
-                // let dataTable = []
-                // if (response.data) {
-                //     let res = response.data.data
-                //     const handlePushChild = (item) => {
-                //         let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
-                //         if (indexIDzz === -1) {
-                //             dataTable.push([
-                //                 item.type_report_id,
-                //                 item.id,
-                //                 item.parent,
-                //                 item.formula,
-                //                 item.level,
-                //                 item.description,
-                //                 item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before,
-                //                 Number(item.balance_sheet.january).toFixed(1),
-                //                 Number(item.balance_sheet.february).toFixed(1),
-                //                 Number(item.balance_sheet.march).toFixed(1),
-                //                 Number(item.balance_sheet.april).toFixed(1),
-                //                 Number(item.balance_sheet.may).toFixed(1),
-                //                 Number(item.balance_sheet.june).toFixed(1),
-                //                 Number(item.balance_sheet.july).toFixed(1),
-                //                 Number(item.balance_sheet.august).toFixed(1),
-                //                 Number(item.balance_sheet.september).toFixed(1),
-                //                 Number(item.balance_sheet.october).toFixed(1),
-                //                 Number(item.balance_sheet.november).toFixed(1),
-                //                 Number(item.balance_sheet.december).toFixed(1),
-                //                 Number(item.balance_sheet.total_current_year).toFixed(1),
-                //                 Number(item.balance_sheet.total_next_year).toFixed(1),
-                //                 Number(item.balance_sheet.total_more_year).toFixed(1),
-                //                 item.order,
-                //                 item.condition_it_should_be,
-                //                 item.condition_if_wrong
-                //             ])
-                //         }
-                //         if (item.children !== null) {
-                //             if (item.children.length > 0) {
-                //                 item.children.map((items, indexs) => {
-                //                     handlePushChild(items)
-                //                 })
-                //             }
-                //         }
-                //     }
-                //     res.map((item, index) => {
-                //         dataTable.push([
-                //             item.type_report_id,
-                //             item.id,
-                //             item.parent,
-                //             item.formula,
-                //             item.level,
-                //             item.description,
-                //             item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before,
-                //             Number(item.balance_sheet.january).toFixed(1),
-                //             Number(item.balance_sheet.february).toFixed(1),
-                //             Number(item.balance_sheet.march).toFixed(1),
-                //             Number(item.balance_sheet.april).toFixed(1),
-                //             Number(item.balance_sheet.may).toFixed(1),
-                //             Number(item.balance_sheet.june).toFixed(1),
-                //             Number(item.balance_sheet.july).toFixed(1),
-                //             Number(item.balance_sheet.august).toFixed(1),
-                //             Number(item.balance_sheet.september).toFixed(1),
-                //             Number(item.balance_sheet.october).toFixed(1),
-                //             Number(item.balance_sheet.november).toFixed(1),
-                //             Number(item.balance_sheet.december).toFixed(1),
-                //             Number(item.balance_sheet.total_current_year).toFixed(1),
-                //             Number(item.balance_sheet.total_next_year).toFixed(1),
-                //             Number(item.balance_sheet.total_more_year).toFixed(1),
-                //             item.order,
-                //             item.condition_it_should_be,
-                //             item.condition_if_wrong
-                //         ])
-                //         if (item.children !== null) {
-                //             if (item.children.length > 0) {
-                //                 item.children.map((items, indexs) => {
-                //                     handlePushChild(items)
-                //                 })
-                //             }
-                //         }
-                //     })
-                //     this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
-                // } else {
-                //     this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
-                // }
+                let dataTable = []
+                if (response.data) {
+                    let res = response.data.data
+                    const handlePushChild = (item) => {
+                        let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
+                        if (indexIDzz === -1) {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.id,
+                                item.parent,
+                                item.formula,
+                                item.level,
+                                item.description,
+                                item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
+                                Number(item.ratio.january).toFixed(1),
+                                Number(item.ratio.february).toFixed(1),
+                                Number(item.ratio.march).toFixed(1),
+                                Number(item.ratio.april).toFixed(1),
+                                Number(item.ratio.may).toFixed(1),
+                                Number(item.ratio.june).toFixed(1),
+                                Number(item.ratio.july).toFixed(1),
+                                Number(item.ratio.august).toFixed(1),
+                                Number(item.ratio.september).toFixed(1),
+                                Number(item.ratio.october).toFixed(1),
+                                Number(item.ratio.november).toFixed(1),
+                                Number(item.ratio.december).toFixed(1),
+                                Number(item.ratio.total_current_year).toFixed(1),
+                                Number(item.ratio.total_next_year).toFixed(1),
+                                Number(item.ratio.total_more_year).toFixed(1),
+                                item.order,
+                                item.condition_it_should_be,
+                                item.condition_if_wrong
+                            ])
+                        }
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
+                        }
+                    }
+                    res.map((item, index) => {
+                        dataTable.push([
+                            item.type_report_id,
+                            item.id,
+                            item.parent,
+                            item.formula,
+                            item.level,
+                            item.description,
+                            item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
+                            Number(item.ratio.january).toFixed(1),
+                            Number(item.ratio.february).toFixed(1),
+                            Number(item.ratio.march).toFixed(1),
+                            Number(item.ratio.april).toFixed(1),
+                            Number(item.ratio.may).toFixed(1),
+                            Number(item.ratio.june).toFixed(1),
+                            Number(item.ratio.july).toFixed(1),
+                            Number(item.ratio.august).toFixed(1),
+                            Number(item.ratio.september).toFixed(1),
+                            Number(item.ratio.october).toFixed(1),
+                            Number(item.ratio.november).toFixed(1),
+                            Number(item.ratio.december).toFixed(1),
+                            Number(item.ratio.total_current_year).toFixed(1),
+                            Number(item.ratio.total_next_year).toFixed(1),
+                            Number(item.ratio.total_more_year).toFixed(1),
+                            item.order,
+                            item.condition_it_should_be,
+                            item.condition_if_wrong
+                        ])
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
+                        }
+                    })
+                    this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
+                } else {
+                    this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
+                }
             })
         }    
     }

src/container/MonthlyReport/TaxPlanningMR.js

@@ -12,6 +12,7 @@ import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -70,7 +71,7 @@ export default class TaxPlanningMR extends Component {
             "revision": 0,
             "periode": 2021,
             "company_id": 2193390,
-            "submission_id": 3275722
+            "submission_id": 3425765
         }
         api.create().getLastestUpdateMB(payload).then(response => {
             if (response.data) {
@@ -90,16 +91,47 @@ export default class TaxPlanningMR extends Component {
             "revision": 0,
             "periode": 2021,
             "company_id": 2193390,
-            "submission_id": 3275722
+            "submission_id": 3425765
         }
         api.create().getDetailReportMB(payload).then(response => {
             // console.log(response);
             let dataTable = []
             if (response.data) {
-                let res = response.data.data
-                const handlePushChild = (item) => {
-                    let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
-                    if (indexIDzz === -1) {
+                if (response.data.status == 'success') {
+                    let res = response.data.data
+                    const handlePushChild = (item) => {
+                        let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
+                        if (indexIDzz === -1) {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.type_report_tax.value_tbc.type_report_id,
+                                item.type_report_tax.value_fc.type_report_id,
+                                item.type_report_tax.value_tbf.type_report_id,
+                                item.id,
+                                item.parent,
+                                { tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
+                                item.level,
+                                item.description,
+                                { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.january.tbc, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.january.fcp, formula: item.tax_planning.january_formula } : item.tax_planning.january.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.january.tbf, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbf },
+                                item.tax_planning.total_current_year,
+                                item.tax_planning.total_current_year,
+                                item.order,
+                                { tbc: item.condition_it_should_be_tax.value_tbc, fcp: item.condition_it_should_be_tax.value_fc, tbf: item.condition_it_should_be_tax.value_tbf },
+                                { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
+                                item.tax_planning.forecast_tbc_formula,
+                                item.tax_planning.forecast_fcp_formula,
+                                item.tax_planning.forecast_tbf_formula,
+                            ])
+                        }
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
+                        }
+                    }
+                    res.map((item, index) => {
                         dataTable.push([
                             item.type_report_id,
                             item.type_report_tax.value_tbc.type_report_id,
@@ -118,47 +150,27 @@ export default class TaxPlanningMR extends Component {
                             { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
                             item.tax_planning.forecast_tbc_formula,
                             item.tax_planning.forecast_fcp_formula,
-                            item.tax_planning.forecast_tbf_formula,
+                            item.tax_planning.forecast_tbf_formula
                         ])
-                    }
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
                         }
-                    }
-                }
-                res.map((item, index) => {
-                    dataTable.push([
-                        item.type_report_id,
-                        item.type_report_tax.value_tbc.type_report_id,
-                        item.type_report_tax.value_fc.type_report_id,
-                        item.type_report_tax.value_tbf.type_report_id,
-                        item.id,
-                        item.parent,
-                        { tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
-                        item.level,
-                        item.description,
-                        { tbc: item.type_report_tax.value_tbc.type_report_id == 5 || item.type_report_tax.value_tbc.type_report_id == 6 || item.type_report_tax.value_tbc.type_report_id == 7 ? { value: item.tax_planning.january.tbc, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbc, fcp: item.type_report_tax.value_fc.type_report_id == 5 || item.type_report_tax.value_fc.type_report_id == 6 || item.type_report_tax.value_fc.type_report_id == 7 ? { value: item.tax_planning.january.fcp, formula: item.tax_planning.january_formula } : item.tax_planning.january.fcp, tbf: item.type_report_tax.value_tbf.type_report_id == 5 || item.type_report_tax.value_tbf.type_report_id == 6 || item.type_report_tax.value_tbf.type_report_id == 7 ? { value: item.tax_planning.january.tbf, formula: item.tax_planning.january_formula } : item.tax_planning.january.tbf },
-                        item.tax_planning.total_current_year,
-                        item.tax_planning.total_current_year,
-                        item.order,
-                        { tbc: item.condition_it_should_be_tax.value_tbc, fcp: item.condition_it_should_be_tax.value_fc, tbf: item.condition_it_should_be_tax.value_tbf },
-                        { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
-                        item.tax_planning.forecast_tbc_formula,
-                        item.tax_planning.forecast_fcp_formula,
-                        item.tax_planning.forecast_tbf_formula
-                    ])
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                    })
+                    this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                } else {
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
                         }
-                    }
-                })
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                    })
+                }
             } else {
                 this.setState({ dataTable, loading: false, buttonError: true, editable: true })
             }
@@ -552,11 +564,18 @@ export default class TaxPlanningMR extends Component {
                     this.props.onClickClose()
                     this.props.getReport()
                 } else {
-                    alert(response.data.status)
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
+                        }
+                    })
+                    // alert(response.data.status)
                 }
             } else {
-                this.setState({ loading: false })
-                alert(response.problem)
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }

src/container/OutlookPA/TaxPlanningOLPA.js

@@ -12,6 +12,7 @@ import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -93,24 +94,72 @@ export default class TaxPlanningOLPA extends Component {
             "company_id": this.props.company.company_id
         }
         api.create().getDetailReportOLPA(payload).then(response => {
-            // console.log(response);
+            // console.log(payload);
             let dataTable = []
             if (response.data) {
-                let res = response.data.data
-                const handlePushChild = (item) => {
-                    let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
-                    if (indexIDzz === -1) {
-                        dataTable.push([
+                if (response.data.status == 'success') {
+                    let res = response.data.data
+                    const handlePushChild = (item) => {
+                        let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
+                        if (indexIDzz === -1) {
+                            dataTable.push([
+                                item.type_report_id,
+                                item.type_report_tax.value_tbc.type_report_id,
+                                item.type_report_tax.value_fc.type_report_id,
+                                item.type_report_tax.value_tbf.type_report_id,
+                                item.id,
+                                item.parent,
+                                { tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
+                                item.level,
+                                item.description,
+                                {tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, 
+                                    tbf: item.tax_planning.january.tbf === null ? "0" : item.tax_planning.january.tbf === "" ? "0" : item.tax_planning.january.tbf},
+                                {tbc : item.tax_planning.february.tbc, fcp: item.tax_planning.february.fcp, tbf: item.tax_planning.february.tbf},
+                                {tbc : item.tax_planning.march.tbc, fcp: item.tax_planning.march.fcp, tbf: item.tax_planning.march.tbf},
+                                {tbc : item.tax_planning.april.tbc, fcp: item.tax_planning.april.fcp, tbf: item.tax_planning.april.tbf},
+                                {tbc : item.tax_planning.may.tbc, fcp: item.tax_planning.may.fcp, tbf: item.tax_planning.may.tbf},
+                                {tbc : item.tax_planning.june.tbc, fcp: item.tax_planning.june.fcp, tbf: item.tax_planning.june.tbf},
+                                {tbc : item.tax_planning.july.tbc, fcp: item.tax_planning.july.fcp, tbf: item.tax_planning.july.tbf},
+                                {tbc : item.tax_planning.august.tbc === null ? "0" : item.tax_planning.august.tbc === "" ? "0" : item.tax_planning.august.tbc, 
+                                    fcp: item.tax_planning.august.fcp, tbf: item.tax_planning.august.tbf},
+                                {tbc : item.tax_planning.september.tbc, fcp: item.tax_planning.september.fcp, tbf: item.tax_planning.september.tbf},
+                                {tbc : item.tax_planning.october.tbc, fcp: item.tax_planning.october.fcp, tbf: item.tax_planning.october.tbf},
+                                {tbc : item.tax_planning.november.tbc, fcp: item.tax_planning.november.fcp, tbf: item.tax_planning.november.tbf},
+                                {tbc : item.tax_planning.december.tbc, fcp: item.tax_planning.december.fcp, tbf: item.tax_planning.december.tbf},
+                                item.tax_planning.total_current_year,
+                                { tbc: item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf },
+                                { tbc: item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf },
+                                item.order,
+                                // { tbc: item.condition_it_should_be_tax.value_tbc, fcp: item.condition_it_should_be_tax.value_fc, tbf: item.condition_it_should_be_tax.value_tbf },
+                                // { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
+                                { tbc: item.condition_it_should_be_tax, fcp: item.condition_it_should_be_tax, tbf: item.condition_it_should_be_tax },
+                                { tbc: item.condition_if_wrong_tax, fcp: item.condition_if_wrong_tax, tbf: item.condition_if_wrong_tax },
+                                // item.tax_planning.forecast_tbc_formula,
+                                // item.tax_planning.forecast_fcp_formula,
+                                // item.tax_planning.forecast_tbf_formula,
+                            ])
+                        }
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
+                        }  
+                    }
+                    res.map((item, index) => {
+                        dataTable.push([  
                             item.type_report_id,
                             item.type_report_tax.value_tbc.type_report_id,
                             item.type_report_tax.value_fc.type_report_id,
                             item.type_report_tax.value_tbf.type_report_id,
                             item.id,
                             item.parent,
-                            {tbc : item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
+                            { tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
                             item.level,
                             item.description,
-                            {tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, tbf: item.tax_planning.january.tbf},
+                            {tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, 
+                                tbf: item.tax_planning.january.tbf === null ? "0" : item.tax_planning.january.tbf === "" ? "0" : item.tax_planning.january.tbf},
                             {tbc : item.tax_planning.february.tbc, fcp: item.tax_planning.february.fcp, tbf: item.tax_planning.february.tbf},
                             {tbc : item.tax_planning.march.tbc, fcp: item.tax_planning.march.fcp, tbf: item.tax_planning.march.tbf},
                             {tbc : item.tax_planning.april.tbc, fcp: item.tax_planning.april.fcp, tbf: item.tax_planning.april.tbf},
@@ -124,57 +173,38 @@ export default class TaxPlanningOLPA extends Component {
                             {tbc : item.tax_planning.november.tbc, fcp: item.tax_planning.november.fcp, tbf: item.tax_planning.november.tbf},
                             {tbc : item.tax_planning.december.tbc, fcp: item.tax_planning.december.fcp, tbf: item.tax_planning.december.tbf},
                             item.tax_planning.total_current_year,
-                            {tbc : item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf},
-                            {tbc : item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf},
-                            item.order
+                            { tbc: item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf },
+                            { tbc: item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf },
+                            { tbc: item.condition_it_should_be_tax, fcp: item.condition_it_should_be_tax, tbf: item.condition_it_should_be_tax },
+                            { tbc: item.condition_if_wrong_tax, fcp: item.condition_if_wrong_tax, tbf: item.condition_if_wrong_tax },
+                            item.order,
+                            // { tbc: item.condition_it_should_be_tax.value_tbc, fcp: item.condition_it_should_be_tax.value_fc, tbf: item.condition_it_should_be_tax.value_tbf },
+                            // { tbc: item.condition_if_wrong_tax.value_tbc, fcp: item.condition_if_wrong_tax.value_fc, tbf: item.condition_if_wrong_tax.value_tbf },
+                            { tbc: item.condition_it_should_be_tax, fcp: item.condition_it_should_be_tax, tbf: item.condition_it_should_be_tax },
+                            { tbc: item.condition_if_wrong_tax, fcp: item.condition_if_wrong_tax, tbf: item.condition_if_wrong_tax },
+                            // item.tax_planning.forecast_tbc_formula,
+                            // item.tax_planning.forecast_fcp_formula,
+                            // item.tax_planning.forecast_tbf_formula,
                         ])
-                    }
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                        if (item.children !== null) {
+                            if (item.children.length > 0) {
+                                item.children.map((items, indexs) => {
+                                    handlePushChild(items)
+                                })
+                            }
                         }
-                    }  
-                }
-                res.map((item, index) => {
-                    dataTable.push([  
-                        item.type_report_id,
-                        item.type_report_tax.value_tbc.type_report_id,
-                        item.type_report_tax.value_fc.type_report_id,
-                        item.type_report_tax.value_tbf.type_report_id,
-                        item.id,
-                        item.parent,
-                        {tbc : item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
-                        item.level,
-                        item.description,
-                        {tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, tbf: item.tax_planning.january.tbf},
-                        {tbc : item.tax_planning.february.tbc, fcp: item.tax_planning.february.fcp, tbf: item.tax_planning.february.tbf},
-                        {tbc : item.tax_planning.march.tbc, fcp: item.tax_planning.march.fcp, tbf: item.tax_planning.march.tbf},
-                        {tbc : item.tax_planning.april.tbc, fcp: item.tax_planning.april.fcp, tbf: item.tax_planning.april.tbf},
-                        {tbc : item.tax_planning.may.tbc, fcp: item.tax_planning.may.fcp, tbf: item.tax_planning.may.tbf},
-                        {tbc : item.tax_planning.june.tbc, fcp: item.tax_planning.june.fcp, tbf: item.tax_planning.june.tbf},
-                        {tbc : item.tax_planning.july.tbc, fcp: item.tax_planning.july.fcp, tbf: item.tax_planning.july.tbf},
-                        {tbc : item.tax_planning.august.tbc === null ? "0" : item.tax_planning.august.tbc === "" ? "0" : item.tax_planning.august.tbc, 
-                            fcp: item.tax_planning.august.fcp, tbf: item.tax_planning.august.tbf},
-                        {tbc : item.tax_planning.september.tbc, fcp: item.tax_planning.september.fcp, tbf: item.tax_planning.september.tbf},
-                        {tbc : item.tax_planning.october.tbc, fcp: item.tax_planning.october.fcp, tbf: item.tax_planning.october.tbf},
-                        {tbc : item.tax_planning.november.tbc, fcp: item.tax_planning.november.fcp, tbf: item.tax_planning.november.tbf},
-                        {tbc : item.tax_planning.december.tbc, fcp: item.tax_planning.december.fcp, tbf: item.tax_planning.december.tbf},
-                        item.tax_planning.total_current_year,
-                        {tbc : item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf},
-                        {tbc : item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf},
-                        item.order
-                    ])
-                    if (item.children !== null) {
-                        if (item.children.length > 0) {
-                            item.children.map((items, indexs) => {
-                                handlePushChild(items)
-                            })
+                    })
+                    this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
                         }
-                    }
-                })
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                    })
+                }
             } else {
                 this.setState({ dataTable, loading: false, buttonError: true, editable: true })   
             }
@@ -598,7 +628,15 @@ export default class TaxPlanningOLPA extends Component {
                     this.props.onClickClose()
                     this.props.getReport()
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.status, tipeAlert: 'error', loading: false })
+                    // this.setState({ alert: true, messageAlert: response.data.status, tipeAlert: 'error', loading: false })
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
+                        }
+                    })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
@@ -744,6 +782,262 @@ export default class TaxPlanningOLPA extends Component {
 
     render() {
         let dataTable2 = this.state.dataTable
+        let dataFormula = []
+        let id = 0
+        let double = false
+        const handleValueFormula = (value, tableMeta, dex, xntd, forecast, periode) => {
+            let form = dex === 1 ? tableMeta.rowData[6].tbc : dex === 2 ? tableMeta.rowData[6].fcp : tableMeta.rowData[6].tbf
+            let splitFormula = String(form).split('@')
+            console.log(form)
+            console.log(splitFormula)
+            let baru = []
+            let anjay = []
+            splitFormula.map((item, index) => {
+                let items = String(item).substr(Number(String(item).length) - 1, 1)
+                let re = /^[a-zA-Z0-9_]+$/;
+                let asd = ''
+                if (item !== "") {
+                    // re.test(items) ngecek angka
+                    if (!re.test(items)) {
+                        baru.push(String(item).substr(0, Number(String(item).length) - 1))
+                        baru.push(String(item).substr(Number(String(item).length) - 1, 1))
+                    } else {
+                        baru.push(String(item))
+                    }
+                }
+            })
+
+            if (tableMeta.rowData[8] == "Under payment  /(Over Payment ) Income Tax Art.  29" || forecast !== undefined) {
+                let opgab = []
+                baru.map((item, index) => {
+                    if (item.length > 1 && (item.includes("+") || item.includes("-") || item.includes("*") || item.includes("/"))) {
+                        opgab.push(String(item).substr(0, Number(String(item).length) - 1))
+                        opgab.push(String(item).substr(Number(String(item).length) - 1, 1))
+                    } else {
+                        opgab.push(item)
+                    }
+                })
+                if (opgab.length > 0) {
+                    baru = opgab
+                }
+            }
+
+            let totalShldBeNil = 0
+            baru.map((item, index) => {
+                if (item == '-' || item == '+' || item == '/' || item == '*' || item == '(' || item == ')') {
+                    anjay.push(item)
+                } else {
+                    // console.log(item)
+                    if (String(item).includes('#')) {
+                        let splitform = String(item).split('#')
+                        if (splitform[1] == 'TP1' || splitform[1] == 'TP2' || splitform[1] == 'TP3') {
+                            let indexID = dataTable2.findIndex((val) => val[24] == splitform[0])
+                            if (indexID !== -1) {
+                                let data = splitform[1] == 'TP1' ? dataTable2[indexID][tableMeta.columnIndex].tbc : splitform[1] == 'TP2' ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf
+                                let valuezz = data.value == undefined ? data : data.value
+                                anjay.push(valuezz == "" ? 0 : valuezz)
+                            }
+                        } else {
+                            if (forecast !== undefined) {
+                                forecast.map((item, index) => {
+                                    if (periode == item.periode) {
+                                        totalShldBeNil += Number(item.value)
+                                    }
+                                })
+                                anjay.push(totalShldBeNil)
+                            } else if (String(item).includes('[M-1]')) {
+                                let tst = String(item).replace('[M-1]', '')
+                                let data = tableMeta.columnIndex == 9 ? 20 : tableMeta.columnIndex - 1
+                                let dataSub = dex == 1 ? tableMeta.rowData[data].tbc : dex == 2 ? tableMeta.rowData[data].fcp : tableMeta.rowData[data].tbf
+                                let period = data == 20 ? Number(this.props.periode) - 1 : this.props.periode
+                                let indexID = dataSub.formula.findIndex((val) => val.item_formula == String(`@${tst}`) && val.periode == period)
+                                if (indexID !== -1) {
+                                    let valuezz = tableMeta.rowData[data].formula[indexID].value
+                                    anjay.push(valuezz == "" ? 0 : valuezz)
+                                }
+                            } else {
+                                let data = dex == 1 ? value.tbc : dex == 2 ? value.fcp : value.tbf
+                                // let data = dex == 1 ? tableMeta.rowData[data].tbc : dex == 2 ? tableMeta.rowData[data].fcp : tableMeta.rowData[data].tbf
+                                // console.log(data);
+                                let indexID = data.formula.findIndex((val) => val.item_formula == String(`@${item}`) && val.periode == Number(this.props.periode))
+                                if (indexID !== -1) {
+                                    let valuezz = data.formula[indexID].value
+                                    anjay.push(valuezz == "" ? 0 : valuezz)
+                                }
+                            }
+                        }
+                    } else {
+                        let indexID = dataTable2.findIndex((val) => val[24] == item)
+                        if (indexID !== -1) {
+                            if (dataTable2[indexID][24] == tableMeta.rowData[24]) {
+                                anjay.push(0)
+                            } else {
+                                let data = dex == 1 ? dataTable2[indexID][tableMeta.columnIndex].tbc : dex == 2 ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf
+                                let valuezz = data.value == undefined ? data : data.value
+                                anjay.push(valuezz == "" ? 0 : valuezz)
+                            }
+
+                        }
+                    }
+                }
+            })
+
+            let total = 0
+            let total2 = 0
+            let opt = ""
+            let opt2 = ""
+            let prio = false
+            let simpen2 = ""
+            anjay.map((item, index) => {
+                if (item == "+") {
+                    if (prio) {
+                        opt2 = "tambah"
+                    } else {
+                        opt = "tambah"
+                    }
+                } else if (item == "-") {
+                    if (prio) {
+                        opt2 = "kurang"
+                    } else {
+                        opt = "kurang"
+                    }
+                } else if (item == "*") {
+                    if (prio) {
+                        opt2 = "kali"
+                    } else {
+                        opt = "kali"
+                    }
+                } else if (item == "/") {
+                    if (prio) {
+                        opt2 = "bagi"
+                    } else {
+                        opt = "bagi"
+                    }
+                } else if (item == "(") {
+                    prio = true
+                    simpen2 = "active"
+                } else if (item == ")") {
+                    prio = false
+                }
+                else {
+                    if (prio) {
+                        if (opt2 == "tambah") {
+                            total2 = Number(total2) + Number(item)
+                        } else if (opt2 == "kurang") {
+                            total2 = Number(total2) - Number(item)
+                        } else if (opt2 == "kali") {
+                            total2 = Number(total2) * Number(item)
+                        } else if (opt2 == "bagi") {
+                            total2 = Number(total2) / Number(item) == NaN ? 0 : Number(total2) / Number(item)
+                        } else {
+                            total2 += Number(item)
+                        }
+                    } else {
+                        if (opt == "tambah") {
+                            total = Number(total) + Number(item)
+                        } else if (opt == "kurang") {
+                            total = Number(total) - Number(item)
+                        } else if (opt == "kali") {
+                            total = Number(total) * Number(item)
+                        } else if (opt == "bagi") {
+                            total = Number(total) / Number(item) == NaN ? 0 : Number(total) / Number(item)
+                        } else {
+                            total += Number(item)
+                        }
+                    }
+                }
+            })
+
+            if (simpen2 == "active") {
+                if (opt == "tambah") {
+                    total = Number(total) + Number(total2)
+                } else if (opt == "kurang") {
+                    total = Number(total) - Number(total2)
+                } else if (opt == "kali") {
+                    total = Number(total) * Number(total2)
+                } else if (opt == "bagi") {
+                    total = Number(total) / Number(total2) == NaN ? 0 : Number(total) / Number(total2)
+                }
+            }
+
+            total = R.equals(total, NaN) ? "0.0" : total
+            // console.log(tableMeta.rowData[8])
+            // if (xntd !== undefined && tableMeta.rowData[8] == "Under payment  /(Over Payment ) Income Tax Art.  29") {
+            //     console.log(tableMeta.rowData[8])
+            //     // console.log(splitFormula)
+            //     console.log(xntd)
+            //     console.log(baru)
+            //     console.log(anjay)
+            //     console.log(total)
+            //     console.log(total2)
+            //     console.log(opt)
+            // }
+
+            // let dataSub = dex == 1? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc : dex == 2? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp : dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf
+            if (dex == 1) {
+                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value == undefined) {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = Number(total).toFixed(1)
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = Number(total).toFixed(1)
+                }
+            } else if (dex == 2) {
+                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value == undefined) {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = Number(total).toFixed(1)
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = Number(total).toFixed(1)
+                }
+            } else {
+                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(1)
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
+                }
+            }
+
+            return Number(total).toFixed(1)
+        }
+
+        const handleForecast = (tableMeta, periode, dex) => {
+            let total = 0
+            let data = dex == 1 ? dataTable2[tableMeta.rowIndex][6].tbc : dex == 2 ? dataTable2[tableMeta.rowIndex][6].fcp : dataTable2[tableMeta.rowIndex][6].tbf
+            let forecast = dex == 1 ? dataTable2[tableMeta.rowIndex][27] : dex == 2 ? dataTable2[tableMeta.rowIndex][28] : dataTable2[tableMeta.rowIndex][29]
+            if (data.includes('#PL')) {
+                if (tableMeta.rowData[8] == "Control (should be nil)") {
+                    total = handleValueFormula(5, tableMeta, dex, data, forecast, periode)
+                } else {
+                    forecast.map((item, index) => {
+                        if (periode == item.periode) {
+                            total += Number(item.value)
+                        }
+                    })
+                }
+            } else {
+                total = handleValueFormula(5, tableMeta, dex, data)
+            }
+
+            if (dex == 1) {
+                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value == undefined) {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = total
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total
+                }
+            } else if (dex == 2) {
+                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value == undefined) {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = total
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = total
+                }
+            } else {
+                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = total
+                }
+            }
+
+            return total
+        }
+
         const handleChange = (value, tableMeta, indexChilds) => {
             let val = String(value).split(",").join("")
             // let data = this.state.dataTable2
@@ -756,33 +1050,50 @@ export default class TaxPlanningOLPA extends Component {
                     a = dataTable2[indexParent][tableMeta.columnIndex].fcp = jagain === undefined ? (0 + Number(val)) : (Number(jagain) + Number(val))
                 }
             } else {
-                // console.log(tableMeta)
-                if (indexChilds == 0){
+                if (indexChilds == 0) {
                     dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = Number(val)
                 }
-                else if (indexChilds == 1){
+                else if (indexChilds == 1) {
                     dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = Number(val)
                 }
-                else if (indexChilds == 2){
+                else if (indexChilds == 2) {
                     dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(val)
                 }
             }
         }
-        const handleTotal = (tableMeta) => {
+        const handleTotal = (tableMeta, dex) => {
             let total = 0
-            dataTable2[tableMeta.rowIndex].map((item, index) => {
-                if (index >= 9 && index <= 20) {
-                    // console.log(item);
-                    let valItem = item.fcp == undefined || item.fcp == "" ? 0 : item.fcp
-                    total += Number(valItem)
-                }
-            })
-            dataTable2[tableMeta.rowIndex][21] = total
+            let totalfcp = 0
+            if (String(tableMeta.rowData[8]).toLowerCase() === "fiscal correction positive / (negative) year to date") {
+                dataTable2[tableMeta.rowIndex - 2].map((item, index) => {
+                    if (index >= 9 && index <= 20) {
+                        if (dataTable2[tableMeta.rowIndex - 2][2] === 5 || dataTable2[tableMeta.rowIndex - 2][2] === 6 || dataTable2[tableMeta.rowIndex - 2][2] === 7) {
+                            let valItem = item.fcp.value == undefined || item.fcp.value == "" || item.fcp.value == "undefined" ? 0.0 : item.fcp.value
+                            total += Number(valItem)
+                        } else {
+                            let valItem = item.fcp == undefined || item.fcp == "" || item.fcp == "undefined" ? 0.0 : item.fcp
+                            total += Number(valItem)
+                        }
+                    }
+                })
+            } else {
+                dataTable2[tableMeta.rowIndex].map((item, index) => {
+                    if (index >= 9 && index <= 20) {
+                        if (tableMeta.rowData[3] === 5 || tableMeta.rowData[3] === 6 || tableMeta.rowData[3] === 7) {
+                            let valItem = item.tbf.value == undefined || item.tbf.value == "" || item.tbf.value == "undefined" ? 0.0 : item.tbf.value
+                            total += Number(valItem)
+                        } else {
+                            let valItem = item.tbf == undefined || item.tbf == "" || item.tbf == "undefined" ? 0.0 : item.tbf
+                            total += Number(valItem)
+                        }
+                    }
+                })
+            }
+            dataTable2[tableMeta.rowIndex][21] = Number(total).toFixed(1)
             return total
         }
         const handleValue = (data) => {
             let total = 0
-            // // console.log(dataTable2)
             dataTable2.map((item, index) => {
                 if (data.rowData[4] === item[5]) {
                     total = item[data.columnIndex] === undefined ? (Number(total) + 0) : (Number(total) + Number(item[data.columnIndex].fcp))
@@ -790,7 +1101,6 @@ export default class TaxPlanningOLPA extends Component {
             })
             let indexParent = dataTable2.findIndex((val) => val[4] === dataTable2[data.rowIndex][5])
             let a = dataTable2[data.rowIndex][data.columnIndex].fcp = Number(total)
-            // console.log(indexParent);
             return a
         }
 
@@ -839,10 +1149,6 @@ export default class TaxPlanningOLPA extends Component {
                         "formula": rilFormula
                     }
                     api.create().countingFormula(body).then(response => {
-                        // console.log(response)
-                        // console.log(tableMeta)
-                        // console.log(tableMeta.rowIndex)
-                        // console.log(rowColumn)
                         if (response.data) {
                             if (response.data.status === "success") {
                                 return response.data.data.result
@@ -891,18 +1197,44 @@ export default class TaxPlanningOLPA extends Component {
                         }
                     }
                 })
-                if (R.equals(Number(total), NaN) ){
-                    total = {tbc: "", fcp: "", tbf: ""}
+                if (R.equals(Number(total), NaN)) {
+                    total = { tbc: "", fcp: "", tbf: "" }
                 } else {
                     total = Number(total)
                 }
-                // console.log(Number(total))
-                // console.log(dataTable2[tableMeta.rowIndex])
                 let a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
+                // console.log(total)
                 return a
             }
 
         }
+
+        const handleParent = (tableMeta, type) => {
+            let total = 0
+            dataTable2.map((item, index) => {
+                if (item[5] == tableMeta.rowData[4]) {
+                    total += Number(type == 1 ?
+                        item[tableMeta.columnIndex].tbc.value == undefined ? Number(item[tableMeta.columnIndex].tbc == "" || item[tableMeta.columnIndex].tbc == "0.0" ? 0 : item[tableMeta.columnIndex].tbc) : Number(item[tableMeta.columnIndex].tbc.value == "" || item[tableMeta.columnIndex].tbc.value == "0.0" ? 0 : item[tableMeta.columnIndex].tbc.value)
+                        :
+                        (type == 2 ?
+                            item[tableMeta.columnIndex].fcp.value == undefined ? Number(item[tableMeta.columnIndex].fcp == "" || item[tableMeta.columnIndex].fcp == "0.0" ? 0 : item[tableMeta.columnIndex].fcp) : Number(item[tableMeta.columnIndex].fcp.value == "" || item[tableMeta.columnIndex].fcp.value == "0.0" ? 0 : item[tableMeta.columnIndex].fcp.value)
+                            :
+                            item[tableMeta.columnIndex].tbf.value == undefined ? Number(item[tableMeta.columnIndex].tbf == "" || item[tableMeta.columnIndex].tbf == "0.0" ? 0 : item[tableMeta.columnIndex].tbf) : Number(item[tableMeta.columnIndex].tbf.value == "" || item[tableMeta.columnIndex].tbf.value == "0.0" ? 0 : item[tableMeta.columnIndex].tbf.value)
+                        )
+                    )
+                }
+            })
+
+            if (type == 1) {
+                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = total
+            } else if (type == 2) {
+                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = total
+            } else {
+                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
+            }
+            return total
+        }
+
         const columns = [{
             name: "",
             options: {
@@ -955,8 +1287,8 @@ export default class TaxPlanningOLPA extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ width: 300 }}>
-                            {tableMeta.rowData[24] ?
-                                tableMeta.rowData[24].length > 0 ?
+                            {tableMeta.rowData[30] ?
+                                tableMeta.rowData[30].length > 0 ?
                                     <div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
                                         <LightTooltip title={"Report Items Not Registered"} arrow>
                                             <span style={{ fontSize: 12, color: 'red' }}>{tableMeta.rowData[0] === 4 ? "" : val}</span>
@@ -1000,7 +1332,7 @@ export default class TaxPlanningOLPA extends Component {
                     return (
                         <div>
                             <div className="content-center">
-                                <div className="col-1">
+                            <div className="col-1">
                                     <div style={{ textAlign: 'right' }}>
                                         {tableMeta.rowData[3] === 3 ?
                                             <div style={{ flex: 1 }}>
@@ -1133,6 +1465,7 @@ export default class TaxPlanningOLPA extends Component {
                                                         placeholder=""
                                                         disabled={true}
                                                         // value={Number(handleValue(tableMeta)).toFixed(1)}
+                                                        value={Number(handleParent(tableMeta, 3)).toFixed(1)}
                                                     />
                                                 </span>
                                                 :
@@ -2540,7 +2873,7 @@ export default class TaxPlanningOLPA extends Component {
             name: `${this.props.periode} Trial Balance (Fiscal)`,
             options: {
                 customHeadRender: (columnMeta) => (
-                    <div  style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
+                    <div  style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 200, borderRight: "1px solid rgb(255, 255, 255)" }} >
                         {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell> */}
@@ -2686,22 +3019,22 @@ export default class TaxPlanningOLPA extends Component {
                                     {this.props.isApprover == true || this.state.dataTable.length == 0 ? null :
                                         <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
                                             {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && (
-                                            <div>
-                                            <a data-tip={'Download Template'} data-for="template">
-                                                <button
-                                                    style={{
-                                                        backgroundColor: 'transparent',
-                                                        cursor: 'pointer',
-                                                        borderColor: 'transparent',
-                                                        margin: 5
-                                                    }}
-                                                    onClick={() => this.downloadTemplate()}
-                                                >
-                                                    <img src={Images.template} />
-                                                </button>
-                                            </a>
-                                            <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
-                                            </div>
+                                                <div>
+                                                    <a data-tip={'Download Template'} data-for="template">
+                                                        <button
+                                                            style={{
+                                                                backgroundColor: 'transparent',
+                                                                cursor: 'pointer',
+                                                                borderColor: 'transparent',
+                                                                margin: 5
+                                                            }}
+                                                            onClick={() => this.downloadTemplate()}
+                                                        >
+                                                            <img src={Images.template} />
+                                                        </button>
+                                                    </a>
+                                                    <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
+                                                </div>
                                             )}
                                             {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && (
                                             <div>
@@ -2774,7 +3107,7 @@ export default class TaxPlanningOLPA extends Component {
                                         }}
                                     >
                                         <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                            <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
+                                            <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
                                         </div>
                                     </button>
                                 </div>
@@ -2890,7 +3223,7 @@ export default class TaxPlanningOLPA extends Component {
                                             style={{ marginRight: 20 }}
                                         >
                                             <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
-                                                <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
+                                                <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
                                             </div>
                                         </button>
                                     </div>