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

Deni dev(pc)

See merge request !460

src/container/BudgetTahunan.js

@@ -976,7 +976,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={{
@@ -1022,7 +1022,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/container/OutlookPA.js

@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import { Typography, Paper, TextField, MenuItem, Select, FormControlLabel, Snackbar, withStyles, createMuiTheme, MuiThemeProvider, Checkbox, Input } from '@material-ui/core';
 import MUIDataTable from 'mui-datatables';
 import Images from '../assets/Images';
-import BalanceSheet from './OutlookPA/BalanceSheet';
 import api from '../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import MuiAlert from '@material-ui/lab/Alert';
@@ -15,6 +14,7 @@ import { format } from 'date-fns';
 import Constant from '../library/Constant';
 import PropagateLoader from "react-spinners/PropagateLoader"
 import { DatePicker } from '@material-ui/pickers';
+import BalanceSheetOLPA from './OutlookPA/BalanceSheetOLPA';
 
 var ct = require("../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -1139,7 +1139,7 @@ export default class OutlookPA extends Component {
                 )}
 
                 {this.state.visibleBS && (
-                    <BalanceSheet
+                    <BalanceSheetOLPA
                         open={this.props.open}
                         report_id={this.state.report_id}
                         height={this.props.height}

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