Merge branch 'rifka' into 'master'

Rifka

See merge request !1081

src/api/index.js

@@ -264,6 +264,7 @@ const create = (type = "") => {
   const getReportFRLastMR = (body) => api.post('/transaction/summary_ratio/monthly_report_last_year/get_report_hierarki', body)
   const getReportBSSuma = (body) => api.post('/transaction/summary_balance_sheet/summary/get_report_hierarki', body)
   const getDashboardCAT = (body) => api.post('/dashboard/cat', body)
+  const getHierarkiReportHistorical = (body) => api.post('/transaction/historical/get_historical_hierarki', body)
   
   //CASH FLOW
   const getDetailReportCF = (body) => api.post('/transaction/cash_flow/master_budget/get_report_hierarki', body)
@@ -635,7 +636,8 @@ const create = (type = "") => {
     getHierarkiCreateReportPLMR,
     createReportPLMB,
     createReportPLMR,
-    getPLID
+    getPLID,
+    getHierarkiReportHistorical
   }
 }
 

src/container/Laporan/SubHolding.js

@@ -1351,11 +1351,33 @@ export default class SubHolding extends Component {
 
                             let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : item.cash_flow.quarter_actual
                             let quarter = item.cash_flow.quarter == '' ? 0 : item.cash_flow.quarter
-                            let persenQuarter = Number(quarter_actual / quarter)
+                            // let persenQuarter = Number(quarter_actual / quarter)
+                            let persenQuarter = 0
+                            if (quarter  < 0) {
+                                if (quarter_actual >= quarter) {
+                                    persenQuarter = (quarter - quarter_actual) / quarter + 1  
+                                }  else {
+                                    persenQuarter = (quarter - quarter_actual) / quarter 
+                                }
+                            }
+                            else {
+                                persenQuarter = quarter_actual / quarter
+                            }
 
                             let fy_actual = item.cash_flow.fy_actual == '' ? 0 : item.cash_flow.fy_actual
                             let fy = item.cash_flow.fy == '' ? 0 : item.cash_flow.fy
-                            let persenFy = Number(fy_actual / fy)
+                            // let persenFy = Number(fy_actual / fy)
+                            let persenFy = 0
+                            if (fy  < 0) {
+                                if (fy_actual >= fy) {
+                                    persenFy = (fy - fy_actual) / fy + 1  
+                                }  else {
+                                    persenFy = (fy - fy_actual) / fy 
+                                }
+                            }
+                            else {
+                                persenFy = fy_actual / fy
+                            }
 
                             dbSumaCF.push([
                                 item.id,