Merge branch 'didam' into 'master'

ganti arpin

See merge request !543

src/api/index.js

@@ -224,6 +224,9 @@ const create = (type = "") => {
   const getLastestUpdateOI = (body) => api.post('transaction/operating_indicator/get_latest_update', body)
   const getLastPeriodeOI = (idCompany) => api.post(`transaction/master_budget/get_last_periode/${idCompany}`)
 
+  //CASH FLOW
+  const getDetailReportCF = (body) => api.post('/transaction/cash_flow/get_report_hierarki', body)
+
   //OUTLOOK PA
   const getOutlookPAID = (body) => api.post('transaction/outlook_pa/get_outlook_pa_id', body)
   const getLastPeriodOLPA = (idCompany) => api.get(`/transaction/outlook_pa/get_last_periode/${idCompany}`)
@@ -425,7 +428,8 @@ const create = (type = "") => {
     getLastPeriodeOI,
     getSubmitOI,
     getLastPeriodOI,
-    getDashboardUser
+    getDashboardUser,
+    getDetailReportCF
   }
 }
 

src/container/BudgetTahunan/CashFlow.js

@@ -54,7 +54,7 @@ export default class CashFlow extends Component {
             "submission_id": this.props.submissionID
         }
         // console.log(JSON.stringify(payload))
-        api.create().getDetailReportMB(payload).then(response => {
+        api.create().getDetailReportCF(payload).then(response => {
             let dataTable = []
             console.log(response)
             let res = response.data.data
@@ -158,9 +158,9 @@ export default class CashFlow extends Component {
             //     console.log(splitFormula)
             //     console.log(baru)
             // }
-            // console.log(baru)
+            console.log(baru)
             baru.map((item, index) => {
-                if (item == '-' || item == '+' || item == '/' || item == '*') {
+                if (item == '-' || item == '+' || item == '/' || item == '*'|| item == '(' || item == ')') {
                     anjay.push(item)
                 } else {
                     if (String(item).includes('#')) {
@@ -239,9 +239,9 @@ export default class CashFlow extends Component {
             // console.log(dataTable2[tableMeta.rowIndex][22])
             // console.log(tableMeta.rowData[5])   
             // if (tableMeta.rowData[5] == 'Beginning Balance') {
-            console.log(baru)
-            console.log(anjay)
-            console.log(total)
+            // console.log(baru)
+            // console.log(anjay)
+            // console.log(total)
             // }
 
             // if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) {