Merge branch 'didam' into 'master'

apdeet

See merge request !514

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -266,7 +266,7 @@ export default class CorporateAnnualTarget extends Component {
                         // console.log(nilaiTotal)
                         // // console.log(i[2] === undefined ? "" : String(Number(i[2]*100)).length > 3? String(Number(i[2]*100).toFixed(0) + '%') : String(Number(i[2]*100)) + '%')
                         payload.push({
-                            item_report_id: i[0] === undefined ? "" : reg.test(String(i[0])) === false ? "" : String(i[0]).trim(),
+                            item_report_id: i[0] === undefined ? 0 : reg.test(String(i[0])) === false ? 0 : String(i[0]).trim(),
                             item_report: i[1] === undefined ? "" : String(i[1]).trim(),
                             weight: i[2] === undefined ? "" : String(Number(i[2] * 100)).length > 3 ? String(Number(i[2] * 100).toFixed(0) + '%') : String(Number(i[2] * 100)) + '%',
                             uom: i[3] === undefined ? "" : String(i[3]).trim(),
@@ -322,7 +322,7 @@ export default class CorporateAnnualTarget extends Component {
                 }
             }
         })
-        // console.log(JSON.stringify(this.state.payload))
+        console.log(JSON.stringify(this.state.payload))
         api.create().checkUploadMB(this.state.payload).then(response => {
             // // console.log(JSON.stringify(this.state.payload));
             // console.log(response)
@@ -334,7 +334,7 @@ export default class CorporateAnnualTarget extends Component {
                         return [
                             item.type_report_id,
                             item.item_report_id,
-                            item.parent == null && item.item_report_id == null? (response.data.data[index -1].item.parent == null? response.data.data[index -1].item.item_report_id : response.data.data[index -1].item.parent) : item.parent,
+                            item.parent,
                             item.formula,
                             item.level == null ? 1 : item.level,
                             "",
@@ -488,12 +488,12 @@ export default class CorporateAnnualTarget extends Component {
                 }
             }
 
-            if (i[0] == null && i[2] == null) {
-                if (i[6] == "" || i[7] == "" || i[9] == null || i[10] == null || i[11] == null) {
-                    handleKosongKPIMAXYTD = true
-                    // console.log(handleKosongKPIMAXYTD)
-                }
-            }
+            // if (i[0] == null && i[2] == null) {
+            //     if (i[6] == "" || i[7] == "" || i[9] == null || i[10] == null || i[11] == null) {
+            //         handleKosongKPIMAXYTD = true
+            //         // console.log(handleKosongKPIMAXYTD)
+            //     }
+            // }
 
             if (i[2] !== null) {
                 let indexID = dataTampung.findIndex((val) => val.id == i[2])
@@ -896,7 +896,7 @@ export default class CorporateAnnualTarget extends Component {
                     newData.push([
                         null,
                         "",
-                        item[2] == null || item[2] == ""? (item[1] == null || item[1] ==""? (dataTable2[index-1][2] == null || dataTable2[index-1][2] == ""? dataTable2[index-1][1] : dataTable2[index-1][2]) : item[1]) : item[2],
+                        item[2] == null || item[2] == ""? item[1] : item[2],
                         item[3],
                         item[4],
                         "",