Merge branch 'didam' into 'master'

apdet

See merge request !913

src/api/index.js

@@ -265,7 +265,7 @@ const create = (type = "") => {
   const getHierarkiMontlyReportTP = (body) => api.post('transaction/tax_planning/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportLOCF = (body) => api.post('transaction/locf/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportFAM = (body) => api.post('transaction/monthly_report/fam/get_report_hierarki', body)
-  const getHierarkiMontlyReportCF = (body) => api.post('transaction/monthly_report_cf/get_report_hierarki', body)
+  const getHierarkiMontlyReportCF = (body) => api.post('transaction/cash_flow/monthly_report/get_report_hierarki', body)
   const getHierarkiMontlyReportCAT = (body) => api.post('/transaction/monthly_report/cat/get_report_hierarki', body)
   const getLastPeriodMonthly = (idCompany) => api.get(`transaction/monthly_report/get_last_periode/${idCompany}`)
   const checkApproverMonthly = () => api.get('transaction/monthly_report/is_approver')

src/container/MonthlyReport.js

@@ -175,7 +175,7 @@ export default class MonthlyReport extends Component {
                     let dataTable = response.data.data.map((item, index) => {
                         return [
                             item.number,
-                            item.report_name,
+                            item.report_name == "CAT"? "Corporate Annual Target" : item.report_name,
                             item.revision,
                             item.current_status,
                             item.report_id,
@@ -595,7 +595,7 @@ export default class MonthlyReport extends Component {
                     visibleLOCF: false,
                     visibleOI: false,
                 })
-            } else if (item === 'CAT') {
+            } else if (item === 'Corporate Annual Target') {
                 this.setState({
                     visibleMonthlyReport: false,
                     visibleBS: false,
@@ -879,7 +879,7 @@ export default class MonthlyReport extends Component {
                 {this.state.visibleMonthlyReport && (
                     <div>
                         <div className={"main-color"} style={{ height: 78, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
-                            <Typography style={{ fontSize: '16px', color: 'white' }}>Monthly Report</Typography>
+                            <Typography style={{ fontSize: '16px', color: 'white' }}>Monthly Report Submission</Typography>
                         </div>
                         <div style={{ padding: 20, width: '100%' }}>
                             <Paper style={{ paddingTop: 10 }}>
@@ -964,7 +964,7 @@ export default class MonthlyReport extends Component {
                                                     }
                                                 })}
                                                 disableClearable
-                                                style={{ width: 250, marginRight: 20 }}
+                                                style={{ minWidth: 250, marginRight: 20 }}
                                                 renderInput={(params) => <TextField {...params} label="Month" margin="normal" style={{ marginTop: 7 }} />}
                                                 value={this.state.month}
                                             />

src/container/MonthlyReport/CashFlowMR.js

@@ -118,10 +118,10 @@ export default class CashFlowMR extends Component {
     }
 
     async downloadAllData() {
-        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_cf/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/monthly_report/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         console.log(url);
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_cf/export_monthly_report?monthly_report_id=${this.props.monthlyReportId === null ? "" : this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cash_flow/monthly_report/export_monthly_report?monthly_report_id=${this.props.monthlyReportId === null ? "" : this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         )
         res = await res.blob()
         this.setState({ loading: false })
@@ -374,7 +374,7 @@ export default class CashFlowMR extends Component {
                         }
                     }),
                     customBodyRender: (value, tableMeta, updateValue) => {
-                        console.log(tableMeta);
+                        // console.log(tableMeta);
                         return (
                             <div style={{ textAlign: 'right' }}>
                                 {tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ||tableMeta.rowData[0] === 7 ?