Skip to content

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

Merge branch 'riri' into 'master' 

issue subco

See merge request !1528
parents 42bc2ef9 49e31a91
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 6 deletions
src/container/Laporan/SubHolding.js
View file @ 56f833b5
......@@ -2591,11 +2591,20 @@ export default class SubHolding extends Component {
isNaN(persenYtdMB) || persenYtdMB == 'Infinity' || persenYtdMB == '-Infinity'? (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? -0 : 0) : (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? persenYtdMB * -100 : persenYtdMB * 100),
item.profit_loss.ytd_last_year,
isNaN(persenYtdLY) || persenYtdLY == 'Infinity' || persenYtdLY == '-Infinity'? (item.profit_loss.ytd_last_year == '' || item.profit_loss.ytd_last_year == 0? -0 : 0) : (item.profit_loss.ytd_last_year == '' || item.profit_loss.ytd_last_year == 0? persenYtdLY * -100 : persenYtdLY * 100),
month == "Mar" ? item.profit_loss.q1_actual : month = "Jun" ? item.profit_loss.q2_actual : month = "Sep" ? item.profit_loss.q3_actual : 0,
month == "Mar" ? item.profit_loss.q1_mb : month = "Jun" ? item.profit_loss.q2_mb : month = "Sep" ? item.profit_loss.q3_mb : 0,
month == "Mar" ? item.profit_loss.q1_actual :
month == "Jun" ? item.profit_loss.q2_actual :
month == "Sep" ? item.profit_loss.q3_actual :
month == "Dec" ? item.profit_loss.q4_actual : 0,
month == "Mar" ? item.profit_loss.q1_mb :
month == "Jun" ? item.profit_loss.q2_mb :
month == "Sep" ? item.profit_loss.q3_mb :
month == "Dec" ? item.profit_loss.q4_mb : 0,
isNaN(persenQuarterMB) || persenQuarterMB == 'Infinity' || persenQuarterMB == '-Infinity'? (q_mb == '' || q_mb == 0? -0 : 0) : (q_mb == '' || q_mb == 0? persenQuarterMB * -100 : persenQuarterMB * 100),
// isNaN(persenQuarterMB) || persenQuarterMB == 'Infinity' || persenQuarterMB == '-Infinity'? (item.profit_loss.q1_mb == '' || item.profit_loss.q1_mb == 0? -0 : 0) : (item.profit_loss.q1_mb == '' || item.profit_loss.q1_mb == 0? persenQuarterMB * -100 : persenQuarterMB * 100),
month == "Mar" ? item.profit_loss.q1_last_year : month = "Jun" ? item.profit_loss.q2_last_year : month = "Sep" ? item.profit_loss.q3_last_year : 0,
month == "Mar" ? item.profit_loss.q1_last_year :
month == "Jun" ? item.profit_loss.q2_last_year :
month == "Sep" ? item.profit_loss.q3_last_year :
month == "Dec" ? item.profit_loss.q4_last_year : 0,
isNaN(persenQuarterLY) || persenQuarterLY == 'Infinity' || persenQuarterLY == '-Infinity'? (q_last_year == '' || q_last_year == 0? -0 : 0) : (q_last_year == '' || q_last_year == 0? persenQuarterLY * -100 : persenQuarterLY * 100),
// isNaN(persenQuarterLY) || persenQuarterLY == 'Infinity' || persenQuarterLY == '-Infinity'? (item.profit_loss.q1_last_year == '' || item.profit_loss.q1_last_year == 0? -0 : 0) : (item.profit_loss.q1_last_year == '' || item.profit_loss.q1_last_year == 0? persenQuarterLY * -100 : persenQuarterLY * 100),
item.profit_loss.fy_actual,
......@@ -2811,10 +2820,19 @@ export default class SubHolding extends Component {
isNaN(persenYtdMB) || persenYtdMB == 'Infinity' || persenYtdMB == '-Infinity'? (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? -0 : 0) : (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? persenYtdMB * -100 : persenYtdMB * 100),
item.profit_loss.ytd_last_year,
isNaN(persenYtdLY) || persenYtdLY == 'Infinity' || persenYtdLY == '-Infinity'? (item.profit_loss.ytd_last_year == '' || item.profit_loss.ytd_last_year == 0? -0 : 0) : (item.profit_loss.ytd_last_year == '' || item.profit_loss.ytd_last_year == 0? persenYtdLY * -100 : persenYtdLY * 100),
month == "Mar" ? item.profit_loss.q1_actual : month = "Jun" ? item.profit_loss.q2_actual : month = "Sep" ? item.profit_loss.q3_actual : 0,
month == "Mar" ? item.profit_loss.q1_mb : month = "Jun" ? item.profit_loss.q2_mb : month = "Sep" ? item.profit_loss.q3_mb : 0,
month == "Mar" ? item.profit_loss.q1_actual :
month == "Jun" ? item.profit_loss.q2_actual :
month == "Sep" ? item.profit_loss.q3_actual :
month == "Dec" ? item.profit_loss.q4_actual : 0,
month == "Mar" ? item.profit_loss.q1_mb :
month == "Jun" ? item.profit_loss.q2_mb :
month == "Sep" ? item.profit_loss.q3_mb :
month == "Dec" ? item.profit_loss.q4_mb : 0,
isNaN(persenQuarterMB) || persenQuarterMB == 'Infinity' || persenQuarterMB == '-Infinity'? (q_mb == '' || q_mb == 0? -0 : 0) : (q_mb == '' || q_mb == 0? persenQuarterMB * -100 : persenQuarterMB * 100),
month == "Mar" ? item.profit_loss.q1_last_year : month = "Jun" ? item.profit_loss.q2_last_year : month = "Sep" ? item.profit_loss.q3_last_year : 0,
month == "Mar" ? item.profit_loss.q1_last_year :
month == "Jun" ? item.profit_loss.q2_last_year :
month == "Sep" ? item.profit_loss.q3_last_year :
month == "Dec" ? item.profit_loss.q4_last_year : 0,
isNaN(persenQuarterLY) || persenQuarterLY == 'Infinity' || persenQuarterLY == '-Infinity'? (q_last_year == '' || q_last_year == 0? -0 : 0) : (q_last_year == '' || q_last_year == 0? persenQuarterLY * -100 : persenQuarterLY * 100),
item.profit_loss.fy_actual,
item.profit_loss.fy_mb,
......
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