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

src/api/index.js

@@ -278,7 +278,7 @@ const create = (type = "") => {
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
   const createMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/create_monthly_report', body)
   const checkUploadMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/check_import', body)
-
+  const uploadMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/import_monthly_report', body)
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
 
@@ -486,6 +486,7 @@ const create = (type = "") => {
     getHierarkiMontlyReportFAM,
     checkUploadMonthlyReportTP,
     checkUploadMonthlyReportFAM,
+    uploadMonthlyReportPL,
     getMonthlyReport
   }
 }

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -663,9 +663,16 @@ export default class FixedAssetsMovement extends Component {
         const handleForecast = (tableMeta, periode) => {
             let total = 0
             if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'gain/ (loss) on fixed assets' || String(tableMeta.rowData[5]).toLocaleLowerCase() == 'ending balance' || String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
-                let indexID = dataTable2[tableMeta.rowIndex][23].findIndex((val) => val.periode == periode)
-                if (indexID !== -1) {
-                    total = dataTable2[tableMeta.rowIndex][23][indexID].value
+                if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
+                    let indexID = dataTable2.findIndex((val, index) => String(val[5]).toLocaleLowerCase() == 'ending balance' && dataTable2[index-1][2] == tableMeta.rowData[2])
+                    if (indexID !== -1) {
+                        total = dataTable2[indexID][18].value
+                    }
+                } else {
+                    let indexID = dataTable2[tableMeta.rowIndex][23].findIndex((val) => val.periode == periode)
+                    if (indexID !== -1) {
+                        total = dataTable2[tableMeta.rowIndex][23][indexID].value
+                    }
                 }
             } else {
                 total = handleValueFormula(tableMeta.columnIndex, tableMeta)

src/container/BudgetTahunan/ProfitLoss.js

@@ -104,7 +104,7 @@ export default class ProfitLoss extends Component {
             "submission_id": this.props.submissionID
         }
         api.create().getDetailReportMB(payload).then(response => {
-            console.log(response);
+            // console.log(response);
             let dataTable = []
             this.setState({ visibleProfitLoss: true })
             if (response.data) {
@@ -141,10 +141,10 @@ export default class ProfitLoss extends Component {
                                     item.order
                                 ])
                             }
-                            if (item.id === 20092) {
-                                console.log(item);
-                                console.log(dataTable);
-                            }
+                            // if (item.id === 20092) {
+                            //     console.log(item);
+                            //     console.log(dataTable);
+                            // }
                             if (item.children !== null) {
                                 if (item.children.length > 0) {
                                     item.children.map((items, indexs) => {
@@ -188,7 +188,7 @@ export default class ProfitLoss extends Component {
                                 }
                             }
                         })
-                        console.log(dataTable)
+                        // console.log(dataTable)
                         this.setState({ dataTable, loading: false, buttonError: true, editable: true }, () => {
                         })
                     } else {
@@ -422,8 +422,8 @@ export default class ProfitLoss extends Component {
             profit_loss: data,
             status: type
         }
-        console.log(this.state.dataTable);
-        console.log(JSON.stringify(body));
+        // console.log(this.state.dataTable);
+        // console.log(JSON.stringify(body));
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
             // console.log(response);
             if (response.data) {
@@ -635,10 +635,10 @@ export default class ProfitLoss extends Component {
                 }
             })
 
-            if (tableMeta.rowData[1] === 20092) {
-                console.log(total);
-                console.log(arrayJumlah);
-            }
+            // if (tableMeta.rowData[1] === 20092) {
+            //     console.log(total);
+            //     console.log(arrayJumlah);
+            // }
             // if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === "" || dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === undefined || dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === null) {
             dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total)
             // }