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
114f58ab
Commit
114f58ab
authored
Mar 17, 2021
by
Riri Novita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apdet pl
parent
98d66391
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1345 additions
and
2041 deletions
+1345
-2041
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+80
-71
ProfitLossOLPA.js
src/container/OutlookPA/ProfitLossOLPA.js
+1211
-1925
ProfitLossRO.js
src/container/RollingOutlook/ProfitLossRO.js
+54
-45
No files found.
src/container/MonthlyReport/ProfitLossMR.js
View file @
114f58ab
...
...
@@ -123,7 +123,7 @@ export default class ProfitLossMR extends Component {
}
else
{
checkLastStatus
=
false
}
if
(
this
.
props
.
prevRevision
)
{
checkPrevRev
=
true
}
else
{
...
...
@@ -136,7 +136,7 @@ export default class ProfitLossMR extends Component {
checkStatus
=
false
}
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
}
handleGetFor
(
type
)
{
...
...
@@ -289,7 +289,7 @@ export default class ProfitLossMR extends Component {
item
.
formula
,
item
.
level
,
item
.
description
,
item
.
profit_loss
.
notes
==
null
||
item
.
profit_loss
.
notes
==
"null"
?
""
:
item
.
profit_loss
.
notes
,
item
.
profit_loss
.
notes
==
null
||
item
.
profit_loss
.
notes
==
"null"
?
""
:
item
.
profit_loss
.
notes
,
item
.
profit_loss
.
rolling_outlook
===
null
?
"0.0"
:
item
.
profit_loss
.
rolling_outlook
===
""
?
"0.0"
:
item
.
profit_loss
.
rolling_outlook
,
item
.
profit_loss
.
master_budget
===
null
?
"0.0"
:
item
.
profit_loss
.
master_budget
===
""
?
"0.0"
:
item
.
profit_loss
.
master_budget
,
item
.
profit_loss
.
rolling_budget
===
null
?
"0.0"
:
item
.
profit_loss
.
rolling_budget
===
""
?
"0.0"
:
item
.
profit_loss
.
rolling_budget
,
...
...
@@ -690,7 +690,7 @@ export default class ProfitLossMR extends Component {
if
(
type
===
"actual"
)
{
// console.log(val);
dataTable2
[
tableMeta
.
rowIndex
][
10
]
=
Number
(
val
).
toFixed
(
1
)
}
}
// else {
// let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2])
// if (indexParent > 0) {
...
...
@@ -936,7 +936,16 @@ export default class ProfitLossMR extends Component {
<
div
style
=
{{
textAlign
:
'right'
}}
>
<
div
style
=
{{
flex
:
1
}}
>
{
tableMeta
.
rowData
[
0
]
===
4
?
null
:
tableMeta
.
rowData
[
4
]
===
0
?
null
:
tableMeta
.
rowData
[
4
]
===
1
?
null
:
this
.
state
.
get_for
==
'view'
?
tableMeta
.
rowData
[
6
]
:
this
.
state
.
get_for
==
'view'
?
<
Input
disableUnderline
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'left'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
defaultValue
=
{
tableMeta
.
rowData
[
6
]}
/
>
:
<
FormControlLabel
style
=
{{
margin
:
0
}}
// value={tableMeta.rowData[6]}
...
...
@@ -1011,23 +1020,23 @@ export default class ProfitLossMR extends Component {
// />
// </div>
// :
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
val
}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
7
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
}
/
>
<
/div
>
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
val
}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
7
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
}
/
>
<
/div
>
}
<
/div
>
)
...
...
@@ -1082,23 +1091,23 @@ export default class ProfitLossMR extends Component {
decimalScale
=
{
1
}
/
>
:
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
tableMeta
.
rowData
[
8
]}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
8
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
}
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
tableMeta
.
rowData
[
8
]}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
8
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
<
/div
>
}
/
>
<
/div
>
}
<
/div
>
<
/div
>
...
...
@@ -1117,23 +1126,23 @@ export default class ProfitLossMR extends Component {
decimalScale
=
{
1
}
/
>
:
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
tableMeta
.
rowData
[
9
]}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
9
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
}
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
tableMeta
.
rowData
[
9
]}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
9
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
<
/div
>
}
/
>
<
/div
>
}
<
/div
>
<
/div
>
...
...
@@ -1185,7 +1194,7 @@ export default class ProfitLossMR extends Component {
disabled
=
{
true
}
decimalScale
=
{
1
}
value
=
{
Number
(
handleValue
(
value
,
tableMeta
)).
toFixed
(
1
)}
// value={Number(handleValue(tableMeta, 2)).toFixed(1)}
// value={Number(handleValue(tableMeta, 2)).toFixed(1)}
/
>
<
/span>
:
tableMeta
.
rowData
[
0
]
===
6
||
tableMeta
.
rowData
[
0
]
===
5
?
...
...
@@ -1317,23 +1326,23 @@ export default class ProfitLossMR extends Component {
decimalScale
=
{
1
}
/
>
:
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
val
}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
12
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
}
<
div
style
=
{{
flex
:
1
}}
>
<
FormControlLabel
style
=
{{
margin
:
0
}}
value
=
{
val
}
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
12
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
<
/div
>
}
/
>
<
/div
>
}
<
/div
>
)
...
...
src/container/OutlookPA/ProfitLossOLPA.js
View file @
114f58ab
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/container/RollingOutlook/ProfitLossRO.js
View file @
114f58ab
...
...
@@ -274,28 +274,28 @@ export default class ProfitLossROO extends Component {
res
.
map
((
item
,
index
)
=>
{
dataTable
.
push
([
item
.
type_report_id
,
item
.
id
,
item
.
parent
,
item
.
formula
,
item
.
level
,
item
.
description
,
item
.
profit_loss
.
notes
,
item
.
profit_loss
.
last_year_total
===
""
?
"0"
:
item
.
profit_loss
.
last_year_total
,
item
.
profit_loss
.
january
===
""
?
"0"
:
item
.
profit_loss
.
january
,
item
.
profit_loss
.
february
===
""
?
"0"
:
item
.
profit_loss
.
february
,
item
.
profit_loss
.
march
===
""
?
"0"
:
item
.
profit_loss
.
march
,
item
.
profit_loss
.
april
===
""
?
"0"
:
item
.
profit_loss
.
april
,
item
.
profit_loss
.
may
===
""
?
"0"
:
item
.
profit_loss
.
may
,
item
.
profit_loss
.
june
===
""
?
"0"
:
item
.
profit_loss
.
june
,
item
.
profit_loss
.
july
===
""
?
"0"
:
item
.
profit_loss
.
july
,
item
.
profit_loss
.
august
===
""
?
"0"
:
item
.
profit_loss
.
august
,
item
.
profit_loss
.
september
===
""
?
"0"
:
item
.
profit_loss
.
september
,
item
.
profit_loss
.
october
===
""
?
"0"
:
item
.
profit_loss
.
october
,
item
.
profit_loss
.
november
===
""
?
"0"
:
item
.
profit_loss
.
november
,
item
.
profit_loss
.
december
===
""
?
"0"
:
item
.
profit_loss
.
december
,
item
.
profit_loss
.
current_year_total
===
""
?
"0"
:
item
.
profit_loss
.
current_year_total
,
item
.
profit_loss
.
actual_formula
===
""
?
"0"
:
item
.
profit_loss
.
actual_formula
,
item
.
order
,
item
.
id
,
item
.
parent
,
item
.
formula
,
item
.
level
,
item
.
description
,
item
.
profit_loss
.
notes
,
item
.
profit_loss
.
last_year_total
===
""
?
"0"
:
item
.
profit_loss
.
last_year_total
,
item
.
profit_loss
.
january
===
""
?
"0"
:
item
.
profit_loss
.
january
,
item
.
profit_loss
.
february
===
""
?
"0"
:
item
.
profit_loss
.
february
,
item
.
profit_loss
.
march
===
""
?
"0"
:
item
.
profit_loss
.
march
,
item
.
profit_loss
.
april
===
""
?
"0"
:
item
.
profit_loss
.
april
,
item
.
profit_loss
.
may
===
""
?
"0"
:
item
.
profit_loss
.
may
,
item
.
profit_loss
.
june
===
""
?
"0"
:
item
.
profit_loss
.
june
,
item
.
profit_loss
.
july
===
""
?
"0"
:
item
.
profit_loss
.
july
,
item
.
profit_loss
.
august
===
""
?
"0"
:
item
.
profit_loss
.
august
,
item
.
profit_loss
.
september
===
""
?
"0"
:
item
.
profit_loss
.
september
,
item
.
profit_loss
.
october
===
""
?
"0"
:
item
.
profit_loss
.
october
,
item
.
profit_loss
.
november
===
""
?
"0"
:
item
.
profit_loss
.
november
,
item
.
profit_loss
.
december
===
""
?
"0"
:
item
.
profit_loss
.
december
,
item
.
profit_loss
.
current_year_total
===
""
?
"0"
:
item
.
profit_loss
.
current_year_total
,
item
.
profit_loss
.
actual_formula
===
""
?
"0"
:
item
.
profit_loss
.
actual_formula
,
item
.
order
,
])
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
.
length
>
0
)
{
...
...
@@ -629,7 +629,7 @@ export default class ProfitLossROO extends Component {
// if (response.data) {
// if (response.data.status === "success") {
// if (response.data.data.result && err === false) {
this
.
setState
({
loading
:
false
,
buttonError
:
false
,
editable
:
false
,
saveDraft
:
false
})
this
.
setState
({
loading
:
false
,
buttonError
:
false
,
editable
:
false
,
saveDraft
:
false
})
// } else {
// this.setState({ loading: false, buttonError: true, editable: true, saveDraft: false })
// }
...
...
@@ -856,7 +856,16 @@ export default class ProfitLossROO extends Component {
<
div
style
=
{{
textAlign
:
'right'
}}
>
<
div
style
=
{{
flex
:
1
}}
>
{
tableMeta
.
rowData
[
0
]
===
4
?
null
:
tableMeta
.
rowData
[
4
]
===
0
?
null
:
tableMeta
.
rowData
[
4
]
===
1
?
null
:
this
.
state
.
get_for
==
'view'
?
value
:
this
.
state
.
get_for
==
'view'
?
<
Input
disableUnderline
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'left'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
defaultValue
=
{
value
}
/
>
:
<
FormControlLabel
style
=
{{
margin
:
0
}}
// value={value}
...
...
@@ -2414,27 +2423,27 @@ export default class ProfitLossROO extends Component {
<
div
className
=
"col-2"
>
<
/div>
:
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
,
paddingRight
:
5
}}
>
{
this
.
state
.
get_for
==
'view'
&&
this
.
state
.
viewOnly
&&
<
button
className
=
"button"
type
=
"button"
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
'pointer'
,
borderColor
:
'transparent'
,
outline
:
'none'
,
marginRight
:
20
}}
onClick
=
{()
=>
{
this
.
setState
({
loading
:
true
,
refresh
:
true
},
()
=>
{
this
.
handleGetFor
(
'edit'
)
})
}}
>
<
div
style
=
{{
backgroundColor
:
'#fff'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
border
:
'solid 1px #354960'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#354960'
,
textAlign
:
'center'
}}
>
Edit
<
/Typography
>
<
/div
>
<
/button>
}
{
this
.
state
.
get_for
==
'view'
&&
this
.
state
.
viewOnly
&&
<
button
className
=
"button"
type
=
"button"
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
'pointer'
,
borderColor
:
'transparent'
,
outline
:
'none'
,
marginRight
:
20
}}
onClick
=
{()
=>
{
this
.
setState
({
loading
:
true
,
refresh
:
true
},
()
=>
{
this
.
handleGetFor
(
'edit'
)
})
}}
>
<
div
style
=
{{
backgroundColor
:
'#fff'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
border
:
'solid 1px #354960'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#354960'
,
textAlign
:
'center'
}}
>
Edit
<
/Typography
>
<
/div
>
<
/button>
}
{
this
.
state
.
get_for
==
'edit'
&&
<
button
className
=
"button"
type
=
"button"
...
...
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