Merge branch 'GGMAC' into 'master'

done update

See merge request !1542

src/api/index.js

@@ -478,10 +478,10 @@ const create = (type = "") => {
   const deleteDocument = (id) => api.post(`document/delete_document/${id}`)
 
   // Monitoring
-  const getMonitoringMB = (body) => api.get(`transaction/monitoring/master_budget?year=${body.year}`)
+  const getMonitoringMB = (body) => api.get(`transaction/monitoring/master_budget`, body)
   const getMonitoringMR = (body) => api.get(`transaction/monitoring/monthly_report/${body.year}/${body.month}`)
   const getMonitoringRO = (body) => api.get(`transaction/monitoring/rolling_outlook/${body.year}/${body.quarter}`)
-  const getMonitoringOLPA = (body) => api.get(`transaction/monitoring/outlook_pa?year=${body.year}`)
+  const getMonitoringOLPA = (body) => api.get(`transaction/monitoring/outlook_pa`, body)
 
   // Superadmin Approve
   const getListApprover = (report, monthlyReportId) => api.get(`transaction/${report}/get_approver/${monthlyReportId}`)

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -326,17 +326,17 @@ export default class BalanceSheetOLPA extends Component {
         console.log(data);
         this.setState({ loading: false })
         if (type == 'submitted') {
-            this.props.saveToOLPA(payload)
-            let bodyRatioOLPA = {
-                "report": 'ratio',
-                "outlookPaId": this.props.outlook_pa_id,
-                "companyId": this.props.company.company_id,
-                "periode": this.props.periode
-            }
-            api.create().triggerRatioOLPA(bodyRatioOLPA).then((res) => {
-                console.log(res)
-                this.setState({ loading: false })
-            })
+            this.props.saveToOLPA(payload, 'BS')
+            // let bodyRatioOLPA = {
+            //     "report": 'ratio',
+            //     "outlookPaId": this.props.outlook_pa_id,
+            //     "companyId": this.props.company.company_id,
+            //     "periode": this.props.periode
+            // }
+            // api.create().triggerRatioOLPA(bodyRatioOLPA).then((res) => {
+            //     console.log(res)
+            //     this.setState({ loading: false })
+            // })
             this.props.onClickClose()
         } else {
             this.props.saveToOLPA(payload)

src/container/RollingOutlook/BalanceSheetRO.js

@@ -374,18 +374,18 @@ export default class BalanceSheetRO extends Component {
                 if (response.data.status === "success") {
                     if (type == 'submitted') {
                         this.props.onClickClose()
-                        this.props.refresh()
-                        let bodyRatioRO = {
-                            "report": 'ratio',
-                            "rollingOutlookId": this.props.rollingOutlookID,
-                            "periode": this.props.periode,
-                            "companyId": this.props.company.company_id,
-                            "quartal": this.props.quarter
-                        }
-                        api.create().triggerRatioRO(bodyRatioRO).then((res) => {
-                            console.log(res)
-                            this.setState({ loading: false })
-                        })
+                        this.props.refresh('BS')
+                    // let bodyRatioRO = {
+                    //     "report": 'ratio',
+                    //     "rollingOutlookId": this.props.rollingOutlookID,
+                    //     "periode": this.props.periode,
+                    //     "companyId": this.props.company.company_id,
+                    //     "quartal": this.props.quarter
+                    // }
+                    // api.create().triggerRatioRO(bodyRatioRO).then((res) => {
+                    //     console.log(res)
+                    //     this.setState({ loading: false })
+                    // })
                     } else {
                         this.props.onClickClose()
                         this.props.refresh()
@@ -600,18 +600,18 @@ export default class BalanceSheetRO extends Component {
                 if (response.data.status === "success") {
                     if (type == 'submitted') {
                         this.props.onClickClose()
-                        this.props.refresh()
-                        let bodyRatioRO = {
-                            "report": 'ratio',
-                            "rollingOutlookId": this.props.rollingOutlookID,
-                            "periode": this.props.periode,
-                            "companyId": this.props.company.company_id,
-                            "quartal": this.props.quarter
-                        }
-                        api.create().triggerRatioRO(bodyRatioRO).then((res) => {
-                            console.log(res)
-                            this.setState({ loading: false })
-                        })
+                        this.props.refresh('BS')
+                        // let bodyRatioRO = {
+                        //     "report": 'ratio',
+                        //     "rollingOutlookId": this.props.rollingOutlookID,
+                        //     "periode": this.props.periode,
+                        //     "companyId": this.props.company.company_id,
+                        //     "quartal": this.props.quarter
+                        // }
+                        // api.create().triggerRatioRO(bodyRatioRO).then((res) => {
+                        //     console.log(res)
+                        //     this.setState({ loading: false })
+                        // })
                     } else {
                         this.props.onClickClose()
                         this.props.refresh()