Merge branch 'deni-' into 'master'

Deni

See merge request !764

src/api/index.js

@@ -226,8 +226,6 @@ const create = (type = "") => {
   const getLastestUpdateOI = (body) => api.post('transaction/operating_indicator/get_latest_update', body)
   const getLastPeriodeOI = (idCompany) => api.post(`transaction/master_budget/get_last_periode/${idCompany}`)
   const getReportHierarkiPL = (body) => api.post('transaction/db_report_detail/get_report_hierarki', body)
-
-  const getLastestUpdateMR = (body) => api.post('/transaction/monthly_report/get_latest_update', body)
   const getLastestUpdateMROI = (body) => api.post('transaction/monthly_report_oi/get_latest_update', body)
 
   //CASH FLOW
@@ -259,6 +257,7 @@ const create = (type = "") => {
   const getMonthlyReportID = (body) => api.post('transaction/monthly_report/get_monthly_report_id', body)
   const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
   const getHierarkiMontlyReportOI = (body) => api.post('transaction/monthly_report_oi/get_report_hierarki', body)
+  const getLastestUpdateMR = (body) => api.post('/transaction/monthly_report/get_latest_update', body)
   const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
   const getHierarkiMontlyReportLOCF = (body) => api.post('transaction/monthly_report_locf/get_report_hierarki', body)
   const getHierarkiMontlyReportFAM = (body) => api.post('transaction/monthly_report/fam/get_report_hierarki', body)

src/container/MonthlyReport.js

@@ -54,7 +54,7 @@ export default class MonthlyReport extends Component {
             alert: false,
             tipeAlert: '',
             messageAlert: '',
-            btncreate: false,
+            btnCreate: false,
             loadview: false
         }
         this.fileHandler = this.fileHandler.bind(this);
@@ -69,8 +69,10 @@ export default class MonthlyReport extends Component {
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
-                        btncreate: response.data.data.create,
-                        loadview: response.data.data.view
+                        btnCreate: response.data.data.create,
+                        btnEdit: response.data.data.edit
+                    }, () => {
+                        this.getChecApprover()
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
@@ -89,7 +91,6 @@ export default class MonthlyReport extends Component {
     }
 
     componentDidMount() {
-        this.getChecApprover()
         this.getPermission()
         this.setState({ loading: true })
         // this.getCompanyActive()
@@ -100,14 +101,13 @@ export default class MonthlyReport extends Component {
             console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
-                    // console.log(response);
-                    // if (response.data.data.is_approver === true) {
-                    //     this.setState({ isApprover: true, checkApprover: true }, () =>
-                    //         this.getPeriode())
-                    // } else {
+                    if (response.data.data.is_approver === true) {
+                        this.setState({ isApprover: true, checkApprover: true }, () =>
+                            this.getPeriode())
+                    } else {
                         this.setState({ isApprover: false, checkApprover: false }, () =>
                             this.getCompanyActive())
-                    // }
+                    }
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                         if (response.data.message.includes("Someone Logged In")) {
@@ -455,12 +455,13 @@ export default class MonthlyReport extends Component {
                         this.getReportAttachment()
                         api.create().checkApproverMonthly().then(response => {
                             // // console.log(response);
-                            if (response.data.data.is_approver === true) {
-                                this.setState({ isApprover: true, checkApprover: true })
-                            } else {
+                            if (this.state.btnCreate === true && this.state.btnEdit === true) {
+                                console.log('editable');
                                 this.setState({ isApprover: false, checkApprover: false })
+                            } else {
+                                console.log('just view');
+                                this.setState({ isApprover: true, checkApprover: true })
                             }
-
                         })
                     })
                 } else {
@@ -1106,6 +1107,7 @@ export default class MonthlyReport extends Component {
                         month={this.state.month}
                         saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
                         onClickClose={() => this.setState({ visibleBS: false, visibleMonthlyReport: true })}
+                        isApprover={this.state.isApprover}
                     // getReport={this.getCompanyActive.bind(this)}
                     />
                 )}
@@ -1139,7 +1141,7 @@ export default class MonthlyReport extends Component {
                         month={this.state.month}
                         saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
                         onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
-                        btncreate={this.state.btncreate}
+                        btnCreate={this.state.btnCreate}
                         loadview={this.state.loadview}
                     // getReport={this.getCompanyActive.bind(this)}
                     />

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -163,7 +163,7 @@ export default class FixedAssetsMovementMR extends Component {
                             }
                         }
                     })
-                    console.log(dataTable);
+                    // console.log(dataTable);
                     this.setState({ dataTable, loading: false })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
@@ -439,7 +439,7 @@ export default class FixedAssetsMovementMR extends Component {
                             // console.log(tableMeta);
                             // console.log(tst);
                             let indexID = dataTable2[tableMeta.rowIndex][16].findIndex((val) => val.item_formula == tst)
-                            console.log(indexID);
+                            // console.log(indexID);
                             
                             if (indexID !== -1) {
                                 let valuezz = dataTable2[tableMeta.rowIndex][16][indexID].value