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
21cfc6bc
Commit
21cfc6bc
authored
Oct 05, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'riri' into 'master'
loading report item See merge request
!446
parents
bcff32c3
1ed47489
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
ReportItems.js
src/container/MasterData/ReportItems.js
+1
-0
VisualReportItems.js
...container/MasterData/formReportItems/VisualReportItems.js
+3
-1
OperatingIndicator.js
src/container/OprIndicator/OperatingIndicator.js
+14
-4
No files found.
src/container/MasterData/ReportItems.js
View file @
21cfc6bc
...
...
@@ -1170,6 +1170,7 @@ export default class ReportItems extends Component {
buttonEdit
=
{
this
.
state
.
buttonEdit
}
onClickClose
=
{()
=>
this
.
setState
({
visualisasi
:
false
,
itemReport
:
true
},
()
=>
this
.
getData
())}
height
=
{
this
.
props
.
height
}
handleLoading
=
{()
=>
this
.
setState
({
loading
:
true
})}
/
>
:
<
div
>
...
...
src/container/MasterData/formReportItems/VisualReportItems.js
View file @
21cfc6bc
...
...
@@ -334,7 +334,9 @@ export default class VisualReportItems extends Component {
<
div
onClick
=
{()
=>
this
.
props
.
onClickClose
()}
style
=
{{
width
:
102
,
height
:
30
,
border
:
'solid 1px #354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
,
cursor
:
"pointer"
}}
>
<
span
style
=
{{
color
:
'#354960'
,
fontSize
:
11
}}
>
Cancel
<
/span
>
<
/div
>
<
button
onClick
=
{()
=>
this
.
handleSave
()}
>
<
button
onClick
=
{()
=>
{
this
.
props
.
handleLoading
()
this
.
handleSave
()}}
>
<
div
style
=
{{
width
:
102
,
height
:
30
,
marginLeft
:
25
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
,
cursor
:
"pointer"
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
Save
<
/span
>
<
/div
>
...
...
src/container/OprIndicator/OperatingIndicator.js
View file @
21cfc6bc
...
...
@@ -315,10 +315,20 @@ export default class OperatingIndicator extends Component {
return
(
<
div
style
=
{{
display
:
'flex'
}}
>
{
val
===
"submitted"
||
val
===
"approved"
?
<
img
src
=
{
Images
.
ceklis
}
style
=
{{
width
:
31
,
height
:
24
}}
/>
:
val
===
"revision"
?
<
span
>
Revisi
<
/span>
:
null
<
span
>
COMPLETED
<
/span>
:
val
===
"draft"
?
<
span
>
DRAFT
<
/span>
:
val
===
"revision"
?
<
span
>
REVISION
<
/span>
:
val
===
"approval_proccess"
?
<
span
>
APPROVAL
PROCCESS
<
/span>
:
val
===
"approval_review"
?
<
span
>
APPROVAL
REVIEW
<
/span>
:
val
===
"not-yet"
?
<
span
>
OPEN
<
/span>
:
val
===
"CLOSED"
?
<
span
>
CLOSED
<
/span>
:
<
img
src
=
{
Images
.
cross
}
style
=
{{
width
:
31
,
height
:
24
}}
/
>
}
<
/div
>
);
...
...
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