Commit ab777c93 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

tofixed cat

See merge request !1050
parents e08f3ed2 95753115
......@@ -447,7 +447,7 @@ export default class CorporateAnnualTargetMR extends Component {
actual_monthly: String(Number(i[11]).toFixed(1)),
target_monthly: String(Number(i[12]).toFixed(1)),
achivement_monthly: String(Number(i[13]).toFixed(1)),
score: String(Number(i[14]).toFixed(1)),
score: String(Number(i[14]).toFixed(0)),
score_x_weight: String(Number(i[15]).toFixed(2)),
notes: String(i[16]).trim()
})
......@@ -591,10 +591,10 @@ export default class CorporateAnnualTargetMR extends Component {
"max_ach": i[9] == null ? "" : i[9],
"formula_ytd": i[10] == null ? "" : i[10],
"actual_monthly": i[11] == null || i[11] == "" ? 0.0 : String(Number(i[11]).toFixed(1)),
"target_monthly": i[12] == null || i[12] == "" ? 0.0 : i[12],
"target_monthly": i[12] == null || i[12] == "" ? 0.0 : String(Number(i[12]).toFixed(1)),
"achivement_monthly": String(Number(i[13]).toFixed(1)),
"score": i[14],
"score_x_weight": i[15],
"score": String(Number(i[14]).toFixed(0)),
"score_x_weight": String(Number(i[15]).toFixed(2)),
"notes": i[16]
})
})
......
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