Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1410

src/api/index.js

@@ -363,6 +363,8 @@ const create = (type = "") => {
   const createCFOLPA = (body) => api.post ('transaction/cash_flow/outlook_pa/create_outlook_report', body)
   const getHierarkiDBPLOLPA = (body) => api.post('transaction/db_profit_loss/outlook_pa/get_report_hierarki', body)
   const createDBPLOLPA = (body) => api.post('transaction/db_profit_loss/outlook_pa/create_outlook_report', body)
+  const getHierarkiDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/get_report_hierarki', body)
+  const createDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/create_rolling_outlook', body)
 
   // Monthly
   const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body)
@@ -796,7 +798,9 @@ const create = (type = "") => {
     getHierarkiCFOLPA,
     createCFOLPA,
     getHierarkiDBPLOLPA,
-    createDBPLOLPA
+    createDBPLOLPA,
+    getHierarkiDBPLRO,
+    createDBPLRO
   }
 }
 

src/container/HomePage.js

@@ -71,11 +71,25 @@ class HomePage extends Component {
         let userId = localStorage.getItem(Constant.USER)
         api.create().getDetailUser(userId).then((response) => {
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status === 'success') {
-                    this.setState({ userData: response.data.data }, () => {
-                        // console.log(this.state.userData)
+                        this.setState({ userData: response.data.data })
+                        // console.log(response.data.data)
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
+                                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' })
             }
         })
         // api.create().checkApprover().then(response => {

src/container/Laporan/DashboardCAT.js

@@ -82,8 +82,24 @@ export default class DashboardCAT extends Component {
                             this.getCompanyActive()
                         })
                     }
+                    else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
+                                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' })
+            }
+            //     }
+            // }
         })
     }
 

src/container/Laporan/DashboardFinancial.js

@@ -104,7 +104,21 @@ export default class DashboardFinancial extends React.Component {
                             this.getCompanyActive()
                         })
                     }
+                    else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
+                                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' })
             }
         })
     }
@@ -132,7 +146,7 @@ export default class DashboardFinancial extends React.Component {
                     })
 
                     let defaultProps = {
-                        options: arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name)),
+                        options: arrayBaru.sort((a, b) => a.company_name.localeCompare(b.company_name)),
                         getOptionLabel: (option) => titleCase(option.company_name),
                     };
 

src/container/OutlookPA.js

@@ -821,7 +821,7 @@ export default class OutlookPA extends Component {
                     "revision": Number(this.state.lastRevision),
                     "periode": this.state.periode.periode,
                     "company_id": this.state.company.company_id,
-                    "submission_id": this.state.PLID,
+                    "outlook_pa_id": this.state.PLID,
                 }
                 api.create().getHierarkiDBPLOLPA(payload).then(response => {
                     // console.log(response);
@@ -1282,7 +1282,6 @@ export default class OutlookPA extends Component {
             "status": "submitted",
             "profit_loss_id": this.state.PLID,
             "profit_loss_olpa": this.state.dbPL,
-            "months": 0,
         }
         console.log(this.state.dbPL)
         // console.log(JSON.stringify(payload))

src/container/RollingOutlook/ProfitLossRO.js

@@ -405,7 +405,11 @@ export default class ProfitLossROO extends Component {
             console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
+                    if (type == 'submitted') {
+                        this.props.refresh('PL')
+                    } else {
                         this.props.refresh()
+                    }
                     this.props.onClickClose()
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false, handleTekTekTek: 0 }, () => {
@@ -573,7 +577,11 @@ export default class ProfitLossROO extends Component {
                 if (response.ok) {
                     if (response.data.status === "success") {
                         this.props.onClickClose()
+                        if (type == 'submitted') {
+                            this.props.refresh('PL')
+                        } else {
                             this.props.refresh()
+                        }
                         // this.props.onClickClose()
                         // this.props.getReport()
                     } else {