Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Reminder Cuti

See merge request !1743

src/container/ProgressReport/ProgressReport.js

@@ -570,6 +570,10 @@ class ReportProgress extends Component {
                                     company={this.state.company}
                                     typeReport={String(this.state.reportType.name).toLocaleUpperCase()}
                                     year={this.state.periodeMB.value}
+                                    getMonitoringMB={this.getMonitoringMB.bind(this)}
+                                    getMonitoringMR={this.getMonitoringMR.bind(this)}
+                                    getMonitoringRO={this.getMonitoringRO.bind(this)}
+                                    getMonitoringOLPA={this.getMonitoringOLPA.bind(this)}
                                 />
                                 )}
                             </div>

src/container/ProgressReport/TableProgressReport.js

@@ -41,6 +41,7 @@ export default class TableProgressReport extends Component {
     }
 
     handleShowPopup(id, data) {
+        console.log(this.props);
         let item = this.props
         let bulan = item.month == 1 ? "Jan" : item.month == 2 ? "Feb" : item.month == 3 ? "Mar" : item.month == 4 ? "Apr" : item.month == 5 ? "May" : item.month == 6 ? "Jun" : item.month == 7 ? "Jul" : item.month == 8 ? "Aug" : item.month == 9 ? "Sep" : item.month == 10 ? "Oct" : item.month == 11 ? "Nov" : item.month == 12 ? "Dec" : null
         this.setState({ visiblePopup: true, idCompany: id, companyName: data[0], month: bulan })
@@ -58,17 +59,46 @@ export default class TableProgressReport extends Component {
             "year": data.year,
             "month": data.reportType === 1 ? data.month : null
         }
-        console.log(payload);
+        let payloadGetData = {
+            "year": data.year,
+            "month": data.month,
+            "quarter": data.quarter === "Q1" ? "q1" : data.quarter === "Q2" ? "q2" : data.quarter === "Q3" ? "q3" : null
+
+        }
+        console.log(payloadGetData);
         api.create().sendEmail(payload).then(response => {
             console.log(response);
             if (response.data) {
                 if (response.ok) {
                     this.setState({ loading: false })
                     if (response.data.status == 'success') {
-                        this.setState({ loading: false, visiblePopup: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
+                        if (data.reportType === 0) {
+                            this.props.getMonitoringMB(payloadGetData)
+                        } else if (data.reportType === 1) {
+                            this.props.getMonitoringMR(payloadGetData)
+                        } else if (data.reportType === 2) {
+                            this.props.getMonitoringRO(payloadGetData)
+                        } else if (data.reportType === 3) {
+                            this.props.getMonitoringOLPA(payloadGetData)
+                        }
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success', visiblePopup: false, loading: false })
+                        // this.setState({ visiblePopup: false, alert: true, messageAlert: response.data.message, tipeAlert: 'success' }, () => {
+                        //     setTimeout(() => {
+                        //         if (data.reportType === 0 ) {
+                        //             this.props.getMonitoringMB(payloadGetData)
+                        //         } else if (data.reportType === 1 ) {
+                        //             this.props.getMonitoringMR(payloadGetData)
+                        //         } else if (data.reportType === 2 ) {
+                        //             this.props.getMonitoringRO(payloadGetData)
+                        //         } else if (data.reportType === 3 ) {
+                        //             this.props.getMonitoringOLPA(payloadGetData)
+                        //         }
+                        //         this.setState({ loading: false })
+                        //     }, 1000)
+                        // })
                         // this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false}, () => {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
                             if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -78,7 +108,7 @@ export default class TableProgressReport extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false})
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })