Merge branch 'deni-dev(pc)' into 'master'

Deni dev(pc)

See merge request !472

src/api/index.js

@@ -233,8 +233,12 @@ const create = (type = "") => {
   const createReportOLPA = (body) => api.post('transaction/outlook_pa/create_outlook_report', body)
   const checkUploadOLPA = (body) => api.post('transaction/outlook_pa/check_import', body)
   const validateSubmitReportOLPA = (body) => api.post('transaction/outlook_pa/validate_save', body)
-  const uploadOLPA = (body) => api.post('transaction/outlook_pa/import_outlook_pa')
+  const uploadOLPA = (body) => api.post('transaction/outlook_pa/import_outlook_pa', body)
   const uploadAttOLPA = (body) => api.post('transaction/outlook_pa/upload_attachment', body)
+  const deleteAttOLPA = (id) => api.post(`transaction/outlook_pa/delete_attachment/${id}`)
+  const getReportOLPA = (body) => api.post('transaction/outlook_pa/get_all_report', body)
+  const approvalSubmissionOLPA = (body) => api.post('transaction/outlook_pa/approval_submission', body)
+  const checkApproverOLPA = () => api.get('transaction/outlook_pa/is_approver')
 
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
@@ -407,7 +411,11 @@ const create = (type = "") => {
     uploadOLPA,
     validateSubmitReportOLPA,
     getDetailReportOLPA,
-    uploadAttOLPA
+    uploadAttOLPA,
+    deleteAttOLPA,
+    getReportOLPA,
+    approvalSubmissionOLPA,
+    checkApproverOLPA
   }
 }
 

src/container/BudgetTahunan.js

@@ -318,7 +318,7 @@ export default class BudgetTahunan extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
-                    let index = data.sort((a, b) => a - b).findIndex((val) => val === (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod))
+                    let index = data.sort((a, b) => a - b).findIndex((val) => val === (this.state.latestPeriode == "" ? String(Number(currentYear) + 1) : this.state.latestPeriode))
                     // console.log(data)
                     console.log(this.state.lastPeriod)
                     // console.log(periodeData)
@@ -390,7 +390,7 @@ export default class BudgetTahunan extends Component {
                             if (response.data.data.is_approver === true) {
                                 this.setState({ isApprover: true, checkApprover: true })
                             } else {
-                                this.setState({ isApprover: this.state.lastStatus === "SUBMITTED" ? true : false, checkApprover: false })
+                                this.setState({ isApprover: false, checkApprover: false })
                             }
 
                         })
@@ -643,7 +643,7 @@ export default class BudgetTahunan extends Component {
             api.create().submitMasterBudget(body).then(response => {
                 console.log(response);
                 if (response.data) {
-                    if (response.data.status === "Success") {
+                    if (response.data.status === "success") {
                         this.getSubmission()
                     }
                 }

src/container/Otorisasi/User.js

@@ -494,7 +494,7 @@ export default class UserRole extends Component {
       // if (String(response.data.status).toLocaleUpperCase === 'Success' || String(response.data.status).toLocaleUpperCase === 'success') {
       if (response.data) {
         if (response.ok) {
-          if (response.data.status === 'Success') {
+          if (response.data.status === 'success') {
             this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success', add: false })
             this.getUser()
             window.location.reload();

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -359,10 +359,10 @@ export default class BalanceSheetOLPA extends Component {
     }
 
     async downloadAllData() {
-        let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?submission_id=${this.props.submissionID}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
+        let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=${this.props.outlook_pa_id}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
         console.log(url);
         let res = await fetch(
-            `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?submission_id=${this.props.submissionID === null ? "" : this.props.submissionID}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
+            `https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?outlook_pa_id=${this.props.outlook_pa_id === null ? "" : this.props.outlook_pa_id}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
         )
         res = await res.blob()
         this.setState({ loading: false })
@@ -370,7 +370,7 @@ export default class BalanceSheetOLPA extends Component {
             let url = window.URL.createObjectURL(res);
             let a = document.createElement('a');
             a.href = url;
-            a.download = 'Master Budget Balance Sheet.xlsx';
+            a.download = 'Outlook PA Balance Sheet.xlsx';
             a.click();
         }
     }