Commit 39a22450 authored by d.arizona's avatar d.arizona

update dikit

parent 894e70b5
...@@ -213,7 +213,7 @@ export default class BudgetTahunan extends Component { ...@@ -213,7 +213,7 @@ export default class BudgetTahunan extends Component {
} }
}) })
if (arrayBaru.length > 0) { if (companyData.length > 0) {
companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name)) companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
} }
......
...@@ -213,24 +213,21 @@ export default function MiniDrawer() { ...@@ -213,24 +213,21 @@ export default function MiniDrawer() {
path: '', path: '',
subItem: [ subItem: [
{ {
img: '',
label: 'Subco',
path: 'beranda',
}, {
img: 'beranda', img: 'beranda',
label: 'CAT Dashboard', label: 'Summary of Triputra Group',
path: 'dashboard-cat', path: 'beranda',
}, }, {
{
img: 'beranda', img: 'beranda',
label: 'Financial Dashboard', label: 'Financial Dashboard',
path: 'dashboard-financial', path: 'dashboard-financial',
}, }, {
{
img: 'beranda', img: 'beranda',
label: 'Summary of Triputra Group', label: 'CAT Dashboard',
path: 'beranda', path: 'dashboard-cat',
},
{
img: '',
label: 'Sub Holding',
path: 'beranda',
} }
], ],
collapse: false, collapse: false,
......
...@@ -110,7 +110,7 @@ export default class OutlookPA extends Component { ...@@ -110,7 +110,7 @@ export default class OutlookPA extends Component {
} }
}) })
if (arrayBaru.length > 0) { if (companyData.length > 0) {
companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name)) companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
} }
...@@ -245,6 +245,10 @@ export default class OutlookPA extends Component { ...@@ -245,6 +245,10 @@ export default class OutlookPA extends Component {
} }
}) })
if (companyData.length > 0) {
companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
let arrayBaru = [] let arrayBaru = []
this.state.userCompany.map((item, index) => { this.state.userCompany.map((item, index) => {
let indexID = companyData.findIndex((val) => val.company_id == item) let indexID = companyData.findIndex((val) => val.company_id == item)
...@@ -253,6 +257,13 @@ export default class OutlookPA extends Component { ...@@ -253,6 +257,13 @@ export default class OutlookPA extends Component {
} }
}) })
if (arrayBaru.length > 0) {
arrayBaru = arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
console.log(companyData)
console.log(arrayBaru)
let defaultProps = { let defaultProps = {
options: arrayBaru, options: arrayBaru,
getOptionLabel: (option) => titleCase(option.company_name), getOptionLabel: (option) => titleCase(option.company_name),
......
...@@ -112,6 +112,10 @@ export default class RollingOutlook extends Component { ...@@ -112,6 +112,10 @@ export default class RollingOutlook extends Component {
} }
}) })
if (companyData.length > 0) {
companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
let defaultProps = { let defaultProps = {
options: companyData, options: companyData,
getOptionLabel: (option) => titleCase(option.company_name), getOptionLabel: (option) => titleCase(option.company_name),
...@@ -242,6 +246,10 @@ export default class RollingOutlook extends Component { ...@@ -242,6 +246,10 @@ export default class RollingOutlook extends Component {
} }
}) })
if (companyData.length > 0) {
companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
let arrayBaru = [] let arrayBaru = []
this.state.userCompany.map((item, index) => { this.state.userCompany.map((item, index) => {
let indexID = companyData.findIndex((val) => val.company_id == item) let indexID = companyData.findIndex((val) => val.company_id == item)
...@@ -250,6 +258,10 @@ export default class RollingOutlook extends Component { ...@@ -250,6 +258,10 @@ export default class RollingOutlook extends Component {
} }
}) })
if (arrayBaru.length > 0) {
arrayBaru = arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name))
}
let defaultProps = { let defaultProps = {
options: arrayBaru, options: arrayBaru,
getOptionLabel: (option) => titleCase(option.company_name), getOptionLabel: (option) => titleCase(option.company_name),
......
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