Merge branch 'deni-' into 'master'

Deni

See merge request !648

src/container/MonthlyReport/ListOfCreditFacilities.js

@@ -53,7 +53,7 @@ export default class ListOfCreditFacilities extends Component {
             "monthly_report_id": this.props.monthlyReportId,
             "month": this.props.month.month_id
         }
-        api.create().getHierarkiMontlyReport(payload).then(response => {
+        api.create().getHierarkiMontlyReportBS(payload).then(response => {
             console.log(response);
             let dataTable = []
             if (response.data) {

src/container/MonthlyReport/OperatingIndicatorMR.js

@@ -209,8 +209,27 @@ export default class OperatingIndicatorMR extends Component {
                         )
                     }
                 }
-            },
-            {
+            }, {
+                name: "UOM",
+                options: {
+                    customHeadRender: (columnMeta) => (
+                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}>
+                            <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
+                        </TableCell>
+                    ),
+                    setCellProps: () => ({ style2 }),
+                    customBodyRender: (val, tableMeta, updateValue) => {
+                        return (
+                            <div style={{ textAlign: 'right', width: 90 }}>
+                                {tableMeta.rowData[0] === 4 ?
+                                    null :
+                                    val
+                                }
+                            </div>
+                        )
+                    }
+                }
+            }, {
                 name: "Rolling Outlook (FY2021)",
                 options: {
                     customHeadRender: (columnMeta) => (