Commit 87e2fd49 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'GGMAC' into 'master'

sort comp dasfin

See merge request !1225
parents 94a2e0ae 0ce1f436
...@@ -132,9 +132,10 @@ export default class DashboardFinancial extends React.Component { ...@@ -132,9 +132,10 @@ export default class DashboardFinancial extends React.Component {
}) })
let defaultProps = { let defaultProps = {
options: arrayBaru, options: arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name)),
getOptionLabel: (option) => titleCase(option.company_name), getOptionLabel: (option) => titleCase(option.company_name),
}; };
let index = arrayBaru.findIndex((val) => val.company_id == comID) let index = arrayBaru.findIndex((val) => val.company_id == comID)
this.setState({ listCompany: defaultProps, company: arrayBaru.length < 1 ? companyData[0] : (index == -1 ? arrayBaru[0] : arrayBaru[index]) }, () => { this.setState({ listCompany: defaultProps, company: arrayBaru.length < 1 ? companyData[0] : (index == -1 ? arrayBaru[0] : arrayBaru[index]) }, () => {
this.getAllBusiness() this.getAllBusiness()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment