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

src/container/BudgetTahunan/TaxPlanning.js

@@ -143,6 +143,7 @@ export default class TaxPlanning extends Component {
                             { 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,
@@ -185,6 +186,7 @@ export default class TaxPlanning extends Component {
                         { 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,
@@ -202,6 +204,7 @@ export default class TaxPlanning extends Component {
                         }
                     }
                 })
+                // console.log(dataTable)
                 this.setState({ dataTable, loading: false, buttonError: true, editable: true })
             } else {
                 this.setState({ dataTable, loading: false, buttonError: true, editable: true })
@@ -327,7 +330,7 @@ export default class TaxPlanning extends Component {
             "status": type,
             "tax_planning": data
         }
-        // console.log(JSON.stringify(payload));
+        // console.log(payload);
         this.props.saveToMasterBudget(payload)
         this.props.onClickClose()
     }
@@ -352,73 +355,73 @@ export default class TaxPlanning extends Component {
                             item_report: i[1] === undefined ? "" : String(i[1]).trim(),
                             january: {
                                 tbc: i[2] === undefined ? "0" : reg.test(String(i[2])) === false ? "0" : String(i[2]).trim(),
-                                fcp: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[3]).trim(),
+                                fcp: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[3]).trim()).toFixed(2)) : String(Number(String(i[3]).trim()).toFixed(1)),
                                 tbf: i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[4]).trim(),
                             },
                             february: {
                                 tbc: i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[5]).trim(),
