Merge branch 'riri' into 'master'

company operating indicator & budget tahunan

See merge request !378

src/container/BudgetTahunan.js

@@ -54,7 +54,7 @@ export default class BudgetTahunan extends Component {
     }
 
     componentDidMount() {
-        this.getCompanyActive()
+        this.getDetailUser()
     }
 
     getReportAttachment() {
@@ -103,6 +103,21 @@ export default class BudgetTahunan extends Component {
         })
     }
 
+    getDetailUser() {
+        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({ userCompany: response.data.data.company}, () => {
+                            this.getCompanyActive()
+                        }) 
+                    }
+                }
+            } 
+        })
+    }
+
     getCompanyActive() {
         api.create().getPerusahaanActive().then((response) => {
             if (response.data) {
@@ -114,11 +129,21 @@ export default class BudgetTahunan extends Component {
                             company_name: item.company_name,
                         }
                     })
+                    
+                    let arrayBaru = []
+                    this.state.userCompany.map((item,index) => {
+                        let indexID = companyData.findIndex((val) => val.company_id == item)
+                        if (indexID !== -1) {
+                            arrayBaru.push(companyData[indexID])
+                        }
+                    })
+    
                     let defaultProps = {
-                        options: companyData,
+                        options: arrayBaru,
                         getOptionLabel: (option) => titleCase(option.company_name),
                     };
-                    this.setState({ listCompany: defaultProps, company: companyData[0] }, () => {
+    
+                    this.setState({ listCompany: defaultProps, company: arrayBaru[0] }, () => {
                         this.getPeriode()
                     })
                 } else {
@@ -134,7 +159,6 @@ export default class BudgetTahunan extends Component {
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', listCompany: null, company: null })
             }
-
         })
     }
 

src/container/OprIndicator/OperatingIndicator.js

@@ -9,6 +9,7 @@ import { titleCase } from '../../library/Utils';
 import { ExcelRenderer } from 'react-excel-renderer';
 import UploadFile from "../../library/Upload";
 import { format } from 'date-fns';
+import Constant from '../../library/Constant';
 
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -35,7 +36,7 @@ export default class OperatingIndicator extends Component {
     }
 
     componentDidMount() {
-        this.getCompanyActive()
+        this.getDetailUser()
     }
 
     getReportAttachment() {
@@ -82,8 +83,24 @@ export default class OperatingIndicator extends Component {
         })
     }
 
+    getDetailUser() {
+        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({ userCompany: response.data.data.company}, () => {
+                            this.getCompanyActive()
+                        }) 
+                    }
+                }
+            } 
+        })
+    }
+
     getCompanyActive() {
         api.create().getPerusahaanActive().then((response) => {
+            if (response.data) {
                 if (response.data.status === 'success') {
                     let data = response.data.data
                     let companyData = data.map((item) => {
@@ -92,15 +109,35 @@ export default class OperatingIndicator extends Component {
                             company_name: item.company_name,
                         }
                     })
+                    
+                    let arrayBaru = []
+                    this.state.userCompany.map((item,index) => {
+                        let indexID = companyData.findIndex((val) => val.company_id == item)
+                        if (indexID !== -1) {
+                            arrayBaru.push(companyData[indexID])
+                        }
+                    })
+    
                     let defaultProps = {
-                    options: companyData,
+                        options: arrayBaru,
                         getOptionLabel: (option) => titleCase(option.company_name),
                     };
-                this.setState({ listCompany: defaultProps, company: companyData[0] }, () => {
+    
+                    this.setState({ listCompany: defaultProps, company: arrayBaru[0] }, () => {
                         this.getPeriode()
                     })
                 } else {
-                alert(response.data.message)
+                    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', listCompany: null, company: null })
             }
         })
     }
@@ -378,7 +415,13 @@ export default class OperatingIndicator extends Component {
                                             debug
                                             disableClearable
                                             style={{ width: 250 }}
-                                            renderInput={(params) => <TextField {...params} label="Company" margin="normal" style={{ marginTop: 7 }} />}
+                                            renderInput={(params) => 
+                                                <TextField 
+                                                    {...params} 
+                                                    label="Company" 
+                                                    margin="normal" 
+                                                    style={{ marginTop: 7 }} 
+                                                />}
                                             value={this.state.company}
                                         />
                                     </div>