Merge branch 'faisal' into 'master'

editMasterDataCat

See merge request !1212

src/api/index.js

@@ -189,6 +189,7 @@ const create = (type = "") => {
   const getAllMasterDataCat = () => api.get('item_report_company/get_all_item_report_company')
   const getParentItemReport = (body) => api.post('item_report/get_parent_item_report_default', body)
   const saveMasterDataCat = (body) => api.post('item_report_company/create_item_report_company', body)
+  // const getDetailMasterDataCat = (id) => api.get(`item_report_company/create_item_report_company/${id}`)
   const deleteMasterDataCat = (idCompany, years) => api.post(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
 
   //Transaction
@@ -693,6 +694,7 @@ const create = (type = "") => {
     getAllMasterDataCat,
     getParentItemReport,
     saveMasterDataCat,
+    // getDetailMasterDataCat,
     deleteMasterDataCat
   }
 }

src/container/MasterData/MasterDataCAT/MasterDataCAT.js

@@ -781,32 +781,32 @@ export default class MasterDataCAT extends Component {
         }
     }
 
-    updateReportItems = (payload) => {
-        this.setState({ edit: false })
-        api.create().updateReportItems(payload).then(response => {
-            if (response.data) {
-                if (response.ok) {
-                    if (response.data.status == 'success') {
-                        this.getData()
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
-                    } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
-                            if (response.data.message.includes("Someone Logged In")) {
-                                setTimeout(() => {
-                                    localStorage.removeItem(Constant.TOKEN)
-                                    window.location.reload();
-                                }, 1000);
-                            }
-                        })
-                    }
-                } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
-                }
-            } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
-            }
-        })
-    }
+    // updateReportItems = (payload) => {
+    //     this.setState({ edit: false })
+    //     api.create().updateReportItems(payload).then(response => {
+    //         if (response.data) {
+    //             if (response.ok) {
+    //                 if (response.data.status == 'success') {
+    //                     this.getData()
+    //                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
+    //                 } else {
+    //                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+    //                         if (response.data.message.includes("Someone Logged In")) {
+    //                             setTimeout(() => {
+    //                                 localStorage.removeItem(Constant.TOKEN)
+    //                                 window.location.reload();
+    //                             }, 1000);
+    //                         }
+    //                     })
+    //                 }
+    //             } else {
+    //                 this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+    //             }
+    //         } else {
+    //             this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+    //         }
+    //     })
+    // }
 
     uploadReportItems() {
         api.create().uploadReportItems(this.state.payload).then(response => {
@@ -1175,7 +1175,7 @@ export default class MasterDataCAT extends Component {
                         onClickClose={() => this.setState({ edit: false })}
                         data={this.state.rowData}
                         refresh={this.getData.bind(this)}
-                        updateReportItems={this.updateReportItems.bind(this)}
+                        updateReportItems={this.createReportItems.bind(this)}
                     />
                 )}
                 {this.state.popupError && (