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
7ff858c5
Commit
7ff858c5
authored
Dec 22, 2020
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'riri' into 'master'
tooltip button See merge request
!840
parents
fc31b29f
18f19d7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
78 additions
and
10 deletions
+78
-10
OperatingIndicatorMR.js
src/container/MonthlyReport/OperatingIndicatorMR.js
+51
-7
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+27
-3
No files found.
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @
7ff858c5
...
...
@@ -71,7 +71,6 @@ export default class OperatingIndicatorMR extends Component {
// this.getItemHierarki()
this
.
getSettingControl
()
this
.
getLatestUpdate
()
// console.log(this.props.permission.create);
}
getLatestUpdate
()
{
...
...
@@ -121,7 +120,7 @@ export default class OperatingIndicatorMR extends Component {
minValue
:
response
.
data
.
data
[
0
]
?
Number
(
response
.
data
.
data
[
0
].
min_value
)
:
-
5
,
maxValue
:
response
.
data
.
data
[
0
]
?
Number
(
response
.
data
.
data
[
0
].
max_value
)
:
5
,
},
()
=>
{
this
.
get
ItemHierarki
()
this
.
get
OperatingIDMonthly
()
})
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
,
loading
:
false
},
()
=>
{
...
...
@@ -139,10 +138,31 @@ export default class OperatingIndicatorMR extends Component {
})
}
getOperatingIDMonthly
()
{
let
payload
=
{
"company_id"
:
this
.
props
.
data
.
company
.
company_id
,
"periode"
:
this
.
props
.
data
.
periode
.
periode
,
"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
().
getOpetratingIndID
(
payload
).
then
(
response
=>
{
if
(
response
)
{
if
(
response
.
data
.
data
)
{
this
.
setState
({
operatingIndIDMonthly
:
response
.
data
.
data
.
operating_indicator_id
}
,
()
=>
{
this
.
getItemHierarki
()
})
}
else
{
this
.
setState
({
operatingIndIDMonthly
:
null
},
()
=>
{
this
.
getItemHierarki
()
})
}
}
})
}
getItemHierarki
()
{
this
.
setState
({
loading
:
true
})
let
payload
=
{
"operating_indicator_id"
:
this
.
props
.
data
.
operatingIndID
,
"operating_indicator_id"
:
this
.
state
.
operatingIndIDMonthly
,
"report_id"
:
this
.
props
.
data
.
report_id
,
"company_id"
:
this
.
props
.
data
.
company
.
company_id
,
"periode"
:
this
.
props
.
data
.
periode
,
...
...
@@ -1487,7 +1507,13 @@ export default class OperatingIndicatorMR extends Component {
})}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
{
this
.
state
.
editable
===
true
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
}
<
/div
>
<
/button
>
<
button
...
...
@@ -1507,7 +1533,13 @@ export default class OperatingIndicatorMR extends Component {
}}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
{
this
.
state
.
editable
===
true
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
}
<
/div
>
<
/button
>
<
/div>
}
...
...
@@ -1607,7 +1639,13 @@ export default class OperatingIndicatorMR extends Component {
})}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
{
this
.
state
.
editable
===
true
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
}
<
/div
>
<
/button
>
<
button
...
...
@@ -1630,7 +1668,13 @@ export default class OperatingIndicatorMR extends Component {
}}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
{
this
.
state
.
editable
===
true
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
}
<
/div
>
<
/button
>
<
/div>
}
...
...
src/container/MonthlyReport/ProfitLossMR.js
View file @
7ff858c5
...
...
@@ -1994,7 +1994,13 @@ export default class ProfitLossMR extends Component {
}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
{
this
.
state
.
saveDraft
===
true
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
}
<
/div
>
<
/button
>
<
button
...
...
@@ -2016,7 +2022,13 @@ export default class ProfitLossMR extends Component {
}}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
{
this
.
state
.
buttonError
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
}
<
/div
>
<
/button
>
<
/div
>
...
...
@@ -2112,7 +2124,13 @@ export default class ProfitLossMR extends Component {
}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
{
this
.
state
.
saveDraft
===
true
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
as
Draft
<
/Typography
>
}
<
/div
>
<
/button
>
<
button
...
...
@@ -2134,7 +2152,13 @@ export default class ProfitLossMR extends Component {
}}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
{
this
.
state
.
buttonError
?
<
LightTooltip
title
=
{
"Data Incomplete"
}
arrow
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
<
/LightTooltip
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
}
<
/div
>
<
/button
>
<
/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