Merge branch 'GGMAC' into 'master'

update

See merge request !1514

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -141,7 +141,7 @@ export default class CorporateAnnualTargetRO extends Component {
                             let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
                             if (indexIDzz === -1) {
                                 let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
-                                let weight = String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)
+                                let weight = String(item.corporate_annual_target.weight).includes('%')? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight)
                                 dataTable.push([
                                     item.type_report_id,
                                     item.id,
@@ -189,7 +189,7 @@ export default class CorporateAnnualTargetRO extends Component {
                                 item.formula,
                                 item.level,
                                 item.description,
-                                item.weight == '' ? Number(weight).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
+                                item.corporate_annual_target.weight == '' ? Number(item.weight * 100).toFixed(1) : Number(weight).toFixed(1),
                                 // item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(Number(weight * 100)).toFixed(1),
                                 item.corporate_annual_target.uom,
                                 item.kpi_type == "" ? null : { value: item.kpi_type },