Merge branch 'deni-' into 'master'

kpis See merge request !1229

Merge branch 'deni-' into 'master'
kpis See merge request !1229
bd70bae7 · Deni Rinaldi · 31a33676 · d3ffc8a4 · bd70bae7 · bd70bae7
Commit bd70bae7 authored Feb 28, 2021 by Deni Rinaldi
Expand all Show whitespace changes
Inline Side-by-side

Showing with 193 additions and 52 deletions

DashboardCAT.js src/container/Laporan/DashboardCAT.js +3 -3

KPIs.js src/container/Laporan/KPIs.js +190 -49

No files found.
--- a/src/container/Laporan/DashboardCAT.js
+++ b/src/container/Laporan/DashboardCAT.js
@@ -106,7 +106,7 @@ export default class DashboardCAT extends Component {
                    })

                    let defaultProps = {
-                        options: arrayBaru,
+                        options: arrayBaru.sort((a, b) => a.company_name.localeCompare(b.company_name)),
                        getOptionLabel: (option) => titleCase(option.company_name),
                    };
                    let index = arrayBaru.findIndex((val) => val.company_id == comID)

--- a/src/container/Laporan/KPIs.js
+++ b/src/container/Laporan/KPIs.js