Merge branch 'rifka' into 'master'

someone

See merge request !625

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -452,7 +452,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -462,10 +462,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -479,7 +479,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -489,10 +489,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -506,7 +506,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -516,10 +516,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -563,7 +563,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ visibleAM: true, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -573,10 +573,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -595,7 +595,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -605,10 +605,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }

src/container/BudgetTahunan/TaxPlanning.js

@@ -12,6 +12,7 @@ import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -116,6 +117,7 @@ export default class TaxPlanning extends Component {
             // console.log(response);
             let dataTable = []
             if (response.data) {
+                if (response.data.status == 'success') {
                     let res = response.data.data
                     const handlePushChild = (item) => {
                         let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
@@ -206,6 +208,16 @@ export default class TaxPlanning extends Component {
                     })
                     // console.log(dataTable)
                     this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                } else {
+                    this.setState({ loading: false, 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({ dataTable, loading: false, buttonError: true, editable: true })
             }
@@ -600,11 +612,18 @@ export default class TaxPlanning extends Component {
                     this.props.onClickClose()
                     this.props.getReport()
                 } else {
-                    alert(response.data.status)
+                    this.setState({ loading: false, 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);
+                        }
+                    })
+                    // alert(response.data.status)
                 }
             } else {
-                this.setState({ loading: false })
-                alert(response.problem)
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }

src/container/DocumentManagement/DocumentManagement.js

@@ -82,11 +82,9 @@ export default class DocumentManagement extends Component {
                         loadTable: true,
                         refresh: id === undefined ? '' : 'create'
                     })
-                } else {
-
                 }
             } else {
-
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/MonthlyReport/TaxPlanningMR.js

@@ -12,6 +12,7 @@ import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -70,7 +71,7 @@ export default class TaxPlanningMR extends Component {
             "revision": 0,
             "periode": 2021,
             "company_id": 2193390,
-            "submission_id": 3275722
+            "submission_id": 3425765
         }
         api.create().getLastestUpdateMB(payload).then(response => {
             if (response.data) {
@@ -90,12 +91,13 @@ export default class TaxPlanningMR extends Component {
             "revision": 0,
             "periode": 2021,
             "company_id": 2193390,
-            "submission_id": 3275722
+            "submission_id": 3425765
         }
         api.create().getDetailReportMB(payload).then(response => {
             // console.log(response);
             let dataTable = []
             if (response.data) {
+                if (response.data.status == 'success') {
                     let res = response.data.data
                     const handlePushChild = (item) => {
                         let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
@@ -159,6 +161,16 @@ export default class TaxPlanningMR extends Component {
                         }
                     })
                     this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                } else {
+                    this.setState({ loading: false, 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({ dataTable, loading: false, buttonError: true, editable: true })
             }
@@ -552,11 +564,18 @@ export default class TaxPlanningMR extends Component {
                     this.props.onClickClose()
                     this.props.getReport()
                 } else {
-                    alert(response.data.status)
+                    this.setState({ loading: false, 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);
+                        }
+                    })
+                    // alert(response.data.status)
                 }
             } else {
-                this.setState({ loading: false })
-                alert(response.problem)
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }