Merge branch 'faisal' into 'master'

faisal!

See merge request !1515

package-lock.json

@@ -4223,9 +4223,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001179",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz",
-      "integrity": "sha512-blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA=="
+      "version": "1.0.30001237",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz",
+      "integrity": "sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw=="
     },
     "capture-exit": {
       "version": "2.0.0",

src/container/Progress/ProgressReport.js

@@ -47,6 +47,8 @@ class ReportProgress extends Component {
     componentDidMount() {
         this.getMonth()
         this.getReportType()
+        // console.log(this.state.listCategory);
+        // console.log(this.state.category);
     }
 
     getReportType() {
@@ -54,31 +56,32 @@ class ReportProgress extends Component {
             {
                 name: 'Master Budget',
                 value: 0
-            },{
+            }, {
                 name: 'Monthly Report',
                 value: 1
-            },{
+            }, {
                 name: 'Operating Indicator',
                 value: 2
-            },{
+            }, {
                 name: 'Rolling Outlook',
                 value: 3
             },
         ]
 
-        let arrayReportTypeFinal = this.state.category.value.includes('status')? arrayReportType : arrayReportType.filter((val) => val.value != 2)
+        let arrayReportTypeFinal = this.state.category.value.includes('status') ? arrayReportType : arrayReportType.filter((val) => val.value != 2)
         let defaultProps = {
             options: arrayReportTypeFinal,
             getOptionLabel: (option) => option.name,
         };
-        this.setState({listReportType: defaultProps, reportType: arrayReportTypeFinal[0]}, () => {
+        this.setState({ listReportType: defaultProps, reportType: arrayReportTypeFinal[0] }, () => {
             console.log(this.state.listReportType)
+            console.log(this.state.reportType)
         })
     }
 
 
     getMonth() {
-        this.setState({loading: true})
+        this.setState({ loading: true })
         api.create().getMonthTransaction().then(response => {
             let dateNow = new Date()
             dateNow.setMonth(dateNow.getMonth() - 1);
@@ -158,11 +161,18 @@ class ReportProgress extends Component {
 
     render() {
 
-        const dataTable = [
+        const dataTableMB = [
             ['Tax Planning', '2', 'ABA: Anugerah Buminusantara Abadi', '2021-05-03'],
-            ['CAT', '1', 'ABA: Anugerah Buminusantara Abadi', '2021-05-03' ],
+            ['CAT', '1', 'ABA: Anugerah Buminusantara Abadi', '2021-05-03'],
             ['Profit Loss', '0', 'ABA: Anugerah Buminusantara Abadi', '2021-05-03']
         ]
+
+        const dataTableMBStatus = [
+            ['ABA: Anugerah Buminusantara Abadi', '2021', 'approved', '2', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved'],
+            ['ABA: Anugerah Buminusantara Abadi', '2021', 'approved', '1', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved'],
+            ['ABA: Anugerah Buminusantara Abadi', '2021', 'approved', '0', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved', 'Sudah Approved']
+        ]
+
         const loadingComponent = (
             <div style={{ position: 'fixed', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
                 <PropagateLoader
@@ -181,7 +191,7 @@ class ReportProgress extends Component {
                         <Typography style={{ fontSize: '16px', color: 'white' }}>Report Status & Approval Progress Monitoring</Typography>
                     </div>
                     <div style={{ padding: 20, width: '100%' }}>
-                        <Paper style={{ paddingTop: 10, paddingBottom: 50}}>
+                        <Paper style={{ paddingTop: 10, paddingBottom: 50 }}>
                             <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
                                 <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Report Status & Approval Progress</Typography>
                             </div>
@@ -193,7 +203,7 @@ class ReportProgress extends Component {
                                         onChange={(event, newInputValue) => this.setState({ category: newInputValue, loading: true }, () => {
                                             // this.getListUserSubcoRO()
                                             this.getReportType()
-                                            this.setState({loading: false})
+                                            this.setState({ loading: false })
                                         })}
                                         disableClearable
                                         style={{ minWidth: 210, marginRight: 20 }}
@@ -205,7 +215,7 @@ class ReportProgress extends Component {
                                         id="report-type"
                                         onChange={(event, newInputValue) => this.setState({ reportType: newInputValue, loading: true }, () => {
                                             // this.getListUserSubcoRO()
-                                            this.setState({loading: false})
+                                            this.setState({ loading: false })
                                         })}
                                         disableClearable
                                         style={{ minWidth: 210, marginRight: 20 }}
@@ -221,7 +231,7 @@ class ReportProgress extends Component {
                                         id="periode"
                                         onChange={(event, newInputValue) => this.setState({ periodeMB: newInputValue, loading: true }, () => {
                                             // this.getListUserSubcoRO()
-                                            this.setState({loading: false})
+                                            this.setState({ loading: false })
                                         })}
                                         disableClearable
                                         style={{ minWidth: 210, marginRight: 20 }}
@@ -233,7 +243,7 @@ class ReportProgress extends Component {
                                         id="month"
                                         onChange={(event, newInputValue) => this.setState({ month: newInputValue, loading: true }, () => {
                                             // this.getListUserSubcoRO()
-                                            this.setState({loading: false})
+                                            this.setState({ loading: false })
                                         })}
                                         disableClearable
                                         style={{ minWidth: 210, marginRight: 20 }}
@@ -245,7 +255,7 @@ class ReportProgress extends Component {
                                         id="quarter"
                                         onChange={(event, newInputValue) => this.setState({ quarter: newInputValue, loading: true }, () => {
                                             // this.getListUserSubcoRO()
-                                            this.setState({loading: false})
+                                            this.setState({ loading: false })
                                         })}
                                         disableClearable
                                         style={{ minWidth: 210, marginRight: 20 }}
@@ -288,8 +298,9 @@ class ReportProgress extends Component {
                                     height={this.props.height}
                                     open={this.props.open}
                                     // month={this.state.month.month_value}
-                                        type={this.state.report ? this.state.report.value : 1}
-                                        dataTable={dataTable}
+                                    category={this.state.category ? this.state.category.value : 1}
+                                    reportType={this.state.reportType ? this.state.reportType.value : 0}
+                                    dataTable={this.state.category ? dataTableMBStatus : dataTableMB}
                                     // dataTable={this.state.dataTable}
                                     periode={this.state.periode ? this.state.periode.periode : null}
                                     quarter={this.state.quarter.name}