Merge branch 'rifka' into 'master'

issue tp

See merge request !571

src/container/BudgetTahunan/TaxPlanning.js

@@ -123,6 +123,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,
@@ -165,6 +166,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,
@@ -307,7 +309,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()
     }
@@ -332,73 +334,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(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(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(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(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(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(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(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(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(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(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(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(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(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(Number(String(i[43]).trim()).toFixed(1)),
                                 tbf: i[44] === undefined ? "0" : reg.test(String(i[44])) === false ? "0" : String(i[44]).trim(),
                             }
                         })
@@ -411,14 +413,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') {
@@ -767,6 +768,7 @@ export default class TaxPlanning extends Component {
                     baru = opgab
                 }
             }
+
             let totalShldBeNil = 0
             baru.map((item, index) => {
                 if (item == '-' || item == '+' || item == '/' || item == '*' || item == '(' || item == ')') {
@@ -1301,7 +1303,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)
                                                             }}
                                                         />
                                                     }
@@ -3000,7 +3002,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)
                                                             }}
                                                         />
                                                     }
@@ -3427,7 +3429,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)
                                                             }}
                                                         />
                                                     }
@@ -3854,7 +3856,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)
                                                             }}
                                                         />
                                                     }
@@ -4281,7 +4283,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)
                                                             }}
                                                         />
                                                     }
@@ -4708,7 +4710,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)
                                                             }}
                                                         />
                                                     }
@@ -5135,7 +5137,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)
                                                             }}
                                                         />
                                                     }
@@ -5562,7 +5564,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)
                                                             }}
                                                         />
                                                     }
@@ -5989,7 +5991,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)
                                                             }}
                                                         />
                                                     }
@@ -6120,7 +6122,7 @@ export default class TaxPlanning extends Component {
                                                             onBlur={(event) => {
                                                                 // updateValue(event.target.value)
                                                                 handleChange(event.target.value, tableMeta, 1)
-                                                                // console.log(dataTable2)
+                                                                // // console.log(dataTable2)
                                                                 
                                                             }}
                                                         />