Skip to content

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

Merge branch 'dev-riri' into 'ENV-DEV' 

update remark 2

See merge request !2212
parents e463e59e 089b24e4
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 81 deletions
src/container/MonthlyReport/LOCFMR.js
View file @ 6a037dc7
......@@ -149,7 +149,7 @@ export default class LOCF extends Component {
if (this.props.dataTablelocf !== prevProps.dataTablelocf) {
let array = this.props.dataTablelocf
let datas = array[array.length - 1]
this.setState({ dataTable: this.props.dataTablelocf, diff: datas[46], loanTotal: datas[47], perBS: datas[48] })
this.setState({ dataTable: this.props.dataTablelocf, diff: datas[47], loanTotal: datas[48], perBS: datas[49] })
}
if (this.props.loadingChild !== prevProps.loadingChild) {
this.setState({ loading: this.props.loadingChild })
......@@ -272,7 +272,7 @@ export default class LOCF extends Component {
item.locf.other_ratio4_financial,
item.locf.other_ratio4_current === null ? "0.0" : item.locf.other_ratio4_current === "" ? "0.0" : item.locf.other_ratio4_current,
item.locf.notes,
item.diff,
item.diff == 0 ? "0.0" : item.diff,
item.total_loan,
item.per_bs,
// index
......@@ -336,7 +336,7 @@ export default class LOCF extends Component {
item.locf.other_ratio4_financial,
item.locf.other_ratio4_current === null ? "0.0" : item.locf.other_ratio4_current === "" ? "0.0" : item.locf.other_ratio4_current,
item.locf.notes,
item.diff,
item.diff == 0 ? "0.0" : item.diff,
item.total_loan,
item.per_bs
// index
......@@ -3501,7 +3501,7 @@ export default class LOCF extends Component {
<Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Diff</Typography>
</div>
<div style={{ borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
<Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
<Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff == 0 ? "0.0" : this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
</div>
</div>
</div>
......
src/container/MonthlyReport/LOVMR.js
View file @ 6a037dc7
......@@ -1770,7 +1770,7 @@ export default class LOV extends Component {
<Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Diff</Typography>
</div>
<div style={{ borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
<Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
<Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff == 0 ? "0.0" : this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
</div>
</div>
</div>
......
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ 6a037dc7
......@@ -879,6 +879,7 @@ export default class ListOfCreditFacilities extends Component {
item.locf.bank_name === null ? null : item.locf.bank_name === "" ? null : { value: item.locf.bank_name },
item.locf.type_of_credit === null ? null : item.locf.type_of_credit === "" ? null : { value: item.locf.type_of_credit },
item.locf.remarks === null || item.locf.remarks === "" ? "" : item.locf.remarks,
item.locf.remarks2 === null ? null : item.locf.remarks2 === "" ? null : { value: item.locf.remarks2 },
item.locf.loan_maturity_date == null || item.locf.loan_maturity_date == "" ? null : (item.locf.loan_maturity_date !== "null" ? String(tgl[2]).length > 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(item.locf.loan_maturity_date) : null),
item.locf.interest === null || item.locf.interest === "" ? "0.00" : item.locf.interest,
item.locf.currency === null || item.locf.currency === "" ? "" : item.locf.currency,
......@@ -942,6 +943,7 @@ export default class ListOfCreditFacilities extends Component {
item.locf.bank_name === null ? null : item.locf.bank_name === "" ? null : { value: item.locf.bank_name },
item.locf.type_of_credit === null ? null : item.locf.type_of_credit === "" ? null : { value: item.locf.type_of_credit },
item.locf.remarks === null || item.locf.remarks === "" ? "" : item.locf.remarks,
item.locf.remarks2 === null ? null : item.locf.remarks2 === "" ? null : { value: item.locf.remarks2 },
item.locf.loan_maturity_date == null || item.locf.loan_maturity_date == "" ? null : (item.locf.loan_maturity_date !== "null" ? String(tgl[2]).length > 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(item.locf.loan_maturity_date) : null),
item.locf.interest === null || item.locf.interest === "" ? "0.00" : item.locf.interest,
item.locf.currency === null || item.locf.currency === "" ? "" : item.locf.currency,
......@@ -994,6 +996,7 @@ export default class ListOfCreditFacilities extends Component {
})
let lastArrayLOCF = dataTablelocf[res.length - 1]
console.log(dataTablelocf);
if (bankNameEmpty) {
if (this.state.get_for == 'view') {
this.setState({ saveDraft: false, saveComp: true })
......@@ -1004,10 +1007,10 @@ export default class ListOfCreditFacilities extends Component {
if (this.state.get_for == 'view') {
console.log("view");
} else {
this.setState({ saveDraft: false, saveComp: lastArrayLOCF[46] == 0 || lastArrayLOCF[46] == '0.0' || lastArrayLOCF[46] == "-0.0" ? false : true })
this.setState({ saveDraft: false, saveComp: lastArrayLOCF[47] == 0 || lastArrayLOCF[47] == '0.0' || lastArrayLOCF[47] == "-0.0" ? false : true })
}
}
this.setState({ dataTablelocf, diffLOCF: lastArrayLOCF[46], totalLoanLOCF: lastArrayLOCF[47], perBSLOCF: lastArrayLOCF[48], loading: false }, () => {
this.setState({ dataTablelocf, diffLOCF: lastArrayLOCF[47], totalLoanLOCF: lastArrayLOCF[48], perBSLOCF: lastArrayLOCF[49], loading: false }, () => {
this.handleCalculateLOV()
})
}
......@@ -1205,46 +1208,47 @@ export default class ListOfCreditFacilities extends Component {
"bank_name": i[6] == null ? [6] : i[6].value,
"type_of_credit": i[7] == null ? i[7] : i[7].value,
"remarks": i[8],
"remarks2": i[9] == null ? i[9] : i[9].value,
// "loan_maturity_date": i[9],
"loan_maturity_date": i[9] == undefined || i[9] == "null" || i[9] == null ? "" : (String(tgl[2]).length <= 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])),
"loan_maturity_date": i[10] == undefined || i[10] == "null" || i[10] == null ? "" : (String(tgl[2]).length <= 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[10])),
// "loan_maturity_date": i[9] !== undefined || i[9] !== "null" || i[9] !== null? (String(tgl[2]).length <= 2? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])) : "",
"interest": i[10] == "" ? "0.00" : i[10],
"currency": i[11],
"loan_plafond_amount_ori": Number(i[12]) == "" ? "0.0" : Number(i[12]),
"loan_plafond_amount_idr": Number(i[13]) == "" ? "0.0" : Number(i[13]),
"out_loan_ki_amount_ori": Number(i[14]) == "" ? "0.0" : Number(i[14]),
"out_loan_ki_amount_idr": Number(i[15]) == "" ? "0.0" : Number(i[15]),
"out_loan_kmk_amount_ori": Number(i[16]) == "" ? "0.0" : Number(i[16]),
"out_loan_kmk_amount_idr": Number(i[17]) == "" ? "0.0" : Number(i[17]),
"interest": i[11] == "" ? "0.00" : i[11],
"currency": i[12],
"loan_plafond_amount_ori": Number(i[13]) == "" ? "0.0" : Number(i[13]),
"loan_plafond_amount_idr": Number(i[14]) == "" ? "0.0" : Number(i[14]),
"out_loan_ki_amount_ori": Number(i[15]) == "" ? "0.0" : Number(i[15]),
"out_loan_ki_amount_idr": Number(i[16]) == "" ? "0.0" : Number(i[16]),
"out_loan_kmk_amount_ori": Number(i[17]) == "" ? "0.0" : Number(i[17]),
"out_loan_kmk_amount_idr": Number(i[18]) == "" ? "0.0" : Number(i[18]),
// "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18],
"out_loan_other_amount_ori": Number(i[19]) == "" ? "0.0" : Number(i[19]),
"out_loan_other_amount_idr": Number(i[20]) == "" ? "0.0" : Number(i[20]),
"total_out_loan_ori": Number(i[21]) == "" ? "0.0" : Number(i[21]),
"total_out_loan_idr": Number(i[22]) == "" ? "0.0" : Number(i[22]),
"remaining_plafond_ori": Number(i[23]) == "" ? "0.0" : Number(i[23]),
"remaining_plafond_idr": Number(i[24]) == "" ? "0.0" : Number(i[24]),
"current_ratio_financial": Number(i[25]) == "" ? "0.00" : Number(i[25]),
"current_ratio_current": Number(i[26]) == "" ? "0.00" : Number(i[26]),
"der_financial": Number(i[27]) == "" ? "0.00" : Number(i[27]),
"der_current": Number(i[28]) == "" ? "0.00" : Number(i[28]),
"debt_to_ebitda_financial": Number(i[29]) == "" ? "0.00" : Number(i[29]),
"debt_to_ebitda_current": Number(i[30]) == "" ? "0.00" : Number(i[30]),
"ebitda_to_interest_financial": Number(i[31]) == "" ? "0.00" : Number(i[31]),
"ebitda_to_interest_current": Number(i[32]) == "" ? "0.00" : Number(i[32]),
"other_ratio1_ratio_name": i[33],
"other_ratio1_financial": Number(i[34]) == "" ? "0.00" : Number(i[34]),
"other_ratio1_current": Number(i[35]) == "" ? "0.00" : Number(i[35]),
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": Number(i[37]) == "" ? "0.00" : Number(i[37]),
"other_ratio2_current": Number(i[38]) == "" ? "0.00" : Number(i[38]),
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": Number(i[40]) == "" ? "0.00" : Number(i[40]),
"other_ratio3_current": Number(i[41]) == "" ? "0.00" : Number(i[41]),
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": Number(i[43]) == "" ? "0.00" : Number(i[43]),
"other_ratio4_current": Number(i[44]) == "" ? "0.00" : Number(i[44]),
"notes": i[45],
"out_loan_other_type": i[19],
"out_loan_other_amount_ori": Number(i[20]) == "" ? "0.0" : Number(i[20]),
"out_loan_other_amount_idr": Number(i[21]) == "" ? "0.0" : Number(i[21]),
"total_out_loan_ori": Number(i[22]) == "" ? "0.0" : Number(i[22]),
"total_out_loan_idr": Number(i[23]) == "" ? "0.0" : Number(i[23]),
"remaining_plafond_ori": Number(i[24]) == "" ? "0.0" : Number(i[24]),
"remaining_plafond_idr": Number(i[25]) == "" ? "0.0" : Number(i[25]),
"current_ratio_financial": Number(i[26]) == "" ? "0.00" : Number(i[26]),
"current_ratio_current": Number(i[27]) == "" ? "0.00" : Number(i[27]),
"der_financial": Number(i[28]) == "" ? "0.00" : Number(i[28]),
"der_current": Number(i[29]) == "" ? "0.00" : Number(i[29]),
"debt_to_ebitda_financial": Number(i[30]) == "" ? "0.00" : Number(i[30]),
"debt_to_ebitda_current": Number(i[31]) == "" ? "0.00" : Number(i[31]),
"ebitda_to_interest_financial": Number(i[32]) == "" ? "0.00" : Number(i[32]),
"ebitda_to_interest_current": Number(i[33]) == "" ? "0.00" : Number(i[33]),
"other_ratio1_ratio_name": i[34],
"other_ratio1_financial": Number(i[35]) == "" ? "0.00" : Number(i[35]),
"other_ratio1_current": Number(i[36]) == "" ? "0.00" : Number(i[36]),
"other_ratio2_ratio_name": i[37],
"other_ratio2_financial": Number(i[38]) == "" ? "0.00" : Number(i[38]),
"other_ratio2_current": Number(i[39]) == "" ? "0.00" : Number(i[39]),
"other_ratio3_ratio_name": i[40],
"other_ratio3_financial": Number(i[41]) == "" ? "0.00" : Number(i[41]),
"other_ratio3_current": Number(i[42]) == "" ? "0.00" : Number(i[42]),
"other_ratio4_ratio_name": i[43],
"other_ratio4_financial": Number(i[44]) == "" ? "0.00" : Number(i[44]),
"other_ratio4_current": Number(i[45]) == "" ? "0.00" : Number(i[45]),
"notes": i[46],
})
} else {
data.push({
......@@ -1253,46 +1257,47 @@ export default class ListOfCreditFacilities extends Component {
"bank_name": i[6] == null ? [6] : i[6].value,
"type_of_credit": i[7] == null ? i[7] : i[7].value,
"remarks": i[8],
"remarks2": i[9] == null ? i[9] : i[9].value,
// "loan_maturity_date": i[9],
"loan_maturity_date": i[9] == undefined || i[9] == "null" || i[9] == null ? "" : (String(tgl[2]).length <= 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])),
"loan_maturity_date": i[10] == undefined || i[10] == "null" || i[10] == null ? "" : (String(tgl[2]).length <= 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[10])),
// "loan_maturity_date": i[9] !== undefined || i[9] !== "null" || i[9] !== null? (String(tgl[2]).length <= 2? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])) : "",
"interest": i[10] == "" ? "0.00" : i[10],
"currency": i[11],
"loan_plafond_amount_ori": fixNumber(Number(i[12]), 1) == "" ? "0.0" : fixNumber(Number(i[12]), 1),
"loan_plafond_amount_idr": fixNumber(Number(i[13]), 1) == "" ? "0.0" : fixNumber(Number(i[13]), 1),
"out_loan_ki_amount_ori": fixNumber(Number(i[14]), 1) == "" ? "0.0" : fixNumber(Number(i[14]), 1),
"out_loan_ki_amount_idr": fixNumber(Number(i[15]), 1) == "" ? "0.0" : fixNumber(Number(i[15]), 1),
"out_loan_kmk_amount_ori": fixNumber(Number(i[16]), 1) == "" ? "0.0" : fixNumber(Number(i[16]), 1),
"out_loan_kmk_amount_idr": fixNumber(Number(i[17]), 1) == "" ? "0.0" : fixNumber(Number(i[17]), 1),
"interest": i[11] == "" ? "0.00" : i[11],
"currency": i[12],
"loan_plafond_amount_ori": Number(i[13]) == "" ? "0.0" : Number(i[13]),
"loan_plafond_amount_idr": Number(i[14]) == "" ? "0.0" : Number(i[14]),
"out_loan_ki_amount_ori": Number(i[15]) == "" ? "0.0" : Number(i[15]),
"out_loan_ki_amount_idr": Number(i[16]) == "" ? "0.0" : Number(i[16]),
"out_loan_kmk_amount_ori": Number(i[17]) == "" ? "0.0" : Number(i[17]),
"out_loan_kmk_amount_idr": Number(i[18]) == "" ? "0.0" : Number(i[18]),
// "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18],
"out_loan_other_amount_ori": fixNumber(Number(i[19]), 1) == "" ? "0.0" : fixNumber(Number(i[19]), 1),
"out_loan_other_amount_idr": fixNumber(Number(i[20]), 1) == "" ? "0.0" : fixNumber(Number(i[20]), 1),
"total_out_loan_ori": fixNumber(Number(i[21]), 1) == "" ? "0.0" : fixNumber(Number(i[21]), 1),
"total_out_loan_idr": fixNumber(Number(i[22]), 1) == "" ? "0.0" : fixNumber(Number(i[22]), 1),
"remaining_plafond_ori": fixNumber(Number(i[23]), 1) == "" ? "0.0" : fixNumber(Number(i[23]), 1),
"remaining_plafond_idr": fixNumber(Number(i[24]), 1) == "" ? "0.0" : fixNumber(Number(i[24]), 1),
"current_ratio_financial": fixNumber(Number(i[25]), 2) == "" ? "0.00" : fixNumber(Number(i[25]), 2),
"current_ratio_current": fixNumber(Number(i[26]), 2) == "" ? "0.00" : fixNumber(Number(i[26]), 2),
"der_financial": fixNumber(Number(i[27]), 2) == "" ? "0.00" : fixNumber(Number(i[27]), 2),
"der_current": fixNumber(Number(i[28]), 2) == "" ? "0.00" : fixNumber(Number(i[28]), 2),
"debt_to_ebitda_financial": fixNumber(Number(i[29]), 2) == "" ? "0.00" : fixNumber(Number(i[29]), 2),
"debt_to_ebitda_current": fixNumber(Number(i[30]), 2) == "" ? "0.00" : fixNumber(Number(i[30]), 2),
"ebitda_to_interest_financial": fixNumber(Number(i[31]), 2) == "" ? "0.00" : fixNumber(Number(i[31]), 2),
"ebitda_to_interest_current": fixNumber(Number(i[32]), 2) == "" ? "0.00" : fixNumber(Number(i[32]), 2),
"other_ratio1_ratio_name": i[33],
"other_ratio1_financial": fixNumber(Number(i[34]), 2) == "" ? "0.00" : fixNumber(Number(i[34]), 2),
"other_ratio1_current": fixNumber(Number(i[35]), 2) == "" ? "0.00" : fixNumber(Number(i[35]), 2),
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": fixNumber(Number(i[37]), 2) == "" ? "0.00" : fixNumber(Number(i[37]), 2),
"other_ratio2_current": fixNumber(Number(i[38]), 2) == "" ? "0.00" : fixNumber(Number(i[38]), 2),
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": fixNumber(Number(i[40]), 2) == "" ? "0.00" : fixNumber(Number(i[40]), 2),
"other_ratio3_current": fixNumber(Number(i[41]), 2) == "" ? "0.00" : fixNumber(Number(i[41]), 2),
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": fixNumber(Number(i[43]), 2) == "" ? "0.00" : fixNumber(Number(i[43]), 2),
"other_ratio4_current": fixNumber(Number(i[44]), 2) == "" ? "0.00" : fixNumber(Number(i[44]), 2),
"notes": i[45],
"out_loan_other_type": i[19],
"out_loan_other_amount_ori": Number(i[20]) == "" ? "0.0" : Number(i[20]),
"out_loan_other_amount_idr": Number(i[21]) == "" ? "0.0" : Number(i[21]),
"total_out_loan_ori": Number(i[22]) == "" ? "0.0" : Number(i[22]),
"total_out_loan_idr": Number(i[23]) == "" ? "0.0" : Number(i[23]),
"remaining_plafond_ori": Number(i[24]) == "" ? "0.0" : Number(i[24]),
"remaining_plafond_idr": Number(i[25]) == "" ? "0.0" : Number(i[25]),
"current_ratio_financial": Number(i[26]) == "" ? "0.00" : Number(i[26]),
"current_ratio_current": Number(i[27]) == "" ? "0.00" : Number(i[27]),
"der_financial": Number(i[28]) == "" ? "0.00" : Number(i[28]),
"der_current": Number(i[29]) == "" ? "0.00" : Number(i[29]),
"debt_to_ebitda_financial": Number(i[30]) == "" ? "0.00" : Number(i[30]),
"debt_to_ebitda_current": Number(i[31]) == "" ? "0.00" : Number(i[31]),
"ebitda_to_interest_financial": Number(i[32]) == "" ? "0.00" : Number(i[32]),
"ebitda_to_interest_current": Number(i[33]) == "" ? "0.00" : Number(i[33]),
"other_ratio1_ratio_name": i[34],
"other_ratio1_financial": Number(i[35]) == "" ? "0.00" : Number(i[35]),
"other_ratio1_current": Number(i[36]) == "" ? "0.00" : Number(i[36]),
"other_ratio2_ratio_name": i[37],
"other_ratio2_financial": Number(i[38]) == "" ? "0.00" : Number(i[38]),
"other_ratio2_current": Number(i[39]) == "" ? "0.00" : Number(i[39]),
"other_ratio3_ratio_name": i[40],
"other_ratio3_financial": Number(i[41]) == "" ? "0.00" : Number(i[41]),
"other_ratio3_current": Number(i[42]) == "" ? "0.00" : Number(i[42]),
"other_ratio4_ratio_name": i[43],
"other_ratio4_financial": Number(i[44]) == "" ? "0.00" : Number(i[44]),
"other_ratio4_current": Number(i[45]) == "" ? "0.00" : Number(i[45]),
"notes": i[46],
})
}
......
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