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
4b0d7bea
Commit
4b0d7bea
authored
Dec 18, 2020
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'riri' into 'master'
issue OIBS See merge request
!820
parents
5f1c12ec
1b7ee229
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
23 deletions
+25
-23
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+1
-1
OperatingIndicatorMR.js
src/container/MonthlyReport/OperatingIndicatorMR.js
+24
-22
No files found.
src/container/MonthlyReport/BalanceSheetMR.js
View file @
4b0d7bea
...
...
@@ -1939,7 +1939,7 @@ export default class BalanceSheetMR extends Component {
type
=
"button"
onClick
=
{()
=>
this
.
setState
({
loading
:
true
},
()
=>
{
setTimeout
(()
=>
{
this
.
props
.
onClickClose
()
this
.
getItemHierarki
()
},
100
);
})}
style
=
{{
...
...
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @
4b0d7bea
...
...
@@ -83,11 +83,12 @@ export default class OperatingIndicatorMR extends Component {
"months"
:
this
.
props
.
data
.
report_id
===
22
?
1
:
23
?
2
:
24
?
3
:
25
?
4
:
27
?
5
:
28
?
6
:
29
?
7
:
31
?
8
:
32
?
9
:
33
?
10
:
35
?
11
:
36
?
12
:
null
}
api
.
create
().
getLastestUpdateMROI
(
payload
).
then
(
response
=>
{
//
console.log(response.data)
console
.
log
(
response
.
data
)
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
updateBy
:
response
.
data
.
data
.
latest_update
===
null
?
'-'
:
response
.
data
.
data
.
latest_update
updateBy
:
response
.
data
.
data
.
latest_update
===
null
?
'-'
:
response
.
data
.
data
.
latest_update
,
notesUpdate
:
response
.
data
.
data
.
notes_update
===
null
?
'-'
:
response
.
data
.
data
.
notes_update
})
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
,
loading
:
false
},
()
=>
{
...
...
@@ -165,7 +166,7 @@ export default class OperatingIndicatorMR extends Component {
item
.
description
,
item
.
uom
===
""
?
null
:
item
.
uom
,
item
.
monthly_report
.
rolling_outlook
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
,
item
.
monthly_report
.
master_budget
===
null
?
"
10.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"1
0.0"
:
item
.
monthly_report
.
master_budget
,
item
.
monthly_report
.
master_budget
===
null
?
"
0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"
0.0"
:
item
.
monthly_report
.
master_budget
,
item
.
monthly_report
.
rolling_budget
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
rolling_budget
,
item
.
monthly_report
.
actual
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
actual
,
item
.
monthly_report
.
amount_act_vs_mb
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
amount_act_vs_mb
,
...
...
@@ -195,7 +196,7 @@ export default class OperatingIndicatorMR extends Component {
item
.
description
,
item
.
uom
===
""
?
null
:
item
.
uom
,
item
.
monthly_report
.
rolling_outlook
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
,
item
.
monthly_report
.
master_budget
===
null
?
"
10.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"1
0.0"
:
item
.
monthly_report
.
master_budget
,
item
.
monthly_report
.
master_budget
===
null
?
"
0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"
0.0"
:
item
.
monthly_report
.
master_budget
,
item
.
monthly_report
.
rolling_budget
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
rolling_budget
,
item
.
monthly_report
.
actual
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
actual
,
item
.
monthly_report
.
amount_act_vs_mb
===
null
?
"0.0"
:
item
.
monthly_report
.
rolling_outlook
===
""
?
"0.0"
:
item
.
monthly_report
.
amount_act_vs_mb
,
...
...
@@ -1356,15 +1357,15 @@ export default class OperatingIndicatorMR extends Component {
this
.
props
.
data
.
report_id
===
22
?
'Jan'
:
this
.
props
.
data
.
report_id
===
23
?
'Feb'
:
this
.
props
.
data
.
report_id
===
24
?
'Mar'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Apr'
:
this
.
props
.
data
.
report_id
===
2
3
?
'May'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Jun'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Jul'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Aug'
:
this
.
props
.
data
.
report_id
===
23
?
'Sep'
:
this
.
props
.
data
.
report_id
===
23
?
'Oct'
:
this
.
props
.
data
.
report_id
===
23
?
'Nov'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Dec'
:
""
}
{
this
.
props
.
data
.
periode
}
this
.
props
.
data
.
report_id
===
2
5
?
'Apr'
:
this
.
props
.
data
.
report_id
===
2
6
?
'May'
:
this
.
props
.
data
.
report_id
===
2
7
?
'Jun'
:
this
.
props
.
data
.
report_id
===
2
8
?
'Jul'
:
this
.
props
.
data
.
report_id
===
2
9
?
'Aug'
:
this
.
props
.
data
.
report_id
===
30
?
'Sep'
:
this
.
props
.
data
.
report_id
===
31
?
'Oct'
:
this
.
props
.
data
.
report_id
===
32
?
'Nov'
:
this
.
props
.
data
.
report_id
===
3
3
?
'Dec'
:
""
}
{
this
.
props
.
data
.
periode
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
in
IDR
mn
<
/Typography
>
<
/div
>
...
...
@@ -1427,6 +1428,7 @@ export default class OperatingIndicatorMR extends Component {
<
/MuiThemeProvider
>
<
/div
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
,
marginTop
:
20
}}
>
Last
Updated
by
:
{
this
.
state
.
updateBy
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
,
marginTop
:
10
}}
>
Notes
:
{
this
.
state
.
notesUpdate
}
<
/Typography
>
<
/div
>
<
div
className
=
"grid grid-2x"
>
<
div
className
=
"col-1"
>
...
...
@@ -1522,15 +1524,15 @@ export default class OperatingIndicatorMR extends Component {
this
.
props
.
data
.
report_id
===
22
?
'Jan'
:
this
.
props
.
data
.
report_id
===
23
?
'Feb'
:
this
.
props
.
data
.
report_id
===
24
?
'Mar'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Apr'
:
this
.
props
.
data
.
report_id
===
2
3
?
'May'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Jun'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Jul'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Aug'
:
this
.
props
.
data
.
report_id
===
23
?
'Sep'
:
this
.
props
.
data
.
report_id
===
23
?
'Oct'
:
this
.
props
.
data
.
report_id
===
23
?
'Nov'
:
this
.
props
.
data
.
report_id
===
2
3
?
'Dec'
:
""
}
{
this
.
props
.
data
.
periode
}
this
.
props
.
data
.
report_id
===
2
5
?
'Apr'
:
this
.
props
.
data
.
report_id
===
2
6
?
'May'
:
this
.
props
.
data
.
report_id
===
2
7
?
'Jun'
:
this
.
props
.
data
.
report_id
===
2
8
?
'Jul'
:
this
.
props
.
data
.
report_id
===
2
9
?
'Aug'
:
this
.
props
.
data
.
report_id
===
30
?
'Sep'
:
this
.
props
.
data
.
report_id
===
31
?
'Oct'
:
this
.
props
.
data
.
report_id
===
32
?
'Nov'
:
this
.
props
.
data
.
report_id
===
3
3
?
'Dec'
:
""
}
{
this
.
props
.
data
.
periode
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
in
IDR
mn
<
/Typography
>
<
/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