Commit accce8b8 authored by fahrur huzain's avatar fahrur huzain

Merge branch 'dev/fahrur-new' into 'ENV-DEV'

issue CAT  total score

See merge request !2338
parents 086689b1 e392cb23
......@@ -505,8 +505,8 @@ export default class CorporateAnnualTargetMR extends Component {
jenis_kpi: i[8] == null ? "" : i[8],
max_ach: i[9] == null ? "" : i[9],
formula_ytd: i[10] == null ? "" : i[10],
actual_monthly: String(fixNumber(Number(i[11]), 1)),
target_monthly: String(fixNumber(Number(i[12]), 1)),
actual_monthly: String(Number(i[11])),
target_monthly: String(Number(i[12])),
achivement_monthly: String(fixNumber(Number(i[13]), 1)),
score: String(fixNumber(Number(i[14]), 0)),
score_x_weight: String(fixNumber(Number(i[15]), 2)),
......@@ -681,8 +681,8 @@ export default class CorporateAnnualTargetMR extends Component {
"jenis_kpi": i[8] == null ? "" : i[8],
"max_ach": i[9] == null ? "" : i[9],
"formula_ytd": i[10] == null ? "" : i[10],
"actual_monthly": i[11] == null || i[11] == "" ? 0.0 : String(fixNumber(Number(i[11]), 1)),
"target_monthly": i[12] == null || i[12] == "" ? 0.0 : String(fixNumber(Number(i[12]), 1)),
"actual_monthly": i[11] == null || i[11] == "" ? 0.0 : String(Number(i[11])),
"target_monthly": i[12] == null || i[12] == "" ? 0.0 : String(Number(i[12])),
"achivement_monthly": String(fixNumber(Number(i[13]), 1)),
"score": String(fixNumber(Number(i[14]), 0)),
"score_x_weight": String(fixNumber(Number(i[15]), 2)),
......
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