Merge branch 'env/ridwan' into 'ENV-DEV-CR-CAFRM'

fixed file download

See merge request !1616

src/container/ReportCarfm/RepotrCafrm.js

@@ -193,10 +193,10 @@ class RepotrCafrm extends Component {
     }
 
     async downloadData() {
-        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monitoring/export_cafrm_report?periode=${this.state.curYear}&months=${this.state.curMonth}`
+        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monitoring/export_cafrm_report?periode=${this.state.curYear}&months=${this.state.curMonth}&status=${this.state.curStatus}`
         console.log(url);
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monitoring/export_cafrm_report?periode=${this.state.curYear}&months=${this.state.curMonth}`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monitoring/export_cafrm_report?periode=${this.state.curYear}&months=${this.state.curMonth}&status=${this.state.curStatus}`
         )
         res = await res.blob()
         this.setState({ loading: false })
@@ -204,7 +204,7 @@ class RepotrCafrm extends Component {
             let url = window.URL.createObjectURL(res);
             let a = document.createElement('a');
             a.href = url;
-            a.download = `Progress Report CARFM ${this.state.curYear}-${this.state.curMonth}.xlsx`;
+            a.download = `Progress Report CARFM ${this.state.curYear}-${this.state.curMonth}-${this.state.defaultStatus.name}.xlsx`;
             a.click();
         }
     }