Commit 97968182 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

issue dbratio

See merge request !1167
parents b7253bb8 a98583ab
...@@ -924,20 +924,20 @@ export default class SubHolding extends Component { ...@@ -924,20 +924,20 @@ export default class SubHolding extends Component {
item.description, item.description,
item.uom, item.uom,
item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before, item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
Number(item.ratio.january).toFixed(1), item.ratio.january,
Number(item.ratio.february).toFixed(1), item.ratio.february,
Number(item.ratio.march).toFixed(1), item.ratio.march,
Number(item.ratio.april).toFixed(1), item.ratio.april,
Number(item.ratio.may).toFixed(1), item.ratio.may,
Number(item.ratio.june).toFixed(1), item.ratio.june,
Number(item.ratio.july).toFixed(1), item.ratio.july,
Number(item.ratio.august).toFixed(1), item.ratio.august,
Number(item.ratio.september).toFixed(1), item.ratio.september,
Number(item.ratio.october).toFixed(1), item.ratio.october,
Number(item.ratio.november).toFixed(1), item.ratio.november,
Number(item.ratio.december).toFixed(1), item.ratio.december,
Number(item.ratio.total_next_year).toFixed(1), item.ratio.total_next_year,
Number(item.ratio.total_more_year).toFixed(1), item.ratio.total_more_year,
item.ratio.monthly_january, item.ratio.monthly_january,
item.ratio.monthly_february, item.ratio.monthly_february,
item.ratio.monthly_march, item.ratio.monthly_march,
...@@ -982,20 +982,20 @@ export default class SubHolding extends Component { ...@@ -982,20 +982,20 @@ export default class SubHolding extends Component {
item.description, item.description,
item.oum, item.oum,
item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before, item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
Number(item.ratio.january).toFixed(1), item.ratio.january,
Number(item.ratio.february).toFixed(1), item.ratio.february,
Number(item.ratio.march).toFixed(1), item.ratio.march,
Number(item.ratio.april).toFixed(1), item.ratio.april,
Number(item.ratio.may).toFixed(1), item.ratio.may,
Number(item.ratio.june).toFixed(1), item.ratio.june,
Number(item.ratio.july).toFixed(1), item.ratio.july,
Number(item.ratio.august).toFixed(1), item.ratio.august,
Number(item.ratio.september).toFixed(1), item.ratio.september,
Number(item.ratio.october).toFixed(1), item.ratio.october,
Number(item.ratio.november).toFixed(1), item.ratio.november,
Number(item.ratio.december).toFixed(1), item.ratio.december,
Number(item.ratio.total_next_year).toFixed(1), item.ratio.total_next_year,
Number(item.ratio.total_more_year).toFixed(1), item.ratio.total_more_year,
item.ratio.monthly_january, item.ratio.monthly_january,
item.ratio.monthly_february, item.ratio.monthly_february,
item.ratio.monthly_march, item.ratio.monthly_march,
......
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