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

src/api/index.js

@@ -255,6 +255,7 @@ const create = (type = "") => {
   const getMonthlyReportID = (body) => api.post('transaction/monthly_report_bs/get_monthly_report_id', body)
   const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
   const getHierarkiMontlyReportOI = (body) => api.post('transaction/monthly_report_oi/get_report_hierarki', body)
+  const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
 
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
@@ -442,6 +443,7 @@ const create = (type = "") => {
     getDashboardUser,
     getHierarkiMontlyReportBS,
     getHierarkiMontlyReportOI,
+    getHierarkiMontlyReportTP,
     getDetailReportCF,
     getReportHierarkiPL,
     getMonthlyReportID,

src/container/Laporan/SubHolding.js

@@ -505,7 +505,7 @@ export default class SubHolding extends Component {
         } else if (this.state.report.value === 4) {
             api.create().getReportHierarkiFR(payload).then(response => {
                 // console.log(payload);
-                console.log(response);
+                // console.log(response);
                 let dataTable = []
                 if (response.data) {
                     if (response.data.status === 'success') {
@@ -522,20 +522,20 @@ export default class SubHolding extends Component {
                                     item.description,
                                     item.uom,
                                     item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
-                                    Number(item.ratio.january).toFixed(1),
-                                    Number(item.ratio.february).toFixed(1),
-                                    Number(item.ratio.march).toFixed(1),
-                                    Number(item.ratio.april).toFixed(1),
-                                    Number(item.ratio.may).toFixed(1),
-                                    Number(item.ratio.june).toFixed(1),
-                                    Number(item.ratio.july).toFixed(1),
-                                    Number(item.ratio.august).toFixed(1),
-                                    Number(item.ratio.september).toFixed(1),
-                                    Number(item.ratio.october).toFixed(1),
-                                    Number(item.ratio.november).toFixed(1),
-                                    Number(item.ratio.december).toFixed(1),
-                                    Number(item.ratio.total_next_year).toFixed(1),
-                                    Number(item.ratio.total_more_year).toFixed(1),
+                                    Number(item.ratio.january).toFixed(2),
+                                    Number(item.ratio.february).toFixed(2),
+                                    Number(item.ratio.march).toFixed(2),
+                                    Number(item.ratio.april).toFixed(2),
+                                    Number(item.ratio.may).toFixed(2),
+                                    Number(item.ratio.june).toFixed(2),
+                                    Number(item.ratio.july).toFixed(2),
+                                    Number(item.ratio.august).toFixed(2),
+                                    Number(item.ratio.september).toFixed(2),
+                                    Number(item.ratio.october).toFixed(2),
+                                    Number(item.ratio.november).toFixed(2),
+                                    Number(item.ratio.december).toFixed(2),
+                                    Number(item.ratio.total_next_year).toFixed(2),
+                                    Number(item.ratio.total_more_year).toFixed(2),
                                     item.order,
                                     item.condition_it_should_be,
                                     item.condition_if_wrong
@@ -559,20 +559,20 @@ export default class SubHolding extends Component {
                                 item.description,
                                 item.oum,
                                 item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
-                                Number(item.ratio.january).toFixed(1),
-                                Number(item.ratio.february).toFixed(1),
-                                Number(item.ratio.march).toFixed(1),
-                                Number(item.ratio.april).toFixed(1),
-                                Number(item.ratio.may).toFixed(1),
-                                Number(item.ratio.june).toFixed(1),
-                                Number(item.ratio.july).toFixed(1),
-                                Number(item.ratio.august).toFixed(1),
-                                Number(item.ratio.september).toFixed(1),
-                                Number(item.ratio.october).toFixed(1),
-                                Number(item.ratio.november).toFixed(1),
-                                Number(item.ratio.december).toFixed(1),
-                                Number(item.ratio.total_next_year).toFixed(1),
-                                Number(item.ratio.total_more_year).toFixed(1),
+                                Number(item.ratio.january).toFixed(2),
+                                Number(item.ratio.february).toFixed(2),
+                                Number(item.ratio.march).toFixed(2),
+                                Number(item.ratio.april).toFixed(2),
+                                Number(item.ratio.may).toFixed(2),
+                                Number(item.ratio.june).toFixed(2),
+                                Number(item.ratio.july).toFixed(2),
+                                Number(item.ratio.august).toFixed(2),
+                                Number(item.ratio.september).toFixed(2),
+                                Number(item.ratio.october).toFixed(2),
+                                Number(item.ratio.november).toFixed(2),
+                                Number(item.ratio.december).toFixed(2),
+                                Number(item.ratio.total_next_year).toFixed(2),
+                                Number(item.ratio.total_more_year).toFixed(2),
                                 item.order,
                                 item.condition_it_should_be,
                                 item.condition_if_wrong

src/container/MonthlyReport.js

@@ -778,7 +778,6 @@ export default class MonthlyReport extends Component {
                         company={this.state.company}
                         revision={this.state.revisionTable}
                         periode={this.state.periode.periode}
-                        // submissionID={this.state.submissionID}
                         monthlyReportId={this.state.monthlyReportId}
                         month={this.state.month}
                         // saveToMasterBudget={this.saveToMasterBudget.bind(this)}