-                                fcp: i[6] === undefined ? "0" : reg.test(String(i[6])) === false ? "0" : String(i[6]).trim(),
+                                fcp: i[6] === undefined ? "0" : reg.test(String(i[6])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[6]).trim()).toFixed(2)) : String(Number(String(i[6]).trim()).toFixed(1)),
                                 tbf: i[7] === undefined ? "0" : reg.test(String(i[7])) === false ? "0" : String(i[7]).trim(),
                             },
                             march: {
                                 tbc: i[8] === undefined ? "0" : reg.test(String(i[8])) === false ? "0" : String(i[8]).trim(),
-                                fcp: i[9] === undefined ? "0" : reg.test(String(i[9])) === false ? "0" : String(i[9]).trim(),
+                                fcp: i[9] === undefined ? "0" : reg.test(String(i[9])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[9]).trim()).toFixed(2)) : String(Number(String(i[9]).trim()).toFixed(1)),
                                 tbf: i[10] === undefined ? "0" : reg.test(String(i[10])) === false ? "0" : String(i[10]).trim(),
                             },
                             april: {
                                 tbc: i[11] === undefined ? "0" : reg.test(String(i[11])) === false ? "0" : String(i[11]).trim(),
-                                fcp: i[12] === undefined ? "0" : reg.test(String(i[12])) === false ? "0" : String(i[12]).trim(),
+                                fcp: i[12] === undefined ? "0" : reg.test(String(i[12])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[12]).trim()).toFixed(2)) : String(Number(String(i[12]).trim()).toFixed(1)),
                                 tbf: i[13] === undefined ? "0" : reg.test(String(i[13])) === false ? "0" : String(i[13]).trim(),
                             },
                             may: {
                                 tbc: i[14] === undefined ? "0" : reg.test(String(i[14])) === false ? "0" : String(i[14]).trim(),
-                                fcp: i[15] === undefined ? "0" : reg.test(String(i[15])) === false ? "0" : String(i[15]).trim(),
+                                fcp: i[15] === undefined ? "0" : reg.test(String(i[15])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[15]).trim()).toFixed(2)) : String(Number(String(i[15]).trim()).toFixed(1)),
                                 tbf: i[16] === undefined ? "0" : reg.test(String(i[16])) === false ? "0" : String(i[16]).trim(),
                             },
                             june: {
                                 tbc: i[17] === undefined ? "0" : reg.test(String(i[17])) === false ? "0" : String(i[17]).trim(),
-                                fcp: i[18] === undefined ? "0" : reg.test(String(i[18])) === false ? "0" : String(i[18]).trim(),
+                                fcp: i[18] === undefined ? "0" : reg.test(String(i[18])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[18]).trim()).toFixed(2)) : String(Number(String(i[18]).trim()).toFixed(1)),
                                 tbf: i[19] === undefined ? "0" : reg.test(String(i[19])) === false ? "0" : String(i[19]).trim(),
                             },
                             july: {
                                 tbc: i[20] === undefined ? "0" : reg.test(String(i[20])) === false ? "0" : String(i[20]).trim(),
-                                fcp: i[21] === undefined ? "0" : reg.test(String(i[21])) === false ? "0" : String(i[21]).trim(),
+                                fcp: i[21] === undefined ? "0" : reg.test(String(i[21])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[21]).trim()).toFixed(2)) : String(Number(String(i[21]).trim()).toFixed(1)),
                                 tbf: i[22] === undefined ? "0" : reg.test(String(i[22])) === false ? "0" : String(i[22]).trim(),
                             },
                             august: {
                                 tbc: i[23] === undefined ? "0" : reg.test(String(i[23])) === false ? "0" : String(i[23]).trim(),
-                                fcp: i[24] === undefined ? "0" : reg.test(String(i[24])) === false ? "0" : String(i[24]).trim(),
+                                fcp: i[24] === undefined ? "0" : reg.test(String(i[24])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[24]).trim()).toFixed(2)) : String(Number(String(i[24]).trim()).toFixed(1)),
                                 tbf: i[25] === undefined ? "0" : reg.test(String(i[25])) === false ? "0" : String(i[25]).trim(),
                             },
                             september: {
                                 tbc: i[26] === undefined ? "0" : reg.test(String(i[26])) === false ? "0" : String(i[26]).trim(),
-                                fcp: i[27] === undefined ? "0" : reg.test(String(i[27])) === false ? "0" : String(i[27]).trim(),
+                                fcp: i[27] === undefined ? "0" : reg.test(String(i[27])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[27]).trim()).toFixed(2)) : String(Number(String(i[27]).trim()).toFixed(1)),
                                 tbf: i[28] === undefined ? "0" : reg.test(String(i[28])) === false ? "0" : String(i[28]).trim(),
                             },
                             october: {
                                 tbc: i[29] === undefined ? "0" : reg.test(String(i[29])) === false ? "0" : String(i[29]).trim(),
-                                fcp: i[30] === undefined ? "0" : reg.test(String(i[30])) === false ? "0" : String(i[30]).trim(),
+                                fcp: i[30] === undefined ? "0" : reg.test(String(i[30])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[30]).trim()).toFixed(2)) : String(Number(String(i[30]).trim()).toFixed(1)),
                                 tbf: i[31] === undefined ? "0" : reg.test(String(i[31])) === false ? "0" : String(i[31]).trim(),
                             },
                             november: {
                                 tbc: i[32] === undefined ? "0" : reg.test(String(i[32])) === false ? "0" : String(i[32]).trim(),
-                                fcp: i[33] === undefined ? "0" : reg.test(String(i[33])) === false ? "0" : String(i[33]).trim(),
+                                fcp: i[33] === undefined ? "0" : reg.test(String(i[33])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[33]).trim()).toFixed(2)) : String(Number(String(i[33]).trim()).toFixed(1)),
                                 tbf: i[34] === undefined ? "0" : reg.test(String(i[34])) === false ? "0" : String(i[34]).trim(),
                             },
                             december: {
                                 tbc: i[35] === undefined ? "0" : reg.test(String(i[35])) === false ? "0" : String(i[35]).trim(),
-                                fcp: i[36] === undefined ? "0" : reg.test(String(i[36])) === false ? "0" : String(i[36]).trim(),
+                                fcp: i[36] === undefined ? "0" : reg.test(String(i[36])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[36]).trim()).toFixed(2)) : String(Number(String(i[36]).trim()).toFixed(1)),
                                 tbf: i[37] === undefined ? "0" : reg.test(String(i[37])) === false ? "0" : String(i[37]).trim(),
                             },
                             total_current_year: i[38] === undefined ? "" : String(i[38]).trim(),
                             total_next_year: {
                                 tbc: i[39] === undefined ? "0" : reg.test(String(i[39])) === false ? "0" : String(i[39]).trim(),
-                                fcp: i[40] === undefined ? "0" : reg.test(String(i[40])) === false ? "0" : String(i[40]).trim(),
+                                fcp: i[40] === undefined ? "0" : reg.test(String(i[40])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[40]).trim()).toFixed(2)) : String(Number(String(i[40]).trim()).toFixed(1)),
                                 tbf: i[41] === undefined ? "0" : reg.test(String(i[41])) === false ? "0" : String(i[41]).trim(),
                             },
                             total_more_year: {
                                 tbc: i[42] === undefined ? "0" : reg.test(String(i[42])) === false ? "0" : String(i[42]).trim(),
-                                fcp: i[43] === undefined ? "0" : reg.test(String(i[43])) === false ? "0" : String(i[43]).trim(),
+                                fcp: i[43] === undefined ? "0" : reg.test(String(i[43])) === false ? "0" : String(i[1]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[43]).trim()).toFixed(2)) : String(Number(String(i[43]).trim()).toFixed(1)),
                                 tbf: i[44] === undefined ? "0" : reg.test(String(i[44])) === false ? "0" : String(i[44]).trim(),
                             }
                         })
