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

src/api/index.js

@@ -275,9 +275,11 @@ const create = (type = "") => {
   const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
   const checkUploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/check_import', body)
   const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
+  const checkUploadMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/check_import', body)
   const uploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/import_monthly_report', body)
   const uploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/import_monthly_report', body)
   const uploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/import_monthly_report', body)
+  const uploadMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/import_monthly_report', body)
   
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
@@ -492,12 +494,14 @@ const create = (type = "") => {
     getHierarkiMontlyReportCAT,
     checkUploadMonthlyReportTP,
     checkUploadMonthlyReportFAM,
+    checkUploadMonthlyReportOI,
     uploadMonthlyReportPL,
     getMonthlyReport,
     checkUploadMonthlyReportBS,
     uploadMonthlyReportBS,
     uploadMonthlyReportFAM,
     uploadMonthlyReportTP,
+    uploadMonthlyReportOI,
     getHierarkiMontlyReportCF
   }
 }

src/container/MonthlyReport/ProfitLossMR.js

@@ -742,15 +742,15 @@ export default class ProfitLossMR extends Component {
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
                                   <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                               </TableCell> */}
-                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 43, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
+                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 40, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
                             <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
-                                <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
+                                <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
                                     <span>{"Master Budget (MB)"}</span>
                                 </div>
-                                <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
+                                <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
                                     <span>{"Rolling Budget (RB)"}</span>
                                 </div>
-                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6', height: '100%' }}>
+                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
                                     <span>{"Actual"}</span>
                                 </div>
                             </div>
@@ -1716,6 +1716,7 @@ export default class ProfitLossMR extends Component {
                                     </MuiThemeProvider>
                                 )}
                             </div>
+                            <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
                             {/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
                                 (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
                             <div className="grid grid-2x" style={{ marginTop: 20 }}>