Merge branch 'master' into 'didam'

# Conflicts:
#   src/api/index.js
bismillah

src/api/index.js

@@ -219,6 +219,21 @@ const create = (type = "") => {
   const getDashboard = (body) => api.get('transaction/get_dashboard')
   const historyApproval = (body) => api.post('transaction/master_budget/history_approval', body)
 
+  //OUTLOOK PA
+  const getOutlookPAID = (body) => api.post('transaction/outlook_pa/get_outlook_pa_id', body)
+  const getLastPeriodOLPA = (idCompany) => api.get(`/transaction/outlook_pa/get_last_periode/${idCompany}`)
+  const getCompanySubmittedOLPA = (body) => api.post('transaction/outlook_pa/get_company_submitted', body)
+  const getRevisionOLPA = (body) => api.post('transaction/outlook_pa/get_revision', body)
+  const historyApprovalOLPA = (body) => api.post('transaction/outlook_pa/history_approval', body)
+  const getSubmitOLPA = (body) => api.post('transaction/outlook_pa/get_latest_periode_submit', body)
+  const getOLPAAtt = (body) => api.post('transaction/outlook_pa/get_report_attachment', body)
+  const submitOLPA = (body) => api.post('transaction/outlook_pa/submit_outlook_pa', body)
+  const getLastestUpdateOLPA = (body) => api.post('transaction/outlook_pa/get_latest_update', body)
+  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')
+
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
 
@@ -375,7 +390,20 @@ const create = (type = "") => {
     getLastPeriod,
     getSubmitMasterBudget,
     createPeriodeRevision,
-    getLastestUpdateOI
+    getLastestUpdateOI,
+    getOutlookPAID,
+    getLastPeriodOLPA,
+    getCompanySubmittedOLPA,
+    getRevisionOLPA,
+    historyApprovalOLPA,
+    getSubmitOLPA,
+    getOLPAAtt,
+    submitOLPA,
+    getLastestUpdateOLPA,
+    createReportOLPA,
+    checkUploadOLPA,
+    uploadOLPA,
+    validateSubmitReportOLPA
   }
 }
 

src/container/BudgetTahunan.js

@@ -614,7 +614,7 @@ export default class BudgetTahunan 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 = 'Master Budget Attachment.xlsx';
             a.click();
         }
     }
@@ -984,7 +984,7 @@ export default class BudgetTahunan extends Component {
                                         <div style={{ width: '50%' }}>
                                             <Typography style={{ fontSize: '16px', color: '#4b4b4b', fontWeight: 'bold' }}>Attachment: </Typography>
                                         </div>
-                                        {!this.state.isApprover && (this.state.lastStatus == 'SUBMIT' && this.state.lastStatus == 'REVISION') && (
+                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' && this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
                                                 <button
                                                     style={{
@@ -1030,7 +1030,7 @@ export default class BudgetTahunan extends Component {
                                                 : null
                                             }
                                         </div>
-                                        {!this.state.isApprover && (this.state.lastStatus == 'SUBMIT' && this.state.lastStatus == 'REVISION') && (
+                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' && this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
                                                 {this.state.listAttachment.length > 0 ?
                                                     this.state.listAttachment.map((item) => {

src/router/homeRoutes.js

@@ -12,10 +12,10 @@ import ReportItems from '../container/MasterData/ReportItems'
 import DashboardCAT from '../container/Laporan/DashboardCAT'
 import BudgetTahunan from '../container/BudgetTahunan';
 import RollingOutlook from '../container/RollingOutlook';
-import OutlookPA from '../container/OutlookPA';
 import OperatingIndicator from '../container/OprIndicator/OperatingIndicator'
 import MonthlyReport from '../container/MonthlyReport';
 import DocumentManagement from '../container/DocumentManagement/DocumentManagement';
+import OutlookPA from '../container/OutlookPA';
 
 const routes = [
   {
@@ -38,14 +38,14 @@ const routes = [
     path: "/home/master-budget",
     main: BudgetTahunan
   },
-  {
-    path: "/home/outlook-performance",
-    main: OutlookPA
-  },
   {
     path: "/home/rolling-outlook",
     main: RollingOutlook
   },
+  {
+    path: "/home/outlook-performance",
+    main: OutlookPA
+  },
   {
     path: "/home/profile",
     main: Profile