Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/api/index.js

@@ -224,6 +224,7 @@ const create = (type = "") => {
   const getLastestUpdateOI = (body) => api.post('transaction/operating_indicator/get_latest_update', body)
   const getLastPeriodeOI = (idCompany) => api.post(`transaction/master_budget/get_last_periode/${idCompany}`)
   const getReportHierarkiPL = (body) => api.post('transaction/db_report_detail/get_report_hierarki', body)
+  const getReportHierarkiFR = (body) => api.post('transaction/db_ratio/get_report_hierarki', body)
 
   //CASH FLOW
   const getDetailReportCF = (body) => api.post('/transaction/cash_flow/get_report_hierarki', body)
@@ -431,7 +432,8 @@ const create = (type = "") => {
     getLastPeriodOI,
     getDashboardUser,
     getDetailReportCF,
-    getReportHierarkiPL
+    getReportHierarkiPL,
+    getReportHierarkiFR
   }
 }
 

src/container/BudgetTahunan.js

@@ -95,6 +95,8 @@ export default class BudgetTahunan extends Component {
 
     checkApprover() {
         api.create().checkApprover().then(response => {
+          if (response.data) {
+             if (response.data.status === "success") {
                  // console.log(response);
                  if (response.data.data.is_approver === true) {
                      this.setState({ isApprover: true, checkApprover: true }, () =>
@@ -103,6 +105,19 @@ export default class BudgetTahunan extends Component {
                      this.setState({ isApprover: false, checkApprover: false }, () =>
                          this.getDetailUser())
                  }
+             } 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.problem, tipeAlert: 'error'})
+         }
         })
     }
 
@@ -382,7 +397,18 @@ export default class BudgetTahunan extends Component {
                     this.setState({ listRevision: defaultProps, revision: revisionData[0] }, () => {
                         this.getSubmission()
                     })
+                  } 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.problem, tipeAlert: 'error', listRevision: null, revision: null })
               }
         })
     }
@@ -423,10 +449,18 @@ export default class BudgetTahunan extends Component {
                         })
                     })
                   } else {
-                    this.setState({ submissionID: null, loading: false }, ()=> {
+                      this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', submissionID: null, loading: false }, () => {
                           document.body.style.overflow = 'unset';
+                          if (response.data.message.includes("Someone Logged In")) {
+                              setTimeout(() => {
+                                  localStorage.removeItem(Constant.TOKEN)
+                                  window.location.reload();
+                              }, 1000);
+                          }
                       })
                   }
+              } else {
+                  this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
               }
         })
     }

src/container/BudgetTahunan/BalanceSheet.js

@@ -8,8 +8,9 @@ import Images from '../../assets/Images';
 import ReactTooltip from 'react-tooltip';
 import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
-import { Alert } from '@material-ui/lab';
 import * as R from 'ramda'
+import MuiAlert from '@material-ui/lab/Alert';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -23,6 +24,9 @@ const LightTooltip = withStyles((theme) => ({
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable3());
 
+const Alert = withStyles({
+})((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
+
 const options = ct.customOptionsFixedColumn();
 const style = {
     position: "sticky",
@@ -50,7 +54,10 @@ export default class BalanceSheet extends Component {
             handleTekTekTek: 0,
             saveDraft: true,
             minValue: "0",
-            maxValue: "0"
+            maxValue: "0",
+            alert: false,
+            tipeAlert: '',
+            messageAlert: '',
         }
         this.fileHandler = this.fileHandler.bind(this);
     }
@@ -68,13 +75,28 @@ export default class BalanceSheet extends Component {
         }
 
         api.create().getAllSettingByType(body).then(response => {
-            // console.log(response);
+            console.log(response);
+            if (response.data) {
+                if (response.data.status === 'success') {
                   this.setState({
                       minValue: response.data.data[0] ? response.data.data[0].min_value : null,
                       maxValue: response.data.data[0] ? response.data.data[0].max_value : null,
                   }, () => {
                       this.getItemHierarki()
                   })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
+                        }
+                    })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false})
+            }
         })
     }
 
@@ -92,7 +114,18 @@ export default class BalanceSheet extends Component {
                     this.setState({
                         updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update
                     })
+                } else {
+                      this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                          if (response.data.message.includes("Someone Logged In")) {
+                              setTimeout(() => {
+                                  localStorage.removeItem(Constant.TOKEN)
+                                  window.location.reload();
+                              }, 1000);
+                          }
+                      })
                   }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -194,6 +227,10 @@ export default class BalanceSheet extends Component {
         }
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     backToMasterBudget(type) {
         let data = []
         this.state.dataTable.map(i => {
@@ -296,7 +333,6 @@ export default class BalanceSheet extends Component {
 
     checkUpload() {
         api.create().checkUploadMB(this.state.payload).then(response => {
-            // console.log(JSON.stringify(this.state.payload));
             console.log(response)
             if (response.data) {
                 if (response.data.status === 'success') {
@@ -341,7 +377,18 @@ export default class BalanceSheet extends Component {
                         })
                         // console.log(this.state.dataTable);
                     })
+                } else {
+                      this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                          if (response.data.message.includes("Someone Logged In")) {
+                              setTimeout(() => {
+                                  localStorage.removeItem(Constant.TOKEN)
+                                  window.location.reload();
+                              }, 1000);
                           }
+                      })
+                  }
+              } else {
+                  this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
               }
         })
     }
