Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
39a22450
Commit
39a22450
authored
Feb 02, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update dikit
parent
894e70b5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
15 deletions
+35
-15
BudgetTahunan.js
src/container/BudgetTahunan.js
+1
-1
Home.js
src/container/Home.js
+10
-13
OutlookPA.js
src/container/OutlookPA.js
+12
-1
RollingOutlook.js
src/container/RollingOutlook.js
+12
-0
No files found.
src/container/BudgetTahunan.js
View file @
39a22450
...
@@ -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
))
}
}
...
...
src/container/Home.js
View file @
39a22450
...
@@ -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
,
...
...
src/container/OutlookPA.js
View file @
39a22450
...
@@ -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
),
...
...
src/container/RollingOutlook.js
View file @
39a22450
...
@@ -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
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment