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

src/api/index.js

@@ -240,7 +240,13 @@ const create = (type = "") => {
   const getAllReportPLDetail = (body) => api.post('/transaction/db_profit_loss_detail/get_report_hierarki', body)
   const getReportPLDetailMB = (body) => api.post('/transaction/db_profit_loss_detail/master_budget/get_report_hierarki', body)
   const getReportPLDetailMR = (body) => api.post('/transaction/db_profit_loss_detail/monthly_report/get_report_hierarki', body)
-  const getReportPLMB = (body) => api.post('/transaction/db_profit_loss/master_budget/get_report_hierarki', body)
+  const getReportPL = (body) => api.post('/transaction/db_profit_loss/get_report_hierarki', body)
+  const getHierarkiCreateReportPLMB = (body) => api.post('/transaction/db_profit_loss/master_budget/get_report_hierarki', body)
+  const getHierarkiCreateReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/get_report_hierarki', body)
+  const createReportPLMB = (body) => api.post('/transaction/db_profit_loss/master_budget/create_submission_report', body)
+  const createReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/create_monthly_report', body)
+  // const getReportPLMB = (body) => api.post('/transaction/db_profit_loss/get_report_hierarki', body)
+  // const getReportPLMB = (body) => api.post('/transaction/db_profit_loss/get_report_hierarki', body)
   const getReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/get_report_hierarki', body)
   const getReportTPMB = (body) => api.post('/transaction/db_tax_planning/master_budget/get_report_hierarki', body)
   const getReportTPMR = (body) => api.post('/transaction/db_tax_planning/monthly_report/get_report_hierarki', body)
@@ -603,8 +609,8 @@ const create = (type = "") => {
     getReportBSMR,
     getReportPLDetailMB,
     getReportPLDetailMR,
-    getReportPLMB,
-    getReportPLMR,
+    // getReportPLMB,
+    // getReportPLMR,
     getReportTPMB,
     getReportTPMR,
     getReportTP,
@@ -622,7 +628,12 @@ const create = (type = "") => {
     getReportFRMR,
     getReportFRLastMR,
     getReportBSSuma,
-    getDashboardCAT
+    getDashboardCAT,
+    getReportPL,
+    getHierarkiCreateReportPLMB,
+    getHierarkiCreateReportPLMR,
+    createReportPLMB,
+    createReportPLMR
   }
 }
 

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -748,6 +748,13 @@ export default class CorporateAnnualTargetMR extends Component {
             let totalWeightz = Number(totalWeight) / 100 
             let totalz = Number(Number(total).toFixed(2) / Number(totalWeightz)).toFixed(2)
             let lastTotal = R.equals(totalz, NaN) ? 0.0 : totalz
+
+            if (R.equals(totalz, NaN) || R.equals(totalz, "NaN")) {
+                lastTotal = 0.0
+            } else {
+                lastTotal = totalz
+            }
+            
             // console.log(Number(Number(total).toFixed(2) / Number(totalWeightz)).toFixed(2))
             if (lastTotal >= 1.00 && lastTotal <= 2.00) {
                 perfomanceScore = 'K'