Skip to content

T
Tia-dev
Commit 19fee03c authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'GGMAC' into 'master' 

update issue CAT

See merge request !1482
parents db245709 09fc9db3
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 19fee03c
...@@ -217,7 +217,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -217,7 +217,7 @@ export default class CorporateAnnualTarget extends Component {
item.level, item.level,
"", "",
item.description, item.description,
item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(Number(String(item.cat.weight).substr(0, String(item.cat.weight).length - 1)).toFixed(1)) + '%'), item.type_report_id == 1 ? (`${String(item.weight).includes('%')? String(item.weight) : String((Number(item.weight) * 100) + '% ')}`) : (String(Number(String(item.cat.weight).substr(0, String(item.cat.weight).length - 1)).toFixed(1)) + '%'),
item.cat.uom, item.cat.uom,
item.kpi_type == "" ? null : { value: item.kpi_type }, item.kpi_type == "" ? null : { value: item.kpi_type },
item.max_ach == "" ? null : { value: titleCase(item.max_ach) }, item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
...@@ -513,7 +513,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -513,7 +513,7 @@ export default class CorporateAnnualTarget extends Component {
item.level == null ? 1 : item.level, item.level == null ? 1 : item.level,
"", "",
item.item_report, item.item_report,
item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(item.weight)), item.type_report_id == 1 ? (`${String(item.weight).includes('%')? String(item.weight) : String((Number(item.weight) * 100) + '% ')}`) : (String(item.weight)),
item.uom, item.uom,
item.kpi_type == "" || item.kpi_type == null ? null : { value: item.kpi_type }, item.kpi_type == "" || item.kpi_type == null ? null : { value: item.kpi_type },
item.max_ach == "" || item.max_ach == null ? null : { value: titleCase(item.max_ach) }, item.max_ach == "" || item.max_ach == null ? null : { value: titleCase(item.max_ach) },
......
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