@@ -431,14 +434,13 @@ export default class TaxPlanning extends Component {
                     tax_planning: payload
                 }
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })
-                // console.log(this.state.judulColumn)
             }
         });
     }
 
     checkUpload() {
         api.create().checkUploadMB(this.state.payload).then(response => {
-            // console.log(JSON.stringify(this.state.payload));
+            // console.log(this.state.payload);
             // console.log(response)
             if (response.data) {
                 if (response.data.status === 'success') {
@@ -570,12 +572,12 @@ export default class TaxPlanning extends Component {
                 total_current_year: String(Number(i[21]).toFixed(1)),
                 total_next_year: {
                     tbc: String(Number(i[22].tbc).toFixed(1)),
-                    fcp: String(Number(i[22].fcp).toFixed(1)),
+                    fcp: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[22].fcp).toFixed(2)) : String(Number(i[22].fcp).toFixed(1)),
                     tbf: String(Number(i[22].tbf).toFixed(1))
                 },
                 total_more_year: {
                     tbc: String(Number(i[23].tbc).toFixed(1)),
-                    fcp: String(Number(i[23].fcp).toFixed(1)),
+                    fcp: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[23].fcp).toFixed(2)) : String(Number(i[23].fcp).toFixed(1)),
                     tbf: String(Number(i[23].tbf).toFixed(1))
                 }
             })
@@ -787,6 +789,7 @@ export default class TaxPlanning extends Component {
                     baru = opgab
                 }
             }
+
             let totalShldBeNil = 0
             baru.map((item, index) => {
                 if (item == '-' || item == '+' || item == '/' || item == '*' || item == '(' || item == ')') {
@@ -1321,7 +1324,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                // // console.log(dataTable2)
+                                                                // console.log(dataTable2)
                                                             }}
                                                         />
                                                     }
@@ -1430,7 +1433,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             // disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 handleChange(event.target.value, tableMeta, 1)
                                                                 // console.log(dataTable2)
@@ -1800,7 +1803,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 handleChange(event.target.value, tableMeta, 1)
                                                                 // console.log(dataTable2)
@@ -2170,7 +2173,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -2541,7 +2544,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -2804,7 +2807,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -2913,7 +2916,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -3177,7 +3180,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -3286,7 +3289,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -3550,7 +3553,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -3659,7 +3662,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -3923,7 +3926,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -4032,7 +4035,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -4296,7 +4299,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -4405,7 +4408,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -4669,7 +4672,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -4778,7 +4781,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -5042,7 +5045,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -5151,7 +5154,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -5415,7 +5418,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 0)
-                                                                console.log(event.target.value)
+                                                                // console.log(event.target.value)
                                                             }}
                                                         />
                                                     }
@@ -5524,7 +5527,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -6018,7 +6021,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
@@ -6430,7 +6433,7 @@ export default class TaxPlanning extends Component {
                                                             type="text"
                                                             placeholder="input"
                                                             disabled={this.props.isApprover == true ? true : ((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') ? false : true)}
-                                                            value={Number(value.fcp).toFixed(1)}
+                                                            value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)}
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)

src/container/MonthlyReport/ProfitLossMR.js

@@ -63,11 +63,11 @@ export default class ProfitLossMR extends Component {
                 name: "Keterangan",
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 96}}>
-                            <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography>
+                        <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid'}}>
+                            <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell>
                     ),
