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
3b603e2b
Commit
3b603e2b
authored
Jan 05, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cashflow summary yahuud
parent
0c731889
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
160 additions
and
107 deletions
+160
-107
SubHolding.js
src/container/Reports/SubHolding.js
+14
-1
TableSubHolding.js
src/container/Reports/TableSubHolding.js
+146
-106
No files found.
src/container/Reports/SubHolding.js
View file @
3b603e2b
...
@@ -1942,7 +1942,7 @@ export default class SubHolding extends Component {
...
@@ -1942,7 +1942,7 @@ export default class SubHolding extends Component {
if
(
indexIDzz
===
-
1
)
{
if
(
indexIDzz
===
-
1
)
{
let
mtd_actual
=
item
.
cash_flow
.
mtd_actual
==
''
?
0
:
Number
(
item
.
cash_flow
.
mtd_actual
)
let
mtd_actual
=
item
.
cash_flow
.
mtd_actual
==
''
?
0
:
Number
(
item
.
cash_flow
.
mtd_actual
)
let
mtd
=
item
.
cash_flow
.
mtd
==
''
?
0
:
Number
(
item
.
cash_flow
.
mtd
)
let
mtd
=
item
.
cash_flow
.
mtd
==
''
?
0
:
Number
(
item
.
cash_flow
.
mtd
)
console
.
log
(
mtd
)
//
console.log(mtd)
// let persenMtd = Number(mtd_actual / mtd)
// let persenMtd = Number(mtd_actual / mtd)
let
persenMtd
=
0
let
persenMtd
=
0
if
(
mtd
<
0
)
{
if
(
mtd
<
0
)
{
...
@@ -1990,6 +1990,7 @@ export default class SubHolding extends Component {
...
@@ -1990,6 +1990,7 @@ export default class SubHolding extends Component {
let
fy_actual
=
item
.
cash_flow
.
fy_actual
==
''
?
0
:
Number
(
item
.
cash_flow
.
fy_actual
)
let
fy_actual
=
item
.
cash_flow
.
fy_actual
==
''
?
0
:
Number
(
item
.
cash_flow
.
fy_actual
)
let
fy
=
item
.
cash_flow
.
fy
==
''
?
0
:
Number
(
item
.
cash_flow
.
fy
)
let
fy
=
item
.
cash_flow
.
fy
==
''
?
0
:
Number
(
item
.
cash_flow
.
fy
)
// let persenFy = Number(fy_actual / fy)
// let persenFy = Number(fy_actual / fy)
console
.
log
(
fy_actual
);
let
persenFy
=
0
let
persenFy
=
0
if
(
fy
<
0
)
{
if
(
fy
<
0
)
{
if
(
fy_actual
>=
fy
)
{
if
(
fy_actual
>=
fy
)
{
...
@@ -2205,6 +2206,7 @@ export default class SubHolding extends Component {
...
@@ -2205,6 +2206,7 @@ export default class SubHolding extends Component {
item
.
cash_flow
.
olpa_october
,
item
.
cash_flow
.
olpa_october
,
item
.
cash_flow
.
olpa_november
,
item
.
cash_flow
.
olpa_november
,
item
.
cash_flow
.
olpa_december
,
item
.
cash_flow
.
olpa_december
,
item
.
cash_flow
.
olpa_total_current_year
,
])
])
}
}
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
!==
null
)
{
...
@@ -2255,6 +2257,7 @@ export default class SubHolding extends Component {
...
@@ -2255,6 +2257,7 @@ export default class SubHolding extends Component {
item
.
cash_flow
.
olpa_october
,
item
.
cash_flow
.
olpa_october
,
item
.
cash_flow
.
olpa_november
,
item
.
cash_flow
.
olpa_november
,
item
.
cash_flow
.
olpa_december
,
item
.
cash_flow
.
olpa_december
,
item
.
cash_flow
.
olpa_total_current_year
,
])
])
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
.
length
>
0
)
{
if
(
item
.
children
.
length
>
0
)
{
...
@@ -3369,6 +3372,7 @@ export default class SubHolding extends Component {
...
@@ -3369,6 +3372,7 @@ export default class SubHolding extends Component {
items
.
cash_flow
.
october
,
items
.
cash_flow
.
october
,
items
.
cash_flow
.
november
,
items
.
cash_flow
.
november
,
items
.
cash_flow
.
december
,
items
.
cash_flow
.
december
,
items
.
cash_flow
.
total_current_year
,
items
.
cash_flow
.
q1_january
,
items
.
cash_flow
.
q1_january
,
items
.
cash_flow
.
q1_february
,
items
.
cash_flow
.
q1_february
,
items
.
cash_flow
.
q1_march
,
items
.
cash_flow
.
q1_march
,
...
@@ -3381,6 +3385,7 @@ export default class SubHolding extends Component {
...
@@ -3381,6 +3385,7 @@ export default class SubHolding extends Component {
items
.
cash_flow
.
q1_october
,
items
.
cash_flow
.
q1_october
,
items
.
cash_flow
.
q1_november
,
items
.
cash_flow
.
q1_november
,
items
.
cash_flow
.
q1_december
,
items
.
cash_flow
.
q1_december
,
items
.
cash_flow
.
q1_total_current_year
,
items
.
cash_flow
.
q2_january
,
items
.
cash_flow
.
q2_january
,
items
.
cash_flow
.
q2_february
,
items
.
cash_flow
.
q2_february
,
items
.
cash_flow
.
q2_march
,
items
.
cash_flow
.
q2_march
,
...
@@ -3393,6 +3398,7 @@ export default class SubHolding extends Component {
...
@@ -3393,6 +3398,7 @@ export default class SubHolding extends Component {
items
.
cash_flow
.
q2_october
,
items
.
cash_flow
.
q2_october
,
items
.
cash_flow
.
q2_november
,
items
.
cash_flow
.
q2_november
,
items
.
cash_flow
.
q2_december
,
items
.
cash_flow
.
q2_december
,
items
.
cash_flow
.
q2_total_current_year
,
items
.
cash_flow
.
q3_january
,
items
.
cash_flow
.
q3_january
,
items
.
cash_flow
.
q3_february
,
items
.
cash_flow
.
q3_february
,
items
.
cash_flow
.
q3_march
,
items
.
cash_flow
.
q3_march
,
...
@@ -3405,6 +3411,7 @@ export default class SubHolding extends Component {
...
@@ -3405,6 +3411,7 @@ export default class SubHolding extends Component {
items
.
cash_flow
.
q3_october
,
items
.
cash_flow
.
q3_october
,
items
.
cash_flow
.
q3_november
,
items
.
cash_flow
.
q3_november
,
items
.
cash_flow
.
q3_december
,
items
.
cash_flow
.
q3_december
,
items
.
cash_flow
.
q3_total_current_year
,
items
.
cash_flow
.
history_current_year
,
items
.
cash_flow
.
history_current_year
,
items
.
cash_flow
.
history_last_year
,
items
.
cash_flow
.
history_last_year
,
items
.
cash_flow
.
history_last_two_year
,
items
.
cash_flow
.
history_last_two_year
,
...
@@ -3439,6 +3446,7 @@ export default class SubHolding extends Component {
...
@@ -3439,6 +3446,7 @@ export default class SubHolding extends Component {
item
.
cash_flow
.
october
,
item
.
cash_flow
.
october
,
item
.
cash_flow
.
november
,
item
.
cash_flow
.
november
,
item
.
cash_flow
.
december
,
item
.
cash_flow
.
december
,
item
.
cash_flow
.
total_current_year
,
item
.
cash_flow
.
q1_january
,
item
.
cash_flow
.
q1_january
,
item
.
cash_flow
.
q1_february
,
item
.
cash_flow
.
q1_february
,
item
.
cash_flow
.
q1_march
,
item
.
cash_flow
.
q1_march
,
...
@@ -3451,6 +3459,7 @@ export default class SubHolding extends Component {
...
@@ -3451,6 +3459,7 @@ export default class SubHolding extends Component {
item
.
cash_flow
.
q1_october
,
item
.
cash_flow
.
q1_october
,
item
.
cash_flow
.
q1_november
,
item
.
cash_flow
.
q1_november
,
item
.
cash_flow
.
q1_december
,
item
.
cash_flow
.
q1_december
,
item
.
cash_flow
.
q1_total_current_year
,
item
.
cash_flow
.
q2_january
,
item
.
cash_flow
.
q2_january
,
item
.
cash_flow
.
q2_february
,
item
.
cash_flow
.
q2_february
,
item
.
cash_flow
.
q2_march
,
item
.
cash_flow
.
q2_march
,
...
@@ -3463,6 +3472,7 @@ export default class SubHolding extends Component {
...
@@ -3463,6 +3472,7 @@ export default class SubHolding extends Component {
item
.
cash_flow
.
q2_october
,
item
.
cash_flow
.
q2_october
,
item
.
cash_flow
.
q2_november
,
item
.
cash_flow
.
q2_november
,
item
.
cash_flow
.
q2_december
,
item
.
cash_flow
.
q2_december
,
item
.
cash_flow
.
q2_total_current_year
,
item
.
cash_flow
.
q3_january
,
item
.
cash_flow
.
q3_january
,
item
.
cash_flow
.
q3_february
,
item
.
cash_flow
.
q3_february
,
item
.
cash_flow
.
q3_march
,
item
.
cash_flow
.
q3_march
,
...
@@ -3475,6 +3485,7 @@ export default class SubHolding extends Component {
...
@@ -3475,6 +3485,7 @@ export default class SubHolding extends Component {
item
.
cash_flow
.
q3_october
,
item
.
cash_flow
.
q3_october
,
item
.
cash_flow
.
q3_november
,
item
.
cash_flow
.
q3_november
,
item
.
cash_flow
.
q3_december
,
item
.
cash_flow
.
q3_december
,
item
.
cash_flow
.
q3_total_current_year
,
item
.
cash_flow
.
history_current_year
,
item
.
cash_flow
.
history_current_year
,
item
.
cash_flow
.
history_last_year
,
item
.
cash_flow
.
history_last_year
,
item
.
cash_flow
.
history_last_two_year
,
item
.
cash_flow
.
history_last_two_year
,
...
@@ -3542,6 +3553,7 @@ export default class SubHolding extends Component {
...
@@ -3542,6 +3553,7 @@ export default class SubHolding extends Component {
items
.
cash_flow
.
october
,
items
.
cash_flow
.
october
,
items
.
cash_flow
.
november
,
items
.
cash_flow
.
november
,
items
.
cash_flow
.
december
,
items
.
cash_flow
.
december
,
items
.
cash_flow
.
total_current_year
,
...
dbSumaCF
[
indexIDSumaChild
]
...
dbSumaCF
[
indexIDSumaChild
]
])
])
}
}
...
@@ -3567,6 +3579,7 @@ export default class SubHolding extends Component {
...
@@ -3567,6 +3579,7 @@ export default class SubHolding extends Component {
item
.
cash_flow
.
october
,
item
.
cash_flow
.
october
,
item
.
cash_flow
.
november
,
item
.
cash_flow
.
november
,
item
.
cash_flow
.
december
,
item
.
cash_flow
.
december
,
item
.
cash_flow
.
total_current_year
,
...
dbSumaCF
[
indexIDSuma
]
...
dbSumaCF
[
indexIDSuma
]
])
])
...
...
src/container/Reports/TableSubHolding.js
View file @
3b603e2b
This diff is collapsed.
Click to expand it.
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