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
503df67f
Commit
503df67f
authored
Dec 22, 2022
by
ardiansyah
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ENV-DEV' into 'dev/ardi'
# Conflicts: # src/container/OutlookPA/CashFlowOLPA.js
parents
1a5f2651
59d5f61c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
CashFlowOLPA.js
src/container/OutlookPA/CashFlowOLPA.js
+12
-10
No files found.
src/container/OutlookPA/CashFlowOLPA.js
View file @
503df67f
...
...
@@ -173,7 +173,6 @@ export default class CashFlow extends Component {
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
||
item
.
type_report_id
==
7
?
{
value
:
item
.
cash_flow
.
october
,
formula
:
item
.
cash_flow
.
october_formula
}
:
item
.
cash_flow
.
october
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
||
item
.
type_report_id
==
7
?
{
value
:
item
.
cash_flow
.
november
,
formula
:
item
.
cash_flow
.
november_formula
}
:
item
.
cash_flow
.
november
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
||
item
.
type_report_id
==
7
?
{
value
:
item
.
cash_flow
.
december
,
formula
:
item
.
cash_flow
.
december_formula
}
:
item
.
cash_flow
.
december
,
item
.
cash_flow
.
current_total
,
item
.
order
,
item
.
condition_it_should_be
,
item
.
condition_if_wrong
,
...
...
@@ -207,7 +206,6 @@ export default class CashFlow extends Component {
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
||
item
.
type_report_id
==
7
?
{
value
:
item
.
cash_flow
.
october
,
formula
:
item
.
cash_flow
.
october_formula
}
:
item
.
cash_flow
.
october
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
||
item
.
type_report_id
==
7
?
{
value
:
item
.
cash_flow
.
november
,
formula
:
item
.
cash_flow
.
november_formula
}
:
item
.
cash_flow
.
november
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
||
item
.
type_report_id
==
7
?
{
value
:
item
.
cash_flow
.
december
,
formula
:
item
.
cash_flow
.
december_formula
}
:
item
.
cash_flow
.
december
,
item
.
cash_flow
.
current_total
,
item
.
order
,
item
.
condition_it_should_be
,
item
.
condition_if_wrong
,
...
...
@@ -1464,8 +1462,9 @@ export default class CashFlow extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
17
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
17
],
tableMeta
,
17
)).
toFixed
(
1
)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
14
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
14
],
tableMeta
,
14
)).
toFixed
(
1
)}
// value={Number(tableMeta.rowData[14].value).toFixed(1)}
// value={this.props.quarter == 'q3' ? Number(tableMeta.rowData[14].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[14], tableMeta, 14)).toFixed(1)}
/
>
<
/span
>
:
...
...
@@ -1477,8 +1476,9 @@ export default class CashFlow extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
17
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
17
],
tableMeta
,
17
)).
toFixed
(
1
)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
14
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
14
],
tableMeta
,
14
)).
toFixed
(
1
)}
// value={Number(tableMeta.rowData[14].value).toFixed(1)}
// value={this.props.quarter == 'q3' ? Number(tableMeta.rowData[14].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[14], tableMeta, 14)).toFixed(1)}
/
>
:
tableMeta
.
rowData
[
0
]
===
7
?
...
...
@@ -1497,8 +1497,9 @@ export default class CashFlow extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
17
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
17
],
tableMeta
,
17
)).
toFixed
(
1
)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
14
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
14
],
tableMeta
,
14
)).
toFixed
(
1
)}
// value={Number(tableMeta.rowData[14].value).toFixed(1)}
// value={this.props.quarter == 'q3' ? Number(tableMeta.rowData[14].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[14], tableMeta, 14)).toFixed(1)}
/>
:
<
LightTooltip
title
=
{
this
.
state
.
minValue
===
null
?
`Value Should be
${
tableMeta
.
rowData
[
23
]}
`
:
`Value Should be (
${
this
.
state
.
minValue
}
) up to (
${
this
.
state
.
maxValue
}
)`
}
arrow
>
<
NumberFormat
...
...
@@ -1515,8 +1516,9 @@ export default class CashFlow extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
17
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
17
],
tableMeta
,
17
)).
toFixed
(
1
)}
// value={Number(handleValueFormula(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)}
value
=
{
this
.
props
.
PLBSFAMSubmitted
?
Number
(
tableMeta
.
rowData
[
14
].
value
).
toFixed
(
1
)
:
Number
(
handleValueFormula
(
tableMeta
.
rowData
[
14
],
tableMeta
,
14
)).
toFixed
(
1
)}
// value={Number(tableMeta.rowData[14].value).toFixed(1)}
// value={this.props.quarter == 'q3' ? Number(tableMeta.rowData[14].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[14], tableMeta, 14)).toFixed(1)}
/
>
<
/LightTooltip
>
:
...
...
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