Merge branch 'rifka' into 'master'

ubah url progrep

See merge request !1543

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`, body)
+  const getMonitoringMB = (body) => api.get(`transaction/monitoring/submission/${body.year}`)
   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`, body)
+  const getMonitoringOLPA = (body) => api.get(`transaction/monitoring/outlook/${body.year}`)
 
   // Superadmin Approve
   const getListApprover = (report, monthlyReportId) => api.get(`transaction/${report}/get_approver/${monthlyReportId}`)

src/container/Progress/ProgressReport.js

@@ -171,8 +171,8 @@ class ReportProgress extends Component {
                     let data = response.data.data
                     data.map((item,index) => {
                         let report = []
-                        let statusSubmission = String(item.submissionStatus).toLocaleUpperCase()
-                        let statusOI = String(item.operatingIndicator).toLocaleUpperCase()
+                        let statusSubmission = String(item.submission_status).toLocaleUpperCase()
+                        let statusOI = String(item.operating_indicator).toLocaleUpperCase()
                         item.report.map((items,index) => {
                             let statusReport = String(items.status_report).toLocaleUpperCase()
                             report.push({report_name: items.report_name, status_report: (statusReport == 'APPROVED' || statusReport == 'REVISION' || statusReport == 'COMPLETED') ? (statusReport + ' - ' + items.report_date) : statusReport })
@@ -181,7 +181,7 @@ class ReportProgress extends Component {
                             {report_name: 'Operating Indicator', status_report: statusOI}, 
                             {report_name: 'Submission Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission})
                         dataTable.push([
-                            item.companyName,
+                            item.company_name,
                             report
                         ])
                     })
@@ -293,8 +293,8 @@ class ReportProgress extends Component {
                     let data = response.data.data
                     data.map((item,index) => {
                         let report = []
-                        let statusSubmission = String(item.submissionStatus).toLocaleUpperCase()
-                        let statusOI = String(item.operatingIndicator).toLocaleUpperCase()
+                        let statusSubmission = String(item.outlook_status).toLocaleUpperCase()
+                        let statusOI = String(item.operating_indicator).toLocaleUpperCase()
                         item.report.map((items,index) => {
                             let statusReport = String(items.status_report).toLocaleUpperCase()
                             report.push({report_name: items.report_name, status_report: (statusReport == 'APPROVED' || statusReport == 'REVISION' || statusReport == 'COMPLETED') ? (statusReport + ' - ' + items.report_date) : statusReport })
@@ -303,7 +303,7 @@ class ReportProgress extends Component {
                             {report_name: 'Operating Indicator', status_report: statusOI}, 
                             {report_name: 'OLPA Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission})
                         dataTable.push([
-                            item.companyName,
+                            item.company_name,
                             report
                         ])
                     })