Skip to content

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

Merge branch 'riri' into 'master' 

Riri

See merge request !1453
parents 873b685d 4fee691b
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 47 deletions
src/container/Laporan/SubHolding.js
View file @ b72caffb
......@@ -568,17 +568,17 @@ export default class SubHolding extends Component {
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
// item.profit_loss.historialLast10YearList,
item.profit_loss.history_current_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year
])
}
......@@ -700,17 +700,17 @@ export default class SubHolding extends Component {
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
// item.profit_loss.historialLast10YearList
item.profit_loss.history_current_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -863,7 +863,18 @@ export default class SubHolding extends Component {
item.balance_sheet.ol_pa_october,
item.balance_sheet.ol_pa_november,
item.balance_sheet.ol_pa_december,
item.balance_sheet.historial_last_10_years_list
// item.balance_sheet.historial_last_10_years_list,
item.balance_sheet.history_current_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_eight_year,
item.balance_sheet.history_last_nine_year
])
}
......@@ -986,7 +997,17 @@ export default class SubHolding extends Component {
item.balance_sheet.ol_pa_october,
item.balance_sheet.ol_pa_november,
item.balance_sheet.ol_pa_december,
item.balance_sheet.historial_last_10_years_list
// item.balance_sheet.historial_last_10_years_list
item.balance_sheet.history_current_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_eight_year,
item.balance_sheet.history_last_nine_year
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -2246,7 +2267,7 @@ export default class SubHolding extends Component {
} else if (this.state.report.value === 8) {
let dbSumaPL = []
let payloadPL = {...payload, report_id: 28, months: this.state.month.month_id}
api.create().getReportPLSummary(payloadPL).then(response => {
api.create().getReportPLSuma(payloadPL).then(response => {
console.log(response);
if (response.data) {
if (response.data.status === 'success') {
......@@ -3848,10 +3869,10 @@ export default class SubHolding extends Component {
a.click();
}
} else if (this.state.report.value === 8) {
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
console.log(url);
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
)
res = await res.blob()
this.setState({ loading: false })
......
src/container/Laporan/TableSubHolding.js
View file @ b72caffb
......@@ -4647,7 +4647,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][0]) === "0" ? "" : Number(tableMeta.rowData[109][0]).toFixed(1))}
value={String(tableMeta.rowData[109]) === "" ? "" : Number(tableMeta.rowData[109]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][0]) === "0" ? "" : Number(tableMeta.rowData[109][0]).toFixed(1))}
/>
}
/>
......@@ -4670,7 +4671,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][1]) === "0" ? "" : Number(tableMeta.rowData[109][1]).toFixed(1))}
value={String(tableMeta.rowData[110]) === "" ? "" : Number(tableMeta.rowData[110]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][1]) === "0" ? "" : Number(tableMeta.rowData[109][1]).toFixed(1))}
/>
}
/>
......@@ -4693,7 +4695,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][2]) === "0" ? "" : Number(tableMeta.rowData[109][2]).toFixed(1))}
value={String(tableMeta.rowData[111]) === "" ? "" : Number(tableMeta.rowData[111]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][2]) === "0" ? "" : Number(tableMeta.rowData[109][2]).toFixed(1))}
/>
}
/>
......@@ -4716,7 +4719,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][3]) === "0" ? "" : Number(tableMeta.rowData[109][3]).toFixed(1))}
value={String(tableMeta.rowData[112]) === "" ? "" : Number(tableMeta.rowData[112]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][3]) === "0" ? "" : Number(tableMeta.rowData[109][3]).toFixed(1))}
/>
}
/>
......@@ -4739,7 +4743,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][4]) === "0" ? "" : Number(tableMeta.rowData[109][4]).toFixed(1))}
value={String(tableMeta.rowData[113]) === "" ? "" : Number(tableMeta.rowData[113]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][4]) === "0" ? "" : Number(tableMeta.rowData[109][4]).toFixed(1))}
/>
}
/>
......@@ -4764,7 +4769,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][5]) === "0" ? "" : Number(tableMeta.rowData[109][5]).toFixed(1))}
value={String(tableMeta.rowData[114]) === "" ? "" : Number(tableMeta.rowData[114]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][5]) === "0" ? "" : Number(tableMeta.rowData[109][5]).toFixed(1))}
/>
}
/>
......@@ -4787,7 +4793,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][6]) === "0" ? "" : Number(tableMeta.rowData[109][6]).toFixed(1))}
value={String(tableMeta.rowData[115]) === "" ? "" : Number(tableMeta.rowData[115]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][6]) === "0" ? "" : Number(tableMeta.rowData[109][6]).toFixed(1))}
/>
}
/>
......@@ -4810,7 +4817,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][7]) === "0" ? "" : Number(tableMeta.rowData[109][7]).toFixed(1))}
value={String(tableMeta.rowData[116]) === "" ? "" : Number(tableMeta.rowData[116]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][7]) === "0" ? "" : Number(tableMeta.rowData[109][7]).toFixed(1))}
/>
}
/>
......@@ -4833,7 +4841,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][8]) === "0" ? "" : Number(tableMeta.rowData[109][8]).toFixed(1))}
value={String(tableMeta.rowData[117]) === "" ? "" : Number(tableMeta.rowData[117]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][8]) === "0" ? "" : Number(tableMeta.rowData[109][8]).toFixed(1))}
/>
}
/>
......@@ -4856,7 +4865,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][9]) === "0" ? "" : Number(tableMeta.rowData[109][9]).toFixed(1))}
value={String(tableMeta.rowData[118]) === "" ? "" : Number(tableMeta.rowData[118]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][9]) === "0" ? "" : Number(tableMeta.rowData[109][9]).toFixed(1))}
/>
}
/>
......@@ -8443,7 +8453,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][0]) === "0" ? "" : Number(tableMeta.rowData[108][0]).toFixed(1))}
value={String(tableMeta.rowData[108]) === "" ? "" : Number(tableMeta.rowData[108]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][0]) === "0" ? "" : Number(tableMeta.rowData[108][0]).toFixed(1))}
/>
}
/>
......@@ -8466,7 +8477,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][1]) === "0" ? "" : Number(tableMeta.rowData[108][1]).toFixed(1))}
value={String(tableMeta.rowData[109]) === "" ? "" : Number(tableMeta.rowData[109]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][1]) === "0" ? "" : Number(tableMeta.rowData[108][1]).toFixed(1))}
/>
}
/>
......@@ -8489,7 +8501,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][2]) === "0" ? "" : Number(tableMeta.rowData[108][2]).toFixed(1))}
value={String(tableMeta.rowData[110]) === "" ? "" : Number(tableMeta.rowData[110]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][2]) === "0" ? "" : Number(tableMeta.rowData[108][2]).toFixed(1))}
/>
}
/>
......@@ -8512,7 +8525,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][3]) === "0" ? "" : Number(tableMeta.rowData[108][3]).toFixed(1))}
value={String(tableMeta.rowData[111]) === "" ? "" : Number(tableMeta.rowData[111]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][3]) === "0" ? "" : Number(tableMeta.rowData[108][3]).toFixed(1))}
/>
}
/>
......@@ -8535,7 +8549,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][4]) === "0" ? "" : Number(tableMeta.rowData[108][4]).toFixed(1))}
value={String(tableMeta.rowData[112]) === "" ? "" : Number(tableMeta.rowData[112]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][4]) === "0" ? "" : Number(tableMeta.rowData[108][4]).toFixed(1))}
/>
}
/>
......@@ -8560,7 +8575,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][5]) === "0" ? "" : Number(tableMeta.rowData[108][5]).toFixed(1))}
value={String(tableMeta.rowData[113]) === "" ? "" : Number(tableMeta.rowData[113]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][5]) === "0" ? "" : Number(tableMeta.rowData[108][5]).toFixed(1))}
/>
}
/>
......@@ -8583,7 +8599,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][6]) === "0" ? "" : Number(tableMeta.rowData[108][6]).toFixed(1))}
value={String(tableMeta.rowData[114]) === "" ? "" : Number(tableMeta.rowData[114]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][6]) === "0" ? "" : Number(tableMeta.rowData[108][6]).toFixed(1))}
/>
}
/>
......@@ -8606,7 +8623,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][7]) === "0" ? "" : Number(tableMeta.rowData[108][7]).toFixed(1))}
value={String(tableMeta.rowData[115]) === "" ? "" : Number(tableMeta.rowData[115]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][7]) === "0" ? "" : Number(tableMeta.rowData[108][7]).toFixed(1))}
/>
}
/>
......@@ -8629,7 +8647,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][8]) === "0" ? "" : Number(tableMeta.rowData[108][8]).toFixed(1))}
value={String(tableMeta.rowData[116]) === "" ? "" : Number(tableMeta.rowData[116]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][8]) === "0" ? "" : Number(tableMeta.rowData[108][8]).toFixed(1))}
/>
}
/>
......@@ -8652,7 +8671,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][9]) === "0" ? "" : Number(tableMeta.rowData[108][9]).toFixed(1))}
value={String(tableMeta.rowData[117]) === "" ? "" : Number(tableMeta.rowData[117]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][9]) === "0" ? "" : Number(tableMeta.rowData[108][9]).toFixed(1))}
/>
}
/>
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