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
7543379c
Commit
7543379c
authored
Mar 02, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GGMAC' into 'master'
test See merge request
!1238
parents
38f37085
cd1b4519
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
HomePage.js
src/container/HomePage.js
+1
-1
DashboardCAT.js
src/container/Laporan/DashboardCAT.js
+6
-1
No files found.
src/container/HomePage.js
View file @
7543379c
...
...
@@ -1031,7 +1031,7 @@ class HomePage extends Component {
</button>
</Link>
</div>
{item.is_overdue && (
{item.is_
submit === false && item.is_
overdue && (
<div style={{ backgroundColor: '
#
f65a4c
', paddingRight: 5, paddingLeft: 5, borderRadius: 5, alignSelf: '
center
' }}>
<Typography style={{ fontSize: 11, color: '
#
fff
' }}>Overdue</Typography>
</div>
...
...
src/container/Laporan/DashboardCAT.js
View file @
7543379c
...
...
@@ -31,15 +31,19 @@ export default class DashboardCAT extends Component {
loading
:
true
,
dataDashboard
:
[],
selectedKPI
:
[],
listKPI
:
[]
listKPI
:
[],
rawData
:
{}
}
}
componentDidMount
()
{
console
.
log
(
this
.
props
)
this
.
props
.
selectIndex
(
'CAT Dashboard'
)
let
dataStorageCAT
=
localStorage
.
getItem
(
Constant
.
DATACAT
)
console
.
log
(
dataStorageCAT
)
if
(
dataStorageCAT
!=
'datacat'
)
{
this
.
setState
({
selectedKPI
:
JSON
.
parse
(
dataStorageCAT
).
listKPI
})
console
.
log
(
dataStorageCAT
)
}
if
(
this
.
props
.
location
.
state
!==
undefined
)
{
this
.
setState
({
userType
:
this
.
props
.
location
.
state
.
userType
,
intent
:
'Home'
,
rawData
:
this
.
props
.
location
.
state
.
rawData
},
()
=>
{
...
...
@@ -103,6 +107,7 @@ export default class DashboardCAT extends Component {
if
(
response
.
data
.
status
===
'success'
)
{
let
data
=
response
.
data
.
data
let
comID
=
this
.
state
.
rawData
?
this
.
state
.
rawData
.
companyId
:
0
// console.log(comID)
let
companyData
=
data
.
map
((
item
)
=>
{
return
{
company_id
:
item
.
company_id
,
...
...
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