-                    setCellProps: () => ({ style }),
+                    setCellProps: () => ({ style2 }),
                     customBodyRender: (val, tableMeta) => {
                         return (
                             <div style={{ textAlign: 'right' }}>
@@ -97,7 +97,7 @@ export default class ProfitLossMR extends Component {
                 name: "Rolling Outlook (FY2021)",
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96 }}>
+                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell>
                     ),
@@ -119,7 +119,7 @@ export default class ProfitLossMR extends Component {
                             {/* <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> */}
-                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
+                            <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
                             <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
                                 <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
                                     <span>{"Master Budget (MB)"}</span>
@@ -127,7 +127,7 @@ export default class ProfitLossMR extends Component {
                                 <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
                                     <span>{"Rolling Budget (RB)"}</span>
                                 </div>
-                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6' }}>
+                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0' }}>
                                     <span>{"Actual"}</span>
                                 </div>
                             </div>
@@ -150,26 +150,7 @@ export default class ProfitLossMR extends Component {
                                     </div>
                                     <div className="col-3">
                                         <div style={{ textAlign: 'right', width: 90 }}>
-                                            <div style={{ flex: 1 }}>
-                                                <FormControlLabel
-                                                    style={{ margin: 0 }}
-                                                    // value={value}
-                                                    control={
-                                                        <NumberFormat
-                                                            thousandSeparator={true}
-                                                            style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
-                                                            type="text"
-                                                            placeholder=""
-                                                            // disabled={this.props.isApprover ? true : ((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') ? false : true)}
-                                                            // value={Number(value).toFixed(1)}
-                                                            // onBlur={(event) => {
-                                                            //     handleChange(event.target.value, tableMeta)
-                                                            //     // console.log(dataTable2)
-                                                            // }}
-                                                        />
-                                                    }
-                                                />
-                                            </div>
+                                            {val.c}
                                         </div>
                                     </div>
                                 </div>
@@ -181,7 +162,7 @@ export default class ProfitLossMR extends Component {
                 name: "YTD Actual",
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
+                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96, borderRight: '1px #fff solid' }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell>
                     ),
@@ -199,7 +180,7 @@ export default class ProfitLossMR extends Component {
                 name: "Actual Previous Month",
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
+                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96, borderRight: '1px #fff solid' }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell>
                     ),
@@ -225,7 +206,7 @@ export default class ProfitLossMR extends Component {
                                         <span>{"Act vs Previous Month"}</span>
                                     </div>
                                     <div className="grid grid-2x">
-                                        <div className="column-1" style={{ borderRight: '1px #fff solid', backgroundColor: '#37b5e6' }}>
+                                        <div className="column-1" style={{ backgroundColor: '#37b5e6' }}>
                                             <span>{"Amount"}</span>
                                         </div>
                                         <div className="column-2" style={{ borderLeft: '1px #fff solid', backgroundColor: '#37b5e6' }}>

src/container/OprIndicator/OperatingIndicatorDetail.js

@@ -56,7 +56,8 @@ export default class BalanceSheet extends Component {
             visibleOI: true,
             disabledSave: true,
             editable: true,
-            emptyData: false
+            emptyData: false,
+            templateNull: true
         }
         this.handleValue = this.handleValue.bind(this)
         this.fileHandler = this.fileHandler.bind(this);
@@ -370,7 +371,11 @@ export default class BalanceSheet extends Component {
             if (response.data) {
                 if (response.data.status === 'success') {
                     this.setState({ visibleUpload: false, visibleOI: false, loading: true })
+                    let total = 0
                     let dataTable = response.data.data.map((item, index) => {
+                        if (item.type_report_id != null) {
+                            total += 1
+                        }
                         return [
                             item.type_report_id,
                             item.item_report_id,
@@ -397,7 +402,7 @@ export default class BalanceSheet extends Component {
                             item.error
                         ]
                     })
-                    this.setState({ dataTable, dataLoaded: true, loading: false })
+                    this.setState({ dataTable, dataLoaded: true, loading: false, templateNull : total > 0 ? true : false })
                 }
             }
         })
@@ -2057,7 +2062,7 @@ export default class BalanceSheet extends Component {
                                             </div>
                                         </button>
                                     </div>
-                                    {!this.state.emptyData && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
+                                    {!this.state.emptyData && this.state.templateNull && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                         <button
                                             type="button"
                                             onClick={() =>