Skip to content

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

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Issue Formula Should be Nil

See merge request !1737
parents 2a0651bc 26d4d3ca
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 19 deletions
src/container/Reports/SubHolding.js
View file @ f6394481
...@@ -3990,6 +3990,7 @@ export default class SubHolding extends Component { ...@@ -3990,6 +3990,7 @@ export default class SubHolding extends Component {
} }
async downloadAllData() { async downloadAllData() {
let {company, periode, month, quarter} = this.state
if (this.state.report.value === 1) { if (this.state.report.value === 1) {
let res = await fetch( let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_profit_loss_detail/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}` `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/db_profit_loss_detail/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}`
...@@ -4000,7 +4001,7 @@ export default class SubHolding extends Component { ...@@ -4000,7 +4001,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report DB Profit & Loss Detail.xlsx'; a.download = `Report DB Profit & Loss Detail ${company.company_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 2) { } else if (this.state.report.value === 2) {
...@@ -4015,7 +4016,7 @@ export default class SubHolding extends Component { ...@@ -4015,7 +4016,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report DB Balance Sheet.xlsx'; a.download = `Report DB Balance Sheet ${company.company_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 3) { } else if (this.state.report.value === 3) {
...@@ -4028,7 +4029,7 @@ export default class SubHolding extends Component { ...@@ -4028,7 +4029,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report DB Profit & Loss.xlsx'; a.download = `Report DB Profit & Loss ${company.company_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 4) { } else if (this.state.report.value === 4) {
...@@ -4043,7 +4044,7 @@ export default class SubHolding extends Component { ...@@ -4043,7 +4044,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report DB Financial Ratio.xlsx'; a.download = `Report DB Financial Ratio ${company.company_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 5) { } else if (this.state.report.value === 5) {
...@@ -4056,7 +4057,7 @@ export default class SubHolding extends Component { ...@@ -4056,7 +4057,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report DB Tax Planning.xlsx'; a.download = `Report DB Tax Planning ${company.company_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 21) { } else if (this.state.report.value === 21) {
...@@ -4071,7 +4072,7 @@ export default class SubHolding extends Component { ...@@ -4071,7 +4072,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report DB Operating Indicator.xlsx'; a.download = `Report DB Operating Indicator ${company.company_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 6) { } else if (this.state.report.value === 6) {
...@@ -4086,7 +4087,7 @@ export default class SubHolding extends Component { ...@@ -4086,7 +4087,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report Cash Flow - Summary.xlsx'; a.download = `Report Cash Flow - Summary ${company.company_name} ${month.month_value} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 7) { } else if (this.state.report.value === 7) {
...@@ -4099,7 +4100,7 @@ export default class SubHolding extends Component { ...@@ -4099,7 +4100,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report Balance Sheet - Summary.xlsx'; a.download = `Report Balance Sheet - Summary ${company.company_name} ${month.month_value} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 8) { } else if (this.state.report.value === 8) {
...@@ -4114,7 +4115,7 @@ export default class SubHolding extends Component { ...@@ -4114,7 +4115,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report Profit & Loss - Summary.xlsx'; a.download = `Report Profit & Loss - Summary ${company.company_name} ${month.month_value} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 9) { } else if (this.state.report.value === 9) {
...@@ -4127,7 +4128,7 @@ export default class SubHolding extends Component { ...@@ -4127,7 +4128,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report Financial Ratio - Summary.xlsx'; a.download = `Report Financial Ratio - Summary ${company.company_name} ${month.month_value} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 11) { } else if (this.state.report.value === 11) {
...@@ -4141,7 +4142,7 @@ export default class SubHolding extends Component { ...@@ -4141,7 +4142,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report CAT Performance Quarterly.xlsx'; a.download = `Report CAT Performance Quarterly ${company.company_name} ${quarter.name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 10) { } else if (this.state.report.value === 10) {
...@@ -4154,7 +4155,7 @@ export default class SubHolding extends Component { ...@@ -4154,7 +4155,7 @@ export default class SubHolding extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report CAT Performance Appraisal.xlsx'; a.download = `Report CAT Performance Appraisal ${company.company_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
}else { }else {
......
src/container/RollingOutlook/CashFlowRO.js
View file @ f6394481
...@@ -416,6 +416,9 @@ export default class CashFlow extends Component { ...@@ -416,6 +416,9 @@ export default class CashFlow extends Component {
baru.map((item, index) => { baru.map((item, index) => {
if (item == '-' || item == '+' || item == '/' || item == '*' || item == '(' || item == ')') { if (item == '-' || item == '+' || item == '/' || item == '*' || item == '(' || item == ')') {
anjay.push(item) anjay.push(item)
if (tableMeta.rowData[5] == "Control (should be nil)") {
console.log(anjay);
}
} else { } else {
if (String(item).includes('#')) { if (String(item).includes('#')) {
if (String(item).includes('[M-1]')) { if (String(item).includes('[M-1]')) {
...@@ -735,7 +738,7 @@ export default class CashFlow extends Component { ...@@ -735,7 +738,7 @@ export default class CashFlow extends Component {
// console.log(cashOfTheEndFy); // console.log(cashOfTheEndFy);
// console.log(cahsOfTheEndDec); // console.log(cahsOfTheEndDec);
let value = Number(cashOfTheEndFy) - Number(cahsOfTheEndDec); let value = Number(cashOfTheEndFy) - Number(cahsOfTheEndDec);
console.log(value); // console.log(value);
return R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value)) return R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value))
} else { } else {
dataTable2[tableMeta.rowIndex][18] = total dataTable2[tableMeta.rowIndex][18] = total
...@@ -1063,7 +1066,7 @@ export default class CashFlow extends Component { ...@@ -1063,7 +1066,7 @@ export default class CashFlow extends Component {
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
// this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null : // this.props.quarter === 'q1' || this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
((this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[8].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[8], tableMeta, 13)).toFixed(1)) >= Number(this.state.minValue) && (Number(handleValueFormula(tableMeta.rowData[8], tableMeta, 8)).toFixed(1)) <= Number(this.state.maxValue)) ? ((this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[8].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[8], tableMeta, 8)).toFixed(1)) >= Number(this.state.minValue) && (Number(handleValueFormula(tableMeta.rowData[8], tableMeta, 8)).toFixed(1)) <= Number(this.state.maxValue)) ?
//pengambilan dari monthly report: (Number(tableMeta.rowData[8].value).toFixed(1) >= Number(this.state.minValue) && Number(tableMeta.rowData[8].value).toFixed(1) <= Number(this.state.maxValue)) ? //pengambilan dari monthly report: (Number(tableMeta.rowData[8].value).toFixed(1) >= Number(this.state.minValue) && Number(tableMeta.rowData[8].value).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1215,7 +1218,7 @@ export default class CashFlow extends Component { ...@@ -1215,7 +1218,7 @@ export default class CashFlow extends Component {
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
// this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null : // this.props.quarter === 'q2' || this.props.quarter === 'q3' ? null :
((this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[10].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 9)).toFixed(1)) >= Number(this.state.minValue) && (Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 10)).toFixed(1)) <= Number(this.state.maxValue)) ? ((this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[10].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 10)).toFixed(1)) >= Number(this.state.minValue) && (Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 10)).toFixed(1)) <= Number(this.state.maxValue)) ?
// ((this.props.quarter != 'q1' || this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[10].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 10)).toFixed(1)) >= Number(this.state.minValue) && (this.props.quarter != 'q1' ? Number(tableMeta.rowData[10].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 10)).toFixed(1)) <= Number(this.state.maxValue)) ? // ((this.props.quarter != 'q1' || this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[10].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 10)).toFixed(1)) >= Number(this.state.minValue) && (this.props.quarter != 'q1' ? Number(tableMeta.rowData[10].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[10], tableMeta, 10)).toFixed(1)) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
......
src/container/SummaryTriputra/SummaryOfTriputra.js
View file @ f6394481
...@@ -892,6 +892,8 @@ export default class SummaryOfTriputra extends Component { ...@@ -892,6 +892,8 @@ export default class SummaryOfTriputra extends Component {
} }
async downloadAllData() { async downloadAllData() {
let {month, periode} = this.state
console.log(month, periode);
if (this.state.report.value === 1) { if (this.state.report.value === 1) {
// alert("Download MTD Report Coming Soon") // alert("Download MTD Report Coming Soon")
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_mtd/export_report?year=${this.state.periode.periode}&&months=${this.state.month.month_id}` let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_mtd/export_report?year=${this.state.periode.periode}&&months=${this.state.month.month_id}`
...@@ -906,7 +908,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -906,7 +908,7 @@ export default class SummaryOfTriputra extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report MTD.xlsx'; a.download = `Report MTD ${month.month_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 2) { } else if (this.state.report.value === 2) {
...@@ -923,7 +925,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -923,7 +925,7 @@ export default class SummaryOfTriputra extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report YTD.xlsx'; a.download = `Report YTD ${month.month_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 3) { } else if (this.state.report.value === 3) {
...@@ -940,7 +942,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -940,7 +942,7 @@ export default class SummaryOfTriputra extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report CPSM.xlsx'; a.download = `Report CPSM ${month.month_name} ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else if (this.state.report.value === 4) { } else if (this.state.report.value === 4) {
...@@ -957,7 +959,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -957,7 +959,7 @@ export default class SummaryOfTriputra extends Component {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
let a = document.createElement('a'); let a = document.createElement('a');
a.href = url; a.href = url;
a.download = 'Report Historical.xlsx'; a.download = `Report Historical ${periode.periode}.xlsx`;
a.click(); a.click();
} }
} else { } else {
......
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