Skip to content

T
Tia-dev
Commit b93d186b authored by rifkaki's avatar rifkaki
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

parents d5e4e418 42787e27
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 8 deletions
src/container/Laporan/SubHolding.js
View file @ b93d186b
...@@ -985,19 +985,22 @@ export default class SubHolding extends Component { ...@@ -985,19 +985,22 @@ export default class SubHolding extends Component {
item.id, item.id,
item.cash_flow.mtd_actual, item.cash_flow.mtd_actual,
item.cash_flow.mtd, item.cash_flow.mtd,
isNaN(persenMtd)? 0 : persenMtd * 100, isNaN(persenMtd) || persenMtd == 'Infinity' || persenMtd == '-Infinity'? (item.cash_flow.mtd == '' || item.cash_flow.mtd == 0? -0 : 0) : (item.cash_flow.mtd == '' || item.cash_flow.mtd == 0? persenMtd * -100 : persenMtd * 100),
item.cash_flow.mtd_last_year, item.cash_flow.mtd_last_year,
item.cash_flow.ytd_actual, item.cash_flow.ytd_actual,
item.cash_flow.ytd, item.cash_flow.ytd,
isNaN(persenYtd)? 0 : persenYtd * 100, isNaN(persenYtd) || persenYtd == 'Infinity' || persenYtd == '-Infinity'? (item.cash_flow.ytd == '' || item.cash_flow.ytd == 0? -0 : 0) : (item.cash_flow.ytd == '' || item.cash_flow.ytd == 0? persenYtd * -100 : persenYtd * 100),
// isNaN(persenYtd)? 0 : persenYtd * 100,
item.cash_flow.ytd_last_year, item.cash_flow.ytd_last_year,
item.cash_flow.quarter_actual, item.cash_flow.quarter_actual,
item.cash_flow.quarter, item.cash_flow.quarter,
isNaN(persenQuarter)? 0 : persenQuarter * 100, isNaN(persenQuarter) || persenQuarter == 'Infinity' || persenQuarter == '-Infinity'? (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0? -0 : 0) : (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0? persenQuarter * -100 : persenQuarter * 100),
// isNaN(persenQuarter)? 0 : persenQuarter * 100,
item.cash_flow.quarter_last_year, item.cash_flow.quarter_last_year,
item.cash_flow.fy_actual, item.cash_flow.fy_actual,
item.cash_flow.fy, item.cash_flow.fy,
isNaN(persenFy)? 0 : persenFy * 100, isNaN(persenFy) || persenFy == 'Infinity' || persenFy == '-Infinity'? (item.cash_flow.fy == '' || item.cash_flow.fy == 0? -0 : 0) : (item.cash_flow.fy == '' || item.cash_flow.fy == 0? persenFy * -100 : persenFy * 100),
// isNaN(persenFy)? 0 : persenFy * 100,
item.cash_flow.fy_last_year, item.cash_flow.fy_last_year,
]) ])
} }
...@@ -1030,19 +1033,22 @@ export default class SubHolding extends Component { ...@@ -1030,19 +1033,22 @@ export default class SubHolding extends Component {
item.id, item.id,
item.cash_flow.mtd_actual, item.cash_flow.mtd_actual,
item.cash_flow.mtd, item.cash_flow.mtd,
isNaN(persenMtd)? 0 : persenMtd * 100, isNaN(persenMtd) || persenMtd == 'Infinity' || persenMtd == '-Infinity'? (item.cash_flow.mtd == '' || item.cash_flow.mtd == 0? -0 : 0) : (item.cash_flow.mtd == '' || item.cash_flow.mtd == 0? persenMtd * -100 : persenMtd * 100),
item.cash_flow.mtd_last_year, item.cash_flow.mtd_last_year,
item.cash_flow.ytd_actual, item.cash_flow.ytd_actual,
item.cash_flow.ytd, item.cash_flow.ytd,
isNaN(persenYtd)? 0 : persenYtd * 100, isNaN(persenYtd) || persenYtd == 'Infinity' || persenYtd == '-Infinity'? (item.cash_flow.ytd == '' || item.cash_flow.ytd == 0? -0 : 0) : (item.cash_flow.ytd == '' || item.cash_flow.ytd == 0? persenYtd * -100 : persenYtd * 100),
// isNaN(persenYtd)? 0 : persenYtd * 100,
item.cash_flow.ytd_last_year, item.cash_flow.ytd_last_year,
item.cash_flow.quarter_actual, item.cash_flow.quarter_actual,
item.cash_flow.quarter, item.cash_flow.quarter,
isNaN(persenQuarter)? 0 : persenQuarter * 100, isNaN(persenQuarter) || persenQuarter == 'Infinity' || persenQuarter == '-Infinity'? (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0? -0 : 0) : (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0? persenQuarter * -100 : persenQuarter * 100),
// isNaN(persenQuarter)? 0 : persenQuarter * 100,
item.cash_flow.quarter_last_year, item.cash_flow.quarter_last_year,
item.cash_flow.fy_actual, item.cash_flow.fy_actual,
item.cash_flow.fy, item.cash_flow.fy,
isNaN(persenFy)? 0 : persenFy * 100, isNaN(persenFy) || persenFy == 'Infinity' || persenFy == '-Infinity'? (item.cash_flow.fy == '' || item.cash_flow.fy == 0? -0 : 0) : (item.cash_flow.fy == '' || item.cash_flow.fy == 0? persenFy * -100 : persenFy * 100),
// isNaN(persenFy)? 0 : persenFy * 100,
item.cash_flow.fy_last_year, item.cash_flow.fy_last_year,
]) ])
if (item.children !== null) { if (item.children !== null) {
......
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