Merge branch 'riri' into 'master'

mtd

See merge request !1121

src/api/index.js

@@ -273,7 +273,7 @@ const create = (type = "") => {
   const getDashboardCAT = (body) => api.post('/dashboard/cat', 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/SummaryTriputra/TableSummaryTriputra.js

@@ -168,7 +168,6 @@ export default class TableSummaryTriputra extends Component {
                                                                 style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                 type="text"
                                                                 placeholder=""
-                                                                decimalScale={1}
                                                                 disabled={true}
                                                                 value={Number(tableMeta.rowData[4]).toFixed(1)}
                                                             />
@@ -187,7 +186,6 @@ export default class TableSummaryTriputra extends Component {
                                                                 style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                 type="text"
                                                                 placeholder=""
-                                                                decimalScale={1}
                                                                 disabled={true}
                                                                 value={Number(tableMeta.rowData[5]).toFixed(1)}
                                                             />
@@ -206,9 +204,8 @@ export default class TableSummaryTriputra extends Component {
                                                                 style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                 type="text"
                                                                 placeholder=""
-                                                                suffix={'%'}
                                                                 disabled={true}
-                                                                value={Number(tableMeta.rowData[6]).toFixed(2)}
+                                                                value={Number(tableMeta.rowData[6]).toFixed(1)}
                                                             />
                                                         }
                                                     />
@@ -269,7 +266,7 @@ export default class TableSummaryTriputra extends Component {
                                                                 placeholder=""
                                                                 suffix={'%'}
                                                                 disabled={true}
-                                                                value={Number(tableMeta.rowData[9]).toFixed(2)}
+                                                                value={Number(tableMeta.rowData[9]).toFixed(1)}
                                                             />
                                                         }
                                                     />
@@ -1041,26 +1038,6 @@ export default class TableSummaryTriputra extends Component {
                 options: {
                     display: false
                 }
-            }, {
-                name: "",
-                options: {
-                    display: false
-                }
-            }, {
-                name: "",
-                options: {
-                    display: false
-                }
-            }, {
-                name: "",
-                options: {
-                    display: false
-                }
-            }, {
-                name: "",
-                options: {
-                    display: false
-                }
             }
         ]