Merge branch 'didam' into 'master'

aman

See merge request !359

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -113,7 +113,7 @@ export default class CorporateAnnualTarget extends Component {
                         item.level,
                         "",
                         item.description,
-                        item.type_report_id == 1? `${Number(item.weight) * 100}%` : (String(item.cat.weight).includes('%')? `${Number(String(item.cat.weight).replace('%', '')) * 100}%` : `${Number(item.cat.weight) * 100}%`),
+                        item.type_report_id == 1? `${Number(item.weight) * 100}%` : item.cat.weight,
                         item.cat.uom,
                         item.cat.kpi_type == "" ? null : {value: item.cat.kpi_type},
                         item.cat.max_ach == "" ? null : {value: item.cat.max_ach},
@@ -155,7 +155,7 @@ export default class CorporateAnnualTarget extends Component {
                     item.level,
                     "",
                     item.description,
-                    item.type_report_id == 1? `${Number(item.weight) * 100}%` : (String(item.cat.weight).includes('%')? `${Number(String(item.cat.weight).replace('%', '')) * 100}%` : `${Number(item.cat.weight) * 100}%`),
+                    item.type_report_id == 1? `${Number(item.weight) * 100}%` : item.cat.weight,
                     item.cat.uom,
                     item.cat.kpi_type == "" ? null : {value: item.cat.kpi_type},
                     item.cat.max_ach == "" ? null : {value: item.cat.max_ach},