Merge branch 'GGMAC' into 'master'

update

See merge request !1532

src/api/index.js

@@ -441,6 +441,10 @@ const create = (type = "") => {
   const getHierarkiCronJobMRCF = () => api.get('/transaction/report/get_hierarki_monthly_report/cash_flow')
   const getHierarkiCronJobMRRatio = () => api.get('/transaction/report/get_hierarki_monthly_report/ratio')
   
+  // Ratio X LOCF 
+  const getRatioLOCF = (body) => api.get(`/transaction/cronjob/create_monthly_report/${body.report}/${body.monthlyReportId}/${body.companyId}/${body.months}/${body.periode}`)
+  const triggerRatioFromLOCF = (body) => api.get(`/transaction/cronjob/create_monthly_report_locf/${body.report}/${body.monthlyReportId}/${body.companyId}/${body.months}/${body.periode}`)
+
   // MonthlyPL
   // const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
   // const createMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/create_monthly_report', body)
@@ -807,7 +811,9 @@ const create = (type = "") => {
     getHierarkiDBPLRO,
     createDBPLRO,
     getDetailReportOLPACAT,
-    createCATOLPA
+    createCATOLPA,
+    getRatioLOCF,
+    triggerRatioFromLOCF
   }
 }
 

src/container/MonthlyReport/ListOfCreditFacilities.js

@@ -173,6 +173,7 @@ export default class ListOfCreditFacilities extends Component {
         }
 
         this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev})
+        // this.setState({viewOnly: true})
     }
 
     getItemHierarki() {
@@ -757,7 +758,7 @@ export default class ListOfCreditFacilities extends Component {
                 if (response.data) {
                     if (response.ok) {
                         if (response.data.status === "success") {
-                            this.props.saveToMonthlyReport()
+                            this.props.saveToMonthlyReport('LOCF')
                             // this.props.onClickClose()
                             // this.props.getReport()
                         } else {
@@ -961,13 +962,13 @@ export default class ListOfCreditFacilities extends Component {
 
     getDataRatio() {
         let payload = {
-            "report_id": this.props.report_id,
-            "revision": this.props.revision,
-            "periode": 2021,
-            "company_id": this.props.company.company_id,
-            "submission_id": this.state.submissionID
+            "report": 'ratio',
+            "monthlyReportId": this.props.monthlyReportId,
+            "periode": this.props.periode,
+            "companyId": this.props.company.company_id,
+            "months": this.props.month.month_id
         }
-        api.create().getReportHierarkiFRMR(payload).then(response => {
+        api.create().getRatioLOCF(payload).then(response => {
             console.log(payload);
             console.log(response);
             let dataTable = []
@@ -1153,7 +1154,7 @@ export default class ListOfCreditFacilities extends Component {
                 console.log(response);
                 if (response.data) {
                     if (response.data.status === "success") {
-                        this.props.saveToMonthlyReport()
+                        this.props.saveToMonthlyReport('LOCF')
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false}, () => {
                             document.body.style.overflow = 'unset';