Skip to content

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

Merge branch 'riri' into 'master' 

tofixed

See merge request !1053
parents 5837cac9 1a981588
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 62 deletions
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ a8884d63
......@@ -698,40 +698,40 @@ export default class ListOfCreditFacilities extends Component {
// "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": i[12] == ""? "0.0" : i[12],
"loan_plafond_amount_idr": i[13] == ""? "0.0" : i[13],
"out_loan_ki_amount_ori": i[14] == ""? "0.0" : i[14],
"out_loan_ki_amount_idr": i[15] == ""? "0.0" : i[15],
"out_loan_kmk_amount_ori": i[16] == ""? "0.0" : i[16],
"out_loan_kmk_amount_idr": i[17] == ""? "0.0" : i[17],
"loan_plafond_amount_ori": Number(i[12]).toFixed(1) == ""? "0.0" : Number(i[12]).toFixed(1),
"loan_plafond_amount_idr": Number(i[13]).toFixed(1) == ""? "0.0" : Number(i[13]).toFixed(1),
"out_loan_ki_amount_ori": Number(i[14]).toFixed(1) == ""? "0.0" : Number(i[14]).toFixed(1),
"out_loan_ki_amount_idr": Number(i[15]).toFixed(1) == ""? "0.0" : Number(i[15]).toFixed(1),
"out_loan_kmk_amount_ori": Number(i[16]).toFixed(1) == ""? "0.0" : Number(i[16]).toFixed(1),
"out_loan_kmk_amount_idr": Number(i[17]).toFixed(1) == ""? "0.0" : Number(i[17]).toFixed(1),
// "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18],
"out_loan_other_amount_ori": i[19] == ""? "0.0" : i[19],
"out_loan_other_amount_idr": i[20] == ""? "0.0" : i[20],
"total_out_loan_ori": i[21] == ""? "0.0" : i[21],
"total_out_loan_idr": i[22] == ""? "0.0" : i[22],
"remaining_plafond_ori": i[23] == ""? "0.0" : i[23],
"remaining_plafond_idr": i[24] == ""? "0.0" : i[24],
"current_ratio_financial": i[25] == ""? "0.00" : i[25],
"current_ratio_current": i[26] == ""? "0.00" : i[26],
"der_financial": i[27] == ""? "0.00" : i[27],
"der_current": i[28] == ""? "0.00" : i[28],
"debt_to_ebitda_financial": i[29] == ""? "0.00" : i[29],
"debt_to_ebitda_current": i[30] == ""? "0.00" : i[30],
"ebitda_to_interest_financial": i[31] == ""? "0.00" : i[31],
"ebitda_to_interest_current": i[32] == ""? "0.00" : i[32],
"out_loan_other_amount_ori": Number(i[19]).toFixed(1) == ""? "0.0" : Number(i[19]).toFixed(1),
"out_loan_other_amount_idr": Number(i[20]).toFixed(1) == ""? "0.0" : Number(i[20]).toFixed(1),
"total_out_loan_ori": Number(i[21]).toFixed(1) == ""? "0.0" : Number(i[21]).toFixed(1),
"total_out_loan_idr": Number(i[22]).toFixed(1) == ""? "0.0" : Number(i[22]).toFixed(1),
"remaining_plafond_ori": Number(i[23]).toFixed(1) == ""? "0.0" : Number(i[23]).toFixed(1),
"remaining_plafond_idr": Number(i[24]).toFixed(1) == ""? "0.0" : Number(i[24]).toFixed(1),
"current_ratio_financial": Number(i[25]).toFixed(2) == ""? "0.00" : Number(i[25]).toFixed(2),
"current_ratio_current": Number(i[26]).toFixed(2) == ""? "0.00" : Number(i[26]).toFixed(2),
"der_financial": Number(i[27]).toFixed(2) == ""? "0.00" : Number(i[27]).toFixed(2),
"der_current": Number(i[28]).toFixed(2) == ""? "0.00" : Number(i[28]).toFixed(2),
"debt_to_ebitda_financial": Number(i[29]).toFixed(2) == ""? "0.00" : Number(i[29]).toFixed(2),
"debt_to_ebitda_current": Number(i[30]).toFixed(2) == ""? "0.00" : Number(i[30]).toFixed(2),
"ebitda_to_interest_financial": Number(i[31]).toFixed(2) == ""? "0.00" : Number(i[31]).toFixed(2),
"ebitda_to_interest_current": Number(i[32]).toFixed(2) == ""? "0.00" : Number(i[32]).toFixed(2),
"other_ratio1_ratio_name": i[33],
"other_ratio1_financial": i[34] == ""? "0.00" : i[34],
"other_ratio1_current": i[35] == ""? "0.00" : i[35],
"other_ratio1_financial": Number(i[34]).toFixed(2) == ""? "0.00" : Number(i[34]).toFixed(2),
"other_ratio1_current": Number(i[35]).toFixed(2) == ""? "0.00" : Number(i[35]).toFixed(2),
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": i[37] == ""? "0.00" : i[37],
"other_ratio2_current": i[38] == ""? "0.00" : i[38],
"other_ratio2_financial": Number(i[37]).toFixed(2) == ""? "0.00" : Number(i[37]).toFixed(2),
"other_ratio2_current": Number(i[38]).toFixed(2) == ""? "0.00" : Number(i[38]).toFixed(2),
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": i[40] == ""? "0.00" : i[40],
"other_ratio3_current": i[41] == ""? "0.00" : i[41],
"other_ratio3_financial": Number(i[40]).toFixed(2) == ""? "0.00" : Number(i[40]).toFixed(2),
"other_ratio3_current": Number(i[41]).toFixed(2) == ""? "0.00" : Number(i[41]).toFixed(2),
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": i[43] == ""? "0.00" : i[43],
"other_ratio4_current": i[44] == ""? "0.00" : i[44],
"other_ratio4_financial": Number(i[43]).toFixed(2) == ""? "0.00" : Number(i[43]).toFixed(2),
"other_ratio4_current": Number(i[44]).toFixed(2) == ""? "0.00" : Number(i[44]).toFixed(2),
"notes": i[45],
})
}
......@@ -1094,40 +1094,40 @@ export default class ListOfCreditFacilities extends Component {
// "loan_maturity_date": i[9],
"interest": i[10] == ""? "0.00" : i[10],
"currency": i[11],
"loan_plafond_amount_ori": i[12] == ""? "0.0" : i[12],
"loan_plafond_amount_idr": i[13] == ""? "0.0" : i[13],
"out_loan_ki_amount_ori": i[14] == ""? "0.0" : i[14],
"out_loan_ki_amount_idr": i[15] == ""? "0.0" : i[15],
"out_loan_kmk_amount_ori": i[16] == ""? "0.0" : i[16],
"out_loan_kmk_amount_idr": i[17] == ""? "0.0" : i[17],
"loan_plafond_amount_ori": Number(i[12]).toFixed(1) == ""? "0.0" : Number(i[12]).toFixed(1),
"loan_plafond_amount_idr": Number(i[13]).toFixed(1) == ""? "0.0" : Number(i[13]).toFixed(1),
"out_loan_ki_amount_ori": Number(i[14]).toFixed(1) == ""? "0.0" : Number(i[14]).toFixed(1),
"out_loan_ki_amount_idr": Number(i[15]).toFixed(1) == ""? "0.0" : Number(i[15]).toFixed(1),
"out_loan_kmk_amount_ori": Number(i[16]).toFixed(1) == ""? "0.0" : Number(i[16]).toFixed(1),
"out_loan_kmk_amount_idr": Number(i[17]).toFixed(1) == ""? "0.0" : Number(i[17]).toFixed(1),
// "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18],
"out_loan_other_amount_ori": i[19] == ""? "0.0" : i[19],
"out_loan_other_amount_idr": i[20] == ""? "0.0" : i[20],
"total_out_loan_ori": i[21] == ""? "0.0" : i[21],
"total_out_loan_idr": i[22] == ""? "0.0" : i[22],
"remaining_plafond_ori": i[23] == ""? "0.0" : i[23],
"remaining_plafond_idr": i[24] == ""? "0.0" : i[24],
"current_ratio_financial": i[25] == ""? "0.00" : i[25],
"current_ratio_current": i[26] == ""? "0.00" : i[26],
"der_financial": i[27] == ""? "0.00" : i[27],
"der_current": i[28] == ""? "0.00" : i[28],
"debt_to_ebitda_financial": i[29] == ""? "0.00" : i[29],
"debt_to_ebitda_current": i[30] == ""? "0.00" : i[30],
"ebitda_to_interest_financial": i[31] == ""? "0.00" : i[31],
"ebitda_to_interest_current": i[32] == ""? "0.00" : i[32],
"out_loan_other_amount_ori": Number(i[19]).toFixed(1) == ""? "0.0" : Number(i[19]).toFixed(1),
"out_loan_other_amount_idr": Number(i[20]).toFixed(1) == ""? "0.0" : Number(i[20]).toFixed(1),
"total_out_loan_ori": Number(i[21]).toFixed(1) == ""? "0.0" : Number(i[21]).toFixed(1),
"total_out_loan_idr": Number(i[22]).toFixed(1) == ""? "0.0" : Number(i[22]).toFixed(1),
"remaining_plafond_ori": Number(i[23]).toFixed(1) == ""? "0.0" : Number(i[23]).toFixed(1),
"remaining_plafond_idr": Number(i[24]).toFixed(1) == ""? "0.0" : Number(i[24]).toFixed(1),
"current_ratio_financial": Number(i[25]).toFixed(2) == ""? "0.00" : Number(i[25]).toFixed(2),
"current_ratio_current": Number(i[26]).toFixed(2) == ""? "0.00" : Number(i[26]).toFixed(2),
"der_financial": Number(i[27]).toFixed(2) == ""? "0.00" : Number(i[27]).toFixed(2),
"der_current": Number(i[28]).toFixed(2) == ""? "0.00" : Number(i[28]).toFixed(2),
"debt_to_ebitda_financial": Number(i[29]).toFixed(2) == ""? "0.00" : Number(i[29]).toFixed(2),
"debt_to_ebitda_current": Number(i[30]).toFixed(2) == ""? "0.00" : Number(i[30]).toFixed(2),
"ebitda_to_interest_financial": Number(i[31]).toFixed(2) == ""? "0.00" : Number(i[31]).toFixed(2),
"ebitda_to_interest_current": Number(i[32]).toFixed(2) == ""? "0.00" : Number(i[32]).toFixed(2),
"other_ratio1_ratio_name": i[33],
"other_ratio1_financial": i[34] == ""? "0.00" : i[34],
"other_ratio1_current": i[35] == ""? "0.00" : i[35],
"other_ratio1_financial": Number(i[34]).toFixed(2) == ""? "0.00" : Number(i[34]).toFixed(2),
"other_ratio1_current": Number(i[35]).toFixed(2) == ""? "0.00" : Number(i[35]).toFixed(2),
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": i[37] == ""? "0.00" : i[37],
"other_ratio2_current": i[38] == ""? "0.00" : i[38],
"other_ratio2_financial": Number(i[37]).toFixed(2) == ""? "0.00" : Number(i[37]).toFixed(2),
"other_ratio2_current": Number(i[38]).toFixed(2) == ""? "0.00" : Number(i[38]).toFixed(2),
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": i[40] == ""? "0.00" : i[40],
"other_ratio3_current": i[41] == ""? "0.00" : i[41],
"other_ratio3_financial": Number(i[40]).toFixed(2) == ""? "0.00" : Number(i[40]).toFixed(2),
"other_ratio3_current": Number(i[41]).toFixed(2) == ""? "0.00" : Number(i[41]).toFixed(2),
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": i[43] == ""? "0.00" : i[43],
"other_ratio4_current": i[44] == ""? "0.00" : i[44],
"other_ratio4_financial": Number(i[43]).toFixed(2) == ""? "0.00" : Number(i[43]).toFixed(2),
"other_ratio4_current": Number(i[44]).toFixed(2) == ""? "0.00" : Number(i[44]).toFixed(2),
"notes": i[45],
})
}
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ a8884d63
......@@ -384,11 +384,11 @@ export default class ProfitLossMR extends Component {
"ytd_actual": String(Number(i[11]).toFixed(1)),
"actual_previous_month": String(Number(i[12]).toFixed(1)),
"amount_act_vs_previous_month": String(Number(i[13]).toFixed(1)),
"percent_act_vs_previous_month": String(Number(i[14]).toFixed(1)),
"percent_act_vs_previous_month": i[14],
"amount_act_vs_mb": String(Number(i[15]).toFixed(1)),
"percent_act_vs_mb": String(Number(i[16]).toFixed(1)),
"percent_act_vs_mb": i[16],
"amount_act_vs_rb": String(Number(i[17]).toFixed(1)),
"percent_act_vs_rb": String(Number(i[18]).toFixed(1)),
"percent_act_vs_rb": i[18],
"mtd_vs_mb": String(i[19]),
"mtd_vs_rb": String(i[20]),
"mtd_vs_previous_month": String(i[21]),
......@@ -542,11 +542,11 @@ export default class ProfitLossMR extends Component {
ytd_actual: String(Number(i[11]).toFixed(1)),
actual_previous_month: String(Number(i[12]).toFixed(1)),
amount_act_vs_previous_month: String(Number(i[13]).toFixed(1)),
percent_act_vs_previous_month: String(Number(i[14]).toFixed(1)),
percent_act_vs_previous_month: i[14],
amount_act_vs_mb: String(Number(i[15]).toFixed(1)),
percent_act_vs_mb: String(Number(i[16]).toFixed(1)),
percent_act_vs_mb: i[16],
amount_act_vs_rb: String(Number(i[17]).toFixed(1)),
percent_act_vs_rb: String(Number(i[18]).toFixed(1)),
percent_act_vs_rb: i[18],
mtd_vs_mb: String(i[19]),
mtd_vs_rb: String(i[20]),
mtd_vs_previous_month: String(i[21]),
......
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