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

src/api/index.js

@@ -259,6 +259,7 @@ const create = (type = "") => {
   const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
   const getHierarkiMontlyReportLOCF = (body) => api.post('transaction/monthly_report_locf/get_report_hierarki', body)
   const getHierarkiMontlyReportFAM = (body) => api.post('transaction/monthly_report/fam/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')
   const getCompanySubmittedMonthly = (body) => api.post('transaction/monthly_report/get_company_submitted', body)
@@ -487,6 +488,7 @@ const create = (type = "") => {
     getHierarkiMontlyReportPL,
     getHierarkiMontlyReportLOCF,
     getHierarkiMontlyReportFAM,
+    getHierarkiMontlyReportCAT,
     checkUploadMonthlyReportTP,
     checkUploadMonthlyReportFAM,
     uploadMonthlyReportPL,

src/container/MonthlyReport.js

@@ -18,6 +18,7 @@ import MuiAlert from '@material-ui/lab/Alert';
 import Constant from '../library/Constant';
 import OperatingIndicatorMR from './MonthlyReport/OperatingIndicatorMR';
 import CorporateAnnualTargetMR from './MonthlyReport/CorporateAnnualTargetMR';
+import CashFlowMR from './MonthlyReport/CashFlowMR';
 
 var ct = require("../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -45,6 +46,7 @@ export default class MonthlyReport extends Component {
             visibleFAM: false,
             visibleCAT: false,
             visibleOI: false,
+            visibleCF: false,
             listAttachment: [],
             visibleUpload: false,
             lastRevision: 0,
@@ -471,7 +473,7 @@ export default class MonthlyReport extends Component {
         })
     }
 
-    saveToMonthlyReport(){
+    saveToMonthlyReport() {
         this.setState({
             visibleMonthlyReport: true,
             visibleBS: false,
@@ -481,7 +483,7 @@ export default class MonthlyReport extends Component {
             visibleTP: false,
             visibleLOCF: false,
             visibleOI: false,
-        }, ()=> {
+        }, () => {
             this.getMonthlyReportID()
         })
     }
@@ -503,6 +505,7 @@ export default class MonthlyReport extends Component {
                     visibleTP: false,
                     visibleLOCF: false,
                     visibleOI: false,
+                    visibleCF: false,
                 })
             } else if (item === 'Profit Loss') {
                 this.setState({
@@ -514,6 +517,7 @@ export default class MonthlyReport extends Component {
                     visibleTP: false,
                     visibleLOCF: false,
                     visibleOI: false,
+                    visibleCF: false,
                 })
             } else if (item === 'Tax Planning') {
                 this.setState({
@@ -525,6 +529,7 @@ export default class MonthlyReport extends Component {
                     visibleTP: true,
                     visibleLOCF: false,
                     visibleOI: false,
+                    visibleCF: false,
                 })
             } else if (item === 'Fixed Assets Movement') {
                 this.setState({
@@ -547,6 +552,7 @@ export default class MonthlyReport extends Component {
                     visibleTP: false,
                     visibleLOCF: false,
                     visibleOI: false,
+                    visibleCF: false,
                 })
             } else if (item === 'List of Credit Facilities') {
                 this.setState({
@@ -558,6 +564,7 @@ export default class MonthlyReport extends Component {
                     visibleTP: false,
                     visibleLOCF: true,
                     visibleOI: false,
+                    visibleCF: false,
                 })
             } else if (item === 'Operating Indicator') {
                 this.setState({
@@ -569,6 +576,19 @@ export default class MonthlyReport extends Component {
                     visibleTP: false,
                     visibleLOCF: false,
                     visibleOI: true,
+                    visibleCF: false,
+                })
+            } else if (item === 'Cash Flow') {
+                this.setState({
+                    visibleMonthlyReport: false,
+                    visibleBS: false,
+                    visiblePL: false,
+                    visibleCAT: false,
+                    visibleFAM: false,
+                    visibleTP: false,
+                    visibleLOCF: false,
+                    visibleOI: false,
+                    visibleCF: true,
                 })
             }
         })
@@ -645,7 +665,7 @@ export default class MonthlyReport extends Component {
             `https://tia.eksad.com/tia-reporting-dev/public/transaction/monthly_report/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
         )
         res = await res.blob()
-        this.setState({ loading: false }, ()=> {
+        this.setState({ loading: false }, () => {
             document.body.style.overflow = 'unset';
         })
         if (res.size > 0) {
@@ -1088,7 +1108,7 @@ export default class MonthlyReport extends Component {
                         month={this.state.month}
                         saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
                         onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
-                        // getReport={this.getCompanyActive.bind(this)}
+                    // getReport={this.getCompanyActive.bind(this)}
                     />
                 )}
                 {this.state.visibleFAM && (
@@ -1152,6 +1172,21 @@ export default class MonthlyReport extends Component {
                         onClickClose={() => this.setState({ visibleOI: false, visibleMonthlyReport: true })}
                     />
                 )}
+
+                {this.state.visibleCF && (
+                    <CashFlowMR
+                        open={this.props.open}
+                        report_id={this.state.report_id}
+                        height={this.props.height}
+                        width={this.props.width}
+                        company={this.state.company}
+                        revision={this.state.revisionTable}
+                        periode={this.state.periode.periode}
+                        monthlyReportId={this.state.monthlyReportId}
+                        month={this.state.month}
+                        onClickClose={() => this.setState({ visibleCF: false, visibleMonthlyReport: true })}
+                    />
+                )}
             </div >
         );
     }