Skip to content

T
Tia-dev
Commit b5e2949d 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 didam

parents dc0a33c0 f90b2a09
Expand all Show whitespace changes
Inline Side-by-side
Showing with 257 additions and 129 deletions
src/container/Laporan/SubHolding.js
View file @ b5e2949d
......@@ -37,7 +37,7 @@ export default class SubHolding extends Component {
{ value: 6, label: 'Cash Flow - Summary' },
{ value: 7, label: 'Balance Sheet - Summary' },
{ value: 8, label: 'Profit Loss - Summary' },
{ value: 9, label: 'financial Ratio - Summary' },
{ value: 9, label: 'Financial Ratio - Summary' },
],
report: null,
loading: false,
......@@ -398,7 +398,8 @@ export default class SubHolding extends Component {
item.profit_loss.monthly_last_year_september,
item.profit_loss.monthly_last_year_october,
item.profit_loss.monthly_last_year_november,
item.profit_loss.monthly_last_year_december
item.profit_loss.monthly_last_year_december,
item.profit_loss.notes
])
}
if (item.children !== null) {
......@@ -457,7 +458,8 @@ export default class SubHolding extends Component {
item.profit_loss.monthly_last_year_september,
item.profit_loss.monthly_last_year_october,
item.profit_loss.monthly_last_year_november,
item.profit_loss.monthly_last_year_december
item.profit_loss.monthly_last_year_december,
item.profit_loss.notes
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -620,7 +622,7 @@ export default class SubHolding extends Component {
})
} else if (this.state.report.value === 3) {
api.create().getReportPLMB(payload).then(response => {
// console.log(response);
console.log(response);
if (response.data) {
let dataTable = []
console.log(response)
......@@ -1405,15 +1407,14 @@ export default class SubHolding extends Component {
}
}
})
// this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
this.setState({ dataTable }, () => {
console.log(this.state.dataTable)
// this.getBalanceSheetMR(payload)
})
this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
// this.setState({ dataTable }, () => {
// console.log(this.state.dataTable)
// // this.getBalanceSheetMR(payload)
// })
} else {
this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
}
this.setState({ previewTable: true, loading: false, previewDownload: false })
})
} else if (this.state.report.value === 8) {
......@@ -1483,7 +1484,8 @@ export default class SubHolding extends Component {
isNaN(persenFyLY) || persenFyLY == 'Infinity' || persenFyLY == '-Infinity'? (item.profit_loss.fy_last_year == '' || item.profit_loss.fy_last_year == 0? -0 : 0) : (item.profit_loss.fy_last_year == '' || item.profit_loss.fy_last_year == 0? persenFyLY * -100 : persenFyLY * 100),
isNaN(persenFyOLMB) || persenFyOLMB == 'Infinity' || persenFyOLMB == '-Infinity'? (item.profit_loss.fy_percent_ach_ol_to_mb == '' || item.profit_loss.fy_percent_ach_ol_to_mb == 0? -0 : 0) : (item.profit_loss.fy_percent_ach_ol_to_mb == '' || item.profit_loss.fy_percent_ach_ol_to_mb == 0? persenFyOLMB * -100 : persenFyOLMB * 100),
item.profit_loss.forecast_next_year,
item.profit_loss.forecast_more_year
item.profit_loss.forecast_more_year,
item.profit_loss.notes,
])
}
if (item.children !== null) {
......@@ -2050,18 +2052,18 @@ export default class SubHolding extends Component {
// console.log(indexIDzz)
if (indexIDzz != -1) {
dataTable2.push([...dataTable[indexIDzz],
Number(items.ratio.monthly_january).toFixed(2),
Number(items.ratio.monthly_february).toFixed(2),
Number(items.ratio.monthly_march).toFixed(2),
Number(items.ratio.monthly_april).toFixed(2),
Number(items.ratio.monthly_may).toFixed(2),
Number(items.ratio.monthly_june).toFixed(2),
Number(items.ratio.monthly_july).toFixed(2),
Number(items.ratio.monthly_august).toFixed(2),
Number(items.ratio.monthly_september).toFixed(2),
Number(items.ratio.monthly_october).toFixed(2),
Number(items.ratio.monthly_november).toFixed(2),
Number(items.ratio.monthly_december).toFixed(2),
String(items.ratio.monthly_january) == "" ? "" : Number(items.ratio.monthly_january).toFixed(2),
String(items.ratio.monthly_february) == "" ? "" : Number(items.ratio.monthly_february).toFixed(2),
String(items.ratio.monthly_march) == "" ? "" : Number(items.ratio.monthly_march).toFixed(2),
String(items.ratio.monthly_april) == "" ? "" : Number(items.ratio.monthly_april).toFixed(2),
String(items.ratio.monthly_may) == "" ? "" : Number(items.ratio.monthly_may).toFixed(2),
String(items.ratio.monthly_june) == "" ? "" : Number(items.ratio.monthly_june).toFixed(2),
String(items.ratio.monthly_july) == "" ? "" : Number(items.ratio.monthly_july).toFixed(2),
String(items.ratio.monthly_august) == "" ? "" : Number(items.ratio.monthly_august).toFixed(2),
String(items.ratio.monthly_september) == "" ? "" : Number(items.ratio.monthly_september).toFixed(2),
String(items.ratio.monthly_october) == "" ? "" : Number(items.ratio.monthly_october).toFixed(2),
String(items.ratio.monthly_november) == "" ? "" : Number(items.ratio.monthly_november).toFixed(2),
String(items.ratio.monthly_december) == "" ? "" : Number(items.ratio.monthly_december).toFixed(2),
])
}
if (items.children !== null) {
......@@ -2074,18 +2076,18 @@ export default class SubHolding extends Component {
}
dataTable2.push([...dataTable[indexID],
Number(item.ratio.monthly_january).toFixed(2),
Number(item.ratio.monthly_february).toFixed(2),
Number(item.ratio.monthly_march).toFixed(2),
Number(item.ratio.monthly_april).toFixed(2),
Number(item.ratio.monthly_may).toFixed(2),
Number(item.ratio.monthly_june).toFixed(2),
Number(item.ratio.monthly_july).toFixed(2),
Number(item.ratio.monthly_august).toFixed(2),
Number(item.ratio.monthly_september).toFixed(2),
Number(item.ratio.monthly_october).toFixed(2),
Number(item.ratio.monthly_november).toFixed(2),
Number(item.ratio.monthly_december).toFixed(2),
String(item.ratio.monthly_january) == "" ? "" : Number(item.ratio.monthly_january).toFixed(2),
String(item.ratio.monthly_february) == "" ? "" : Number(item.ratio.monthly_february).toFixed(2),
String(item.ratio.monthly_march) == "" ? "" : Number(item.ratio.monthly_march).toFixed(2),
String(item.ratio.monthly_april) == "" ? "" : Number(item.ratio.monthly_april).toFixed(2),
String(item.ratio.monthly_may) == "" ? "" : Number(item.ratio.monthly_may).toFixed(2),
String(item.ratio.monthly_june) == "" ? "" : Number(item.ratio.monthly_june).toFixed(2),
String(item.ratio.monthly_july) == "" ? "" : Number(item.ratio.monthly_july).toFixed(2),
String(item.ratio.monthly_august) == "" ? "" : Number(item.ratio.monthly_august).toFixed(2),
String(item.ratio.monthly_september) == "" ? "" : Number(item.ratio.monthly_september).toFixed(2),
String(item.ratio.monthly_october) == "" ? "" : Number(item.ratio.monthly_october).toFixed(2),
String(item.ratio.monthly_november) == "" ? "" : Number(item.ratio.monthly_november).toFixed(2),
String(item.ratio.monthly_december) == "" ? "" : Number(item.ratio.monthly_december).toFixed(2),
])
if (item.children !== null) {
......
src/container/Laporan/TableSubHolding.js
View file @ b5e2949d
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