@@ -385,11 +432,17 @@ export default class BalanceSheet extends Component {
                     this.props.onClickClose()
                     this.props.getReport()
                 } else {
-                    alert(response.data.status)
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
+                        }
+                    })
                 }
             } else {
-                this.setState({ loading: false })
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -446,16 +499,27 @@ export default class BalanceSheet extends Component {
         }
         api.create().validateSubmitReport(payload).then((response) => {
             // console.log(response)
+            if (response.data) {
+                if (response.data.status === "success") {
                     if (response.data.data.result) {
                         this.setState({ loading: false, buttonError: false, editable: false, saveDraft: false })
                     } else {
                         this.setState({ loading: false, buttonError: true, editable: true, saveDraft: false })
                     }
+                } else {
+                      this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                          if (response.data.message.includes("Someone Logged In")) {
+                              setTimeout(() => {
+                                  localStorage.removeItem(Constant.TOKEN)
+                                  window.location.reload();
+                              }, 1000);
+                          }
                       })
                   }
-
-    closeAlert() {
-        this.setState({ alert: false })
+              } else {
+                  this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false})
+              }
+        })
     }
 
     render() {

src/container/BudgetTahunan/CashFlow.js

-import { createMuiTheme, FormControlLabel, MuiThemeProvider, Paper, TableCell, Tooltip, Typography, withStyles } from '@material-ui/core'
+import { createMuiTheme, FormControlLabel, MuiThemeProvider, Paper, Snackbar, TableCell, Tooltip, Typography, withStyles } from '@material-ui/core'
 import MUIDataTable from 'mui-datatables';
 import React, { Component } from 'react'
 import NumberFormat from 'react-number-format';
@@ -7,6 +7,8 @@ import api from '../../api';
 import Images from '../../assets/Images';
 import * as R from 'ramda'
 import { PropagateLoader } from 'react-spinners';
+import Constant from '../../library/Constant';
+import { Alert } from '@material-ui/lab';
 
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable3());
@@ -78,7 +80,10 @@ export default class CashFlow extends Component {
         // console.log(JSON.stringify(payload))
         api.create().getDetailReportCF(payload).then(response => {
             let dataTable = []
-            console.log(response)
+            // console.log(response)
+            if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
                         let res = response.data.data
                         const handlePushChild = (item) => {
                             dataTable.push([
@@ -156,6 +161,22 @@ export default class CashFlow extends Component {
                             }
                         })
                         this.setState({ dataTable, loading: false, dataReal: res, editable: true })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            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', loading: false})
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+            }
         })
     }
 
@@ -180,6 +201,10 @@ export default class CashFlow extends Component {
         }
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     render() {
         let dataTable2 = this.state.dataTable
         let loading = false
@@ -2049,6 +2074,11 @@ export default class CashFlow extends Component {
                 <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
                     <Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography>
                 </div>
+                <Snackbar open={this.state.alert} autoHideDuration={3000} onClose={() => this.closeAlert()}>
+                    <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
+                        {this.state.messageAlert}
+                    </Alert>
+                </Snackbar>
                 <div style={{ flex: 1, padding: 20, width: '100%' }}>
                     <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
                         <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -111,6 +111,8 @@ export default class CorporateAnnualTarget extends Component {
             let dataInternalBsn = []
             // // console.log(response)\
             if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
                         let res = response.data.data
                         const handlePushChild = (item) => {
                             let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
@@ -223,10 +225,23 @@ export default class CorporateAnnualTarget extends Component {
                             // console.log(dataCustomerPrs)
                         })
                     } else {
-                this.setState({ dataTable, loading: false, dataReal: [], editable: true, dataCustomerPrs, dataInternalBsn }, () => {
-                    // console.log(dataCustomerPrs)
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            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', loading: false })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+            }
+        
+                
         })
     }
 
@@ -361,6 +376,7 @@ export default class CorporateAnnualTarget extends Component {
             // console.log(JSON.stringify(this.state.payload));
             // console.log(response)
             if (response.data) {
+                if (response. ok) {
                     if (response.data.status === 'success') {
                         // this.setState({ visibleUpload: false, visibleCAT: false })
                         this.setState({ visibleUpload: false, visibleCAT: false })
@@ -434,7 +450,21 @@ export default class CorporateAnnualTarget extends Component {
                             })
                             // // // console.log(this.state.dataTable);
                         })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            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', loading: false })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -499,14 +529,25 @@ export default class CorporateAnnualTarget extends Component {
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
             // // console.log(response);
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status === "success") {
                         this.props.onClickClose()
                         this.props.getReport()
                     } else {
-                    alert(response.data.status)
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            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', loading: false })
                 }
             } else {
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -752,7 +793,6 @@ export default class CorporateAnnualTarget extends Component {
                                 }, 1000);
                             }
                         })
-                        // alert(response.data.message)
                     }
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })