Skip to content

T
Tia-dev
Commit 305be65c authored by d.arizona's avatar d.arizona
Browse files
Options

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

parents e7d662b1 4f78f7ab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 799 additions and 25 deletions
src/container/Laporan/SubHolding.js
View file @ 305be65c
......@@ -545,18 +545,29 @@ export default class SubHolding extends Component {
item.profit_loss.ol_q3_october,
item.profit_loss.ol_q3_november,
item.profit_loss.ol_q3_december,
// item.profit_loss.ol_pa_january,
// item.profit_loss.ol_pa_february,
// item.profit_loss.ol_pa_march,
// item.profit_loss.ol_pa_april,
// item.profit_loss.ol_pa_may,
// item.profit_loss.ol_pa_june,
// item.profit_loss.ol_pa_july,
// item.profit_loss.ol_pa_august,
// item.profit_loss.ol_pa_september,
// item.profit_loss.ol_pa_october,
// item.profit_loss.ol_pa_november,
// item.profit_loss.ol_pa_december,
item.profit_loss.ol_pa_january,
item.profit_loss.ol_pa_february,
item.profit_loss.ol_pa_march,
item.profit_loss.ol_pa_april,
item.profit_loss.ol_pa_may,
item.profit_loss.ol_pa_june,
item.profit_loss.ol_pa_july,
item.profit_loss.ol_pa_august,
item.profit_loss.ol_pa_september,
item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december,
item.profit_loss.historialLast10YearList
// item.profit_loss.historialLast10YearList[0].value === null ? "0" : item.profit_loss.historialLast10YearList[0].value,
// item.profit_loss.historialLast10YearList[1].value === null ? "0" : item.profit_loss.historialLast10YearList[1].value,
// item.profit_loss.historialLast10YearList[2].value === null ? "0" : item.profit_loss.historialLast10YearList[2].value,
// item.profit_loss.historialLast10YearList[3].value === null ? "0" : item.profit_loss.historialLast10YearList[3].value,
// item.profit_loss.historialLast10YearList[4].value === null ? "0" : item.profit_loss.historialLast10YearList[4].value,
// item.profit_loss.historialLast10YearList[5].value === null ? "0" : item.profit_loss.historialLast10YearList[5].value,
// item.profit_loss.historialLast10YearList[6].value === null ? "0" : item.profit_loss.historialLast10YearList[6].value,
// item.profit_loss.historialLast10YearList[7].value === null ? "0" : item.profit_loss.historialLast10YearList[7].value,
// item.profit_loss.historialLast10YearList[8].value === null ? "0" : item.profit_loss.historialLast10YearList[8].value,
// item.profit_loss.historialLast10YearList[9].value === null ? "0" : item.profit_loss.historialLast10YearList[9].value
])
}
......@@ -666,18 +677,29 @@ export default class SubHolding extends Component {
item.profit_loss.ol_q3_october,
item.profit_loss.ol_q3_november,
item.profit_loss.ol_q3_december,
// item.profit_loss.ol_pa_january,
// item.profit_loss.ol_pa_february,
// item.profit_loss.ol_pa_march,
// item.profit_loss.ol_pa_april,
// item.profit_loss.ol_pa_may,
// item.profit_loss.ol_pa_june,
// item.profit_loss.ol_pa_july,
// item.profit_loss.ol_pa_august,
// item.profit_loss.ol_pa_september,
// item.profit_loss.ol_pa_october,
// item.profit_loss.ol_pa_november,
// item.profit_loss.ol_pa_december,
item.profit_loss.ol_pa_january,
item.profit_loss.ol_pa_february,
item.profit_loss.ol_pa_march,
item.profit_loss.ol_pa_april,
item.profit_loss.ol_pa_may,
item.profit_loss.ol_pa_june,
item.profit_loss.ol_pa_july,
item.profit_loss.ol_pa_august,
item.profit_loss.ol_pa_september,
item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december,
item.profit_loss.historialLast10YearList
// item.profit_loss.historialLast10YearList[0].value === null ? "0" : item.profit_loss.historialLast10YearList[0].value,
// item.profit_loss.historialLast10YearList[1].value === null ? "0" : item.profit_loss.historialLast10YearList[1].value,
// item.profit_loss.historialLast10YearList[2].value === null ? "0" : item.profit_loss.historialLast10YearList[2].value,
// item.profit_loss.historialLast10YearList[3].value === null ? "0" : item.profit_loss.historialLast10YearList[3].value,
// item.profit_loss.historialLast10YearList[4].value === null ? "0" : item.profit_loss.historialLast10YearList[4].value,
// item.profit_loss.historialLast10YearList[5].value === null ? "0" : item.profit_loss.historialLast10YearList[5].value,
// item.profit_loss.historialLast10YearList[6].value === null ? "0" : item.profit_loss.historialLast10YearList[6].value,
// item.profit_loss.historialLast10YearList[7].value === null ? "0" : item.profit_loss.historialLast10YearList[7].value,
// item.profit_loss.historialLast10YearList[8].value === null ? "0" : item.profit_loss.historialLast10YearList[8].value,
// item.profit_loss.historialLast10YearList[9].value === null ? "0" : item.profit_loss.historialLast10YearList[9].value
])
if (item.children !== null) {
if (item.children.length > 0) {
......
src/container/Laporan/TableSubHolding.js
View file @ 305be65c
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