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

src/api/index.js

@@ -271,9 +271,9 @@ 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 getHierarkiReportYtd = (body) => api.post('/transaction/summary/ytd/get_report_hierarki', body)
+  const getHierarkiReportYtd = (body) => api.post('/transaction/summary_ytd/summary/get_report_hierarki', body)
   const getHierarkiReportHistorical = (body) => api.post('/transaction/summary_historical/summary/get_report_hierarki', body)
-  const getHierarkiReportMTD = (body) => api.post('/transaction/summary/mtd/get_report_hierarki', body)
+  const getHierarkiReportMTD = (body) => api.post('/transaction/summary_mtd/summary/get_report_hierarki', body)
   const getFullApproveMB = (body) => api.post('/transaction/master_budget/get_approved_submit', body)
   const getFullApproveMonthly = (body) => api.post('/transaction/monthly_report/get_approved_submit', body)
 

src/container/BudgetTahunan.js

@@ -1794,21 +1794,21 @@ export default class BudgetTahunan extends Component {
             listFR.push(
                 {
                     "item_report_id": item[1],
-                    "january": String(item[7] == undefined? item[7] : Number(item[7]).toFixed(2)),
-                    "february": String(item[8] == undefined? item[8] : Number(item[8]).toFixed(2)),
-                    "march": String(item[9] == undefined? item[9] : Number(item[9]).toFixed(2)),
-                    "april": String(item[10] == undefined? item[10] : Number(item[10]).toFixed(2)),
-                    "may": String(item[11] == undefined? item[11] : Number(item[11]).toFixed(2)),
-                    "june": String(item[12] == undefined? item[12] : Number(item[12]).toFixed(2)),
-                    "july": String(item[13] == undefined? item[13] : Number(item[13]).toFixed(2)),
-                    "august": String(item[14] == undefined? item[14] : Number(item[14]).toFixed(2)),
-                    "september": String(item[15] == undefined? item[15] : Number(item[15]).toFixed(2)),
-                    "october": String(item[16] == undefined? item[16] : Number(item[16]).toFixed(2)),
-                    "november": String(item[17] == undefined? item[17] : Number(item[17]).toFixed(2)),
-                    "december": String(item[18] == undefined? item[18] : Number(item[18]).toFixed(2)),
-                    "total_current_year": String(totalCY == undefined? totalCY : Number(totalCY).toFixed(2)),
-                    "total_next_year": String(item[19] != ''? Number(item[19]).toFixed(2) : item[19]),
-                    "total_more_year": String(item[20] != ''? Number(item[20]).toFixed(2) : item[20]),
+                    "january": String(item[7] == undefined || item[7] == 'Infinity' || item[7] == '-Infinity'? "0.0" : Number(item[7]).toFixed(2)),
+                    "february": String(item[8] == undefined || item[8] == 'Infinity' || item[8] == '-Infinity'? "0.0" : Number(item[8]).toFixed(2)),
+                    "march": String(item[9] == undefined || item[9] == 'Infinity' || item[9] == '-Infinity'? "0.0" : Number(item[9]).toFixed(2)),
+                    "april": String(item[10] == undefined || item[10] == 'Infinity' || item[10] == '-Infinity'? "0.0" : Number(item[10]).toFixed(2)),
+                    "may": String(item[11] == undefined || item[11] == 'Infinity' || item[11] == '-Infinity'? "0.0" : Number(item[11]).toFixed(2)),
+                    "june": String(item[12] == undefined || item[12] == 'Infinity' || item[12] == '-Infinity'? "0.0" : Number(item[12]).toFixed(2)),
+                    "july": String(item[13] == undefined || item[13] == 'Infinity' || item[13] == '-Infinity'? "0.0" : Number(item[13]).toFixed(2)),
+                    "august": String(item[14] == undefined || item[14] == 'Infinity' || item[14] == '-Infinity'? "0.0" : Number(item[14]).toFixed(2)),
+                    "september": String(item[15] == undefined || item[15] == 'Infinity' || item[15] == '-Infinity'? "0.0" : Number(item[15]).toFixed(2)),
+                    "october": String(item[16] == undefined || item[16] == 'Infinity' || item[16] == '-Infinity'? "0.0" : Number(item[16]).toFixed(2)),
+                    "november": String(item[17] == undefined || item[17] == 'Infinity' || item[17] == '-Infinity'? "0.0" : Number(item[17]).toFixed(2)),
+                    "december": String(item[18] == undefined || item[18] == 'Infinity' || item[18] == '-Infinity'? "0.0" : Number(item[18]).toFixed(2)),
+                    "total_current_year": String(totalCY == undefined || totalCY == 'Infinity' || totalCY == '-Infinity'? "0.0" : Number(totalCY).toFixed(2)),
+                    "total_next_year": String(item[19] != '' || item[19] != 'Infinity' || item[19] != '-Infinity'? Number(item[19]).toFixed(2) : item[19]),
+                    "total_more_year": String(item[20] != '' || item[20] != 'Infinity' || item[20] != '-Infinity'? Number(item[20]).toFixed(2) : item[20]),
                   }
             )
             

src/container/MonthlyReport.js

@@ -2006,28 +2006,28 @@ export default class MonthlyReport extends Component {
                 {
                     "item_report_id": item[1],
                     "actual": this.state.month.month_id == 1? 
-                        String(item[7] == undefined? item[7] : Number(item[7]).toFixed(2)) : 
+                        String(item[7] == undefined || item[7] == 'Infinity' || item[7] == '-Infinity'? "0.0" : Number(item[7]).toFixed(2)) : 
                     this.state.month.month_id == 2? 
-                        String(item[8] == undefined? item[8] : Number(item[8]).toFixed(2)) :
+                        String(item[8] == undefined || item[8] == 'Infinity' || item[8] == '-Infinity'? "0.0" : Number(item[8]).toFixed(2)) :
                     this.state.month.month_id == 3? 
-                        String(item[9] == undefined? item[8] : Number(item[9]).toFixed(2)) :
+                        String(item[9] == undefined || item[9] == 'Infinity' || item[9] == '-Infinity'? "0.0" : Number(item[9]).toFixed(2)) :
                     this.state.month.month_id == 4? 
-                        String(item[10] == undefined? item[10] : Number(item[10]).toFixed(2))  :
+                        String(item[10] == undefined || item[10] == 'Infinity' || item[10] == '-Infinity'? "0.0" : Number(item[10]).toFixed(2))  :
                     this.state.month.month_id == 5? 
-                        String(item[11] == undefined? item[11] : Number(item[11]).toFixed(2)) :
+                        String(item[11] == undefined || item[11] == 'Infinity' || item[11] == '-Infinity'? "0.0" : Number(item[11]).toFixed(2)) :
                     this.state.month.month_id == 6? 
-                        String(item[12] == undefined? item[12] : Number(item[12]).toFixed(2)) :
+                        String(item[12] == undefined || item[12] == 'Infinity' || item[12] == '-Infinity'? "0.0" : Number(item[12]).toFixed(2)) :
                     this.state.month.month_id == 7? 
-                        String(item[13] == undefined? item[13] : Number(item[13]).toFixed(2)) :
+                        String(item[13] == undefined || item[13] == 'Infinity' || item[13] == '-Infinity'? "0.0" : Number(item[13]).toFixed(2)) :
                     this.state.month.month_id == 8? 
-                        String(item[14] == undefined? item[14] : Number(item[14]).toFixed(2)) :
+                        String(item[14] == undefined || item[14] == 'Infinity' || item[14] == '-Infinity'? "0.0" : Number(item[14]).toFixed(2)) :
                     this.state.month.month_id == 9? 
-                        String(item[15] == undefined? item[15] : Number(item[15]).toFixed(2)) :
+                        String(item[15] == undefined || item[15] == 'Infinity' || item[15] == '-Infinity'? "0.0" : Number(item[15]).toFixed(2)) :
                     this.state.month.month_id == 10? 
-                        String(item[16] == undefined? item[16] : Number(item[16]).toFixed(2)) :
+                        String(item[16] == undefined || item[16] == 'Infinity' || item[16] == '-Infinity'? "0.0" : Number(item[16]).toFixed(2)) :
                     this.state.month.month_id == 11? 
-                        String(item[17] == undefined? item[17] : Number(item[17]).toFixed(2)) :
-                        String(item[18] == undefined? item[18] : Number(item[18]).toFixed(2))
+                        String(item[17] == undefined || item[17] == 'Infinity' || item[17] == '-Infinity'? "0.0" : Number(item[17]).toFixed(2)) :
+                        String(item[18] == undefined || item[18] == 'Infinity' || item[18] == '-Infinity'? "0.0" : Number(item[18]).toFixed(2))
                     // "january": String(item[7] == undefined? item[7] : Number(item[7]).toFixed(1)),
                     // "february": String(item[8] == undefined? item[8] : Number(item[8]).toFixed(1)),
                     // "march": String(item[9] == undefined? item[9] : Number(item[9]).toFixed(1)),