Skip to content

T
Tia-dev
Commit ea4d0c83 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'dev/riri' into 'ENV-DEV' 

cashflow summary yahuud

See merge request !1659
parents b8ee0fd0 3b603e2b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 113 deletions
src/container/Reports/SubHolding.js
View file @ ea4d0c83
......@@ -1942,7 +1942,7 @@ export default class SubHolding extends Component {
if (indexIDzz === -1) {
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)
console.log(mtd)
// console.log(mtd)
// let persenMtd = Number(mtd_actual / mtd)
let persenMtd = 0
if (mtd < 0) {
......@@ -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 = item.cash_flow.fy == '' ? 0 : Number(item.cash_flow.fy)
// let persenFy = Number(fy_actual / fy)
console.log(fy_actual);
let persenFy = 0
if (fy < 0) {
if (fy_actual >= fy) {
......@@ -2205,6 +2206,7 @@ export default class SubHolding extends Component {
item.cash_flow.olpa_october,
item.cash_flow.olpa_november,
item.cash_flow.olpa_december,
item.cash_flow.olpa_total_current_year,
])
}
if (item.children !== null) {
......@@ -2255,6 +2257,7 @@ export default class SubHolding extends Component {
item.cash_flow.olpa_october,
item.cash_flow.olpa_november,
item.cash_flow.olpa_december,
item.cash_flow.olpa_total_current_year,
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -3369,6 +3372,7 @@ export default class SubHolding extends Component {
items.cash_flow.october,
items.cash_flow.november,
items.cash_flow.december,
items.cash_flow.total_current_year,
items.cash_flow.q1_january,
items.cash_flow.q1_february,
items.cash_flow.q1_march,
......@@ -3381,6 +3385,7 @@ export default class SubHolding extends Component {
items.cash_flow.q1_october,
items.cash_flow.q1_november,
items.cash_flow.q1_december,
items.cash_flow.q1_total_current_year,
items.cash_flow.q2_january,
items.cash_flow.q2_february,
items.cash_flow.q2_march,
......@@ -3393,6 +3398,7 @@ export default class SubHolding extends Component {
items.cash_flow.q2_october,
items.cash_flow.q2_november,
items.cash_flow.q2_december,
items.cash_flow.q2_total_current_year,
items.cash_flow.q3_january,
items.cash_flow.q3_february,
items.cash_flow.q3_march,
......@@ -3405,6 +3411,7 @@ export default class SubHolding extends Component {
items.cash_flow.q3_october,
items.cash_flow.q3_november,
items.cash_flow.q3_december,
items.cash_flow.q3_total_current_year,
items.cash_flow.history_current_year,
items.cash_flow.history_last_year,
items.cash_flow.history_last_two_year,
......@@ -3439,6 +3446,7 @@ export default class SubHolding extends Component {
item.cash_flow.october,
item.cash_flow.november,
item.cash_flow.december,
item.cash_flow.total_current_year,
item.cash_flow.q1_january,
item.cash_flow.q1_february,
item.cash_flow.q1_march,
......@@ -3451,6 +3459,7 @@ export default class SubHolding extends Component {
item.cash_flow.q1_october,
item.cash_flow.q1_november,
item.cash_flow.q1_december,
item.cash_flow.q1_total_current_year,
item.cash_flow.q2_january,
item.cash_flow.q2_february,
item.cash_flow.q2_march,
......@@ -3463,6 +3472,7 @@ export default class SubHolding extends Component {
item.cash_flow.q2_october,
item.cash_flow.q2_november,
item.cash_flow.q2_december,
item.cash_flow.q2_total_current_year,
item.cash_flow.q3_january,
item.cash_flow.q3_february,
item.cash_flow.q3_march,
......@@ -3475,6 +3485,7 @@ export default class SubHolding extends Component {
item.cash_flow.q3_october,
item.cash_flow.q3_november,
item.cash_flow.q3_december,
item.cash_flow.q3_total_current_year,
item.cash_flow.history_current_year,
item.cash_flow.history_last_year,
item.cash_flow.history_last_two_year,
......@@ -3542,6 +3553,7 @@ export default class SubHolding extends Component {
items.cash_flow.october,
items.cash_flow.november,
items.cash_flow.december,
items.cash_flow.total_current_year,
...dbSumaCF[indexIDSumaChild]
])
}
......@@ -3567,6 +3579,7 @@ export default class SubHolding extends Component {
item.cash_flow.october,
item.cash_flow.november,
item.cash_flow.december,
item.cash_flow.total_current_year,
...dbSumaCF[indexIDSuma]
])
......
src/container/Reports/TableSubHolding.js
View file @ ea4d0c83
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment