apdet

src/container/HomePage.js

@@ -8,6 +8,7 @@ import api from '../api';
 import { Link } from 'react-router-dom';
 import { PropagateLoader } from 'react-spinners';
 import { titleCase } from '../library/Utils';
+import { format } from 'date-fns';
 
 var ct = require("../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -216,7 +217,7 @@ class HomePage extends Component {
                     return (
                         <div style={{ display: 'flex' }}>
                             <Link to={{
-                                pathname: this.state.isApproverMB ? `/home/master-budget/` : `/home/monthly-report/`,
+                                pathname: String(tableMeta.rowData[3]).toLocaleLowerCase().includes("master") ? `/home/master-budget/` : `/home/monthly-report/`,
                                 state: {
                                     userType: 'approver',
                                     rawData: this.state.rawData[tableMeta.rowIndex]
@@ -297,8 +298,7 @@ class HomePage extends Component {
                 />
             </div>
         );
-
-        let bulan = new Date().toLocaleString('default', { month: 'long'})
+        let bulan = format(new Date(), 'MMM')
         let tahun = new Date().getFullYear()
         return (
             <div style={{ flex: 1, backgroundColor: '#f8f8f8', minHeight: this.props.height }}>
@@ -520,7 +520,7 @@ class HomePage extends Component {
                             {/* : this.state.isApproverMRList === true || this.state.isApprover === false ? */}
                             <div style={{ flex: 1, padding: 20, width: '100%' }}>
                                 <Paper style={{ width: 450, padding: 20, borderRadius: 10 }}>
-                                    <Typography style={{ fontWeight: 'bold', textDecorationLine: 'underline' }}>{`Monthly Report ${this.state.valueSubmitMR}/${this.state.listSubcoMR.length} - ${bulan} ${tahun}`}</Typography>
+                                    <Typography style={{ fontWeight: 'bold', textDecorationLine: 'underline' }}>{`Monthly Report - ${bulan} ${tahun} ${this.state.valueSubmitMR}/${this.state.listSubcoMR.length}`}</Typography>
                                     {this.state.listSubcoMR.map((item, index) => {
                                         return (
                                             <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: 10, paddingLeft: 10 }}>

src/container/MonthlyReport.js

@@ -108,10 +108,21 @@ export default class MonthlyReport extends Component {
     }
 
     componentDidMount() {
-        this.getPermission()
+        // this.getPermission()
         this.setState({ loading: true })
+        this.props.selectIndex('Monthly Report')
+        if (this.props.location.state !== undefined) {
+            // console.log(this.props);
+            this.setState({ userType: this.props.location.state.userType, intent: 'Home', lastPeriod: this.props.location.state.rawData.periode, rawData: this.props.location.state.rawData }, () => {
+                this.getPermission()
+            })
+        } else {
+            this.getPermission()
+        }
+        // console.log(this.props)
         // this.getCompanyActive()
         // this.getCompanySubmitted()
+        // console.log(a)
     }
 
     getChecApprover() {