Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/api/index.js

@@ -215,9 +215,25 @@ const create = (type = "") => {
   const createOpetaingInd = (body) => api.post('transaction/operating_indicator/create_submission_report', body)
   const checkUploadOperatingInd = (body) => api.post('transaction/operating_indicator/check_import', body)
   const uploadOperatingInd = (body) => api.post('transaction/operating_indicator/import_operating_indicator', body)
+  const getLastestUpdateOI = (body) => api.post('transaction/operating_indicator/get_latest_update', body)
   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}`)
 
@@ -373,7 +389,21 @@ const create = (type = "") => {
     getCompanySubmitted,
     getLastPeriod,
     getSubmitMasterBudget,
-    createPeriodeRevision
+    createPeriodeRevision,
+    getLastestUpdateOI,
+    getOutlookPAID,
+    getLastPeriodOLPA,
+    getCompanySubmittedOLPA,
+    getRevisionOLPA,
+    historyApprovalOLPA,
+    getSubmitOLPA,
+    getOLPAAtt,
+    submitOLPA,
+    getLastestUpdateOLPA,
+    createReportOLPA,
+    checkUploadOLPA,
+    uploadOLPA,
+    validateSubmitReportOLPA
   }
 }
 

src/container/BudgetTahunan.js

@@ -68,9 +68,12 @@ export default class BudgetTahunan extends Component {
             maxDateRevision: new Date(),
             btnApprove: false
         }
+        this.myRef = React.createRef()
         this.fileHandler = this.fileHandler.bind(this);
     }
 
+    scrollToMyRef = () => window.scrollTo(0, this.myRef.current.offsetTop)
+
     componentDidMount() {
         this.setState({ loading: true })
         this.props.selectIndex('Master Budget & CAT')
@@ -422,6 +425,7 @@ export default class BudgetTahunan extends Component {
     }
 
     approvalSubmission(type) {
+        this.scrollToMyRef()
         this.setState({ loading: true })
         let body = {
             "approval_id": this.props.location.state == undefined ? this.state.approverID : this.state.rawData.approval_id,
@@ -610,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();
         }
     }
@@ -671,6 +675,10 @@ export default class BudgetTahunan extends Component {
     }
 
     render() {
+        const handleMaxDate = () => {
+            let handleDate = Number(moment(this.state.maxDateRevision).format('YYYYMMDD')) - Number(moment(this.state.minDateRevision).format('YYYYMMDD'))
+            return handleDate < 0? moment(this.state.minDateRevision).format('YYYY/MM/DD') : moment(this.state.maxDateRevision).format('YYYY/MM/DD')
+        }
         const columns = ["#", "Report Type",
             {
                 name: "Revision",
@@ -892,7 +900,7 @@ export default class BudgetTahunan extends Component {
             </div>
         );
         return (
-            <div style={{ flex: 1, backgroundColor: '#f8f8f8' }}>
+            <div style={{ flex: 1, backgroundColor: '#f8f8f8' }} ref={this.myRef}>
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
                         {this.state.messageAlert}
@@ -976,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 !== 'SUBMITTED' && this.state.lastStatus !== 'APPROVED') && (
+                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' && this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
                                                 <button
                                                     style={{
@@ -1022,7 +1030,7 @@ export default class BudgetTahunan extends Component {
                                                 : null
                                             }
                                         </div>
-                                        {!this.state.isApprover && (this.state.lastStatus !== 'SUBMITTED' && this.state.lastStatus !== 'APPROVED') && (
+                                        {!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) => {
@@ -1360,7 +1368,7 @@ export default class BudgetTahunan extends Component {
                                                 id="startDate"
                                                 label="Valid From"
                                                 format="dd-MM-yyyy"
-                                                onChange={(e) => this.setState({minDateRevision: moment(e).format('YYYY/MM/DD')})}
+                                                onChange={(e) => this.setState({minDateRevision: moment(e).format('YYYY/MM/DD')}, () => this.setState({maxDateRevision: handleMaxDate()}))}
                                                 value={moment(this.state.minDateRevision).format('YYYY/MM/DD')}
                                                 KeyboardButtonProps={{
                                                     'aria-label': 'change date',

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -264,10 +264,11 @@ export default class CorporateAnnualTarget extends Component {
                             nilaiTotal = i[6] == 'SUM'? total : i[6] == 'AVG'? total/12 : lastValz
                         }
                         console.log(nilaiTotal)
+                        // console.log(i[2] === undefined ? "" : String(Number(i[2]*100)).length > 3? String(Number(i[2]*100).toFixed(0) + '%') : String(Number(i[2]*100)) + '%')
                         payload.push({
                             item_report_id: i[0] === undefined ? "" : reg.test(String(i[0])) === false ? "" : String(i[0]).trim(),
                             item_report: i[1] === undefined ? "" : String(i[1]).trim(),
-                            weight: i[2] === undefined ? "" : String(Number(i[2]*100) +'%'),
+                            weight: i[2] === undefined ? "" : String(Number(i[2]*100)).length > 3? String(Number(i[2]*100).toFixed(0) + '%') : String(Number(i[2]*100)) + '%',
                             uom: i[3] === undefined ? "" : String(i[3]).trim(),
                             kpi_type: i[4] === undefined ? "" : String(i[4]).trim(),
                             max_ach: i[5] === undefined ? "" : String(i[5]).toLocaleLowerCase() !== 'unlimited' ? String(Number(i[5]*100) + '%') : String(i[5]).trim(),

src/container/MonthlyReport.js

@@ -5,7 +5,6 @@ import Images from '../assets/Images';
 import api from '../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import { titleCase } from '../library/Utils';
-import ProfitLoss from './BudgetTahunan/ProfitLoss';
 import TaxPlanning from './BudgetTahunan/TaxPlanning';
 import FixedAssetsMovement from './BudgetTahunan/FixedAssetsMovement';
 import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
@@ -13,6 +12,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
 import UploadFile from "../library/Upload";
 import { format } from 'date-fns';
 import BalanceSheetMR from './MonthlyReport/BalanceSheetMR';
+import ProfitLossMR from './MonthlyReport/ProfitLossMR';
 
 export default class MonthlyReport extends Component {
     constructor(props) {
@@ -162,6 +162,7 @@ export default class MonthlyReport extends Component {
     }
 
     clickDetail(item, id, revision, status) {
+        console.log(item)
         this.setState({
             report_id: id,
             revisionTable: revision,
@@ -176,7 +177,7 @@ export default class MonthlyReport extends Component {
                     visibleFAM: false,
                     visibleTP: false,
                 })
-            } else if (item === 'Profit & Loss') {
+            } else if (item === 'Profit Loss') {
                 this.setState({
                     visibleMonthlyReport: false,
                     visibleBS: false,
@@ -550,10 +551,18 @@ export default class MonthlyReport extends Component {
                     />
                 )}
                 {this.state.visiblePL && (
-                    <ProfitLoss
+                    <ProfitLossMR
+                        open={this.props.open}
                         report_id={this.state.report_id}
+                        height={this.props.height}
+                        width={this.props.width}
                         company={this.state.company}
-                        onClickClose={() => this.setState({ visiblePL: false, visibleMonthlyReport: true })}
+                        revision={this.state.revisionTable}
+                        periode={this.state.periode.periode}
+                        submissionID={this.state.submissionID}
+                        // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
+                        onClickClose={() => this.setState({ visiblePL: false, visibleBudgetTahunan: true })}
+                        // getReport={this.getCompanyActive.bind(this)}
                     />
 
                 )}

src/container/OprIndicator/OperatingIndicatorDetail.js

@@ -50,9 +50,29 @@ export default class BalanceSheet extends Component {
         this.fileHandler = this.fileHandler.bind(this);
     }
 
+    getLatestUpdate() {
+        let payload = {
+            "operating_indicator_id": this.props.data.operatingIndID,
+            "report_id": this.props.data.report_id,
+            "company_id": this.props.data.company.company_id,
+            "periode": this.props.data.periode,
+        }
+        api.create().getLastestUpdateOI(payload).then(response => {
+            console.log(response.data)
+            if (response.data) {
+                if (response.data.status === "success") {
+                    this.setState({
+                        updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update
+                    })
+                }
+            }
+        })
+    }
+
     componentDidMount() {
         // this.getItemHierarki()
         this.getDataDetail()
+        this.getLatestUpdate()
         console.log(this.props);
     }
 
@@ -1261,6 +1281,7 @@ export default class BalanceSheet extends Component {
                                         />
                                     </MuiThemeProvider>
                                 </div>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
                             </div>
                             <div className="grid grid-2x">
                                 <div className="col-1">

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