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

src/container/MonthlyReport.js

@@ -103,7 +103,7 @@ export default class MonthlyReport extends Component {
                 if (response.data.status === "success") {
                     if (response.data.data.is_approver === true) {
                         this.setState({ isApprover: true, checkApprover: true }, () =>
-                            this.getPeriode())
+                            this.getMonth())
                     } else {
                         this.setState({ isApprover: false, checkApprover: false }, () =>
                             this.getCompanyActive())
@@ -247,7 +247,11 @@ export default class MonthlyReport extends Component {
                     let index = data.sort((a, b) => a - b).findIndex((val) => val.month_name == month)
                     console.log(index);
                     this.setState({ listMonth: defaultProps, month: index == -1 ? monthData[0] : monthData[index] }, () => {
-                        this.getLastPeriod()
+                        if (this.state.isApprover === true) {
+                            this.getPeriode()
+                        } else {
+                            this.getLastPeriod()
+                        }
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
@@ -302,7 +306,7 @@ export default class MonthlyReport extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
-                    let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod)
+                    let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod === undefined ? 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.lastPeriod)
@@ -333,10 +337,11 @@ export default class MonthlyReport extends Component {
 
     getCompanySubmitted() {
         let body = {
-            "periode": this.state.periode.periode
+            "periode": this.state.periode.periode,
+            "months": this.state.month.month_id,
         }
         api.create().getCompanySubmittedMonthly(body).then(response => {
-            // // console.log(response);
+            console.log(response);
             if (response.data) {
                 if (response.data.status === 'success') {
                     if (response.data.data.length > 0) {
@@ -358,7 +363,6 @@ export default class MonthlyReport extends Component {
                         }
 
                         this.setState({ listCompany: defaultProps, company: indexID == null ? companyData[0] : companyData[indexID] }, () => {
-                            // // console.log(response.data.data);
                             if (response.data.data.length > 0) {
                                 this.getRevision()
                             } else {
@@ -871,7 +875,12 @@ export default class MonthlyReport extends Component {
                                             {...this.state.listMonth}
                                             id="month"
                                             onChange={(event, newInputValue) => this.setState({ month: newInputValue, loading: true }, () => {
-                                                this.getMonthlyReportID()
+                                                if (this.state.isApprover === true) {
+                                                    this.getCompanySubmitted()
+                                                } else {
+                                                    this.setState({ visibleTableHistory: false })
+                                                    this.getRevision()
+                                                }
                                             })}
                                             disableClearable
                                             style={{ width: 250, marginRight: 20 }}
@@ -883,7 +892,12 @@ export default class MonthlyReport extends Component {
                                             {...this.state.listPeriode}
                                             id="periode"
                                             onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true }, () => {
-                                                this.getMonthlyReportID()
+                                                if (this.state.isApprover === true) {
+                                                    this.getCompanySubmitted()
+                                                } else {
+                                                    this.setState({ visibleTableHistory: false })
+                                                    this.getRevision()
+                                                }
                                             })}
                                             disableClearable
                                             style={{ width: 250 }}
@@ -895,7 +909,8 @@ export default class MonthlyReport extends Component {
                                         <Autocomplete
                                             {...this.state.listCompany}
                                             id="company"
-                                            onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true }, () => {
+                                            disabled={this.state.listCompany === null ? true : false}
+                                            onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
                                                 this.getMonthlyReportID()
                                             })}
                                             disableClearable
@@ -1124,6 +1139,7 @@ export default class MonthlyReport extends Component {
                         month={this.state.month}
                         saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
                         onClickClose={() => this.setState({ visiblePL: false, visibleMonthlyReport: true })}
+                        isApprover={this.state.isApprover}
                     // getReport={this.getCompanyActive.bind(this)}
                     />
 

src/container/MonthlyReport/CashFlowMR.js

@@ -164,7 +164,7 @@ export default class CashFlowMR extends Component {
                             let tst = String(item).replace('[M-1]', '[M1]')
                             let data = tableMeta.columnIndex
                             // console.log(tableMeta.columnIndex)
-                            let indexID = tableMeta.rowData[data].actual_formula.findIndex((val) => val.item_formula == String(`@${tst}`))
+                            let indexID = tableMeta.rowData[data].formula.findIndex((val) => val.item_formula == String(`@${tst}`))
                             // console.log(indexID)
                             if (indexID !== -1) {
                                 let valuezz = tableMeta.rowData[data].formula[indexID].value