Merge branch 'GGMAC' into 'master'

cat issue

See merge request !1483

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -116,7 +116,7 @@ export default class CorporateAnnualTargetRO extends Component {
         }
 
         this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
-        // this.setState({viewOnly: true})
+        // this.setState({ viewOnly: true })
     }
 
     getItemHierarki() {
@@ -149,7 +149,7 @@ export default class CorporateAnnualTargetRO extends Component {
                                     item.formula,
                                     item.level,
                                     item.description,
-                                    item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
+                                    item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(item.corporate_annual_target.weight).toFixed(1),
                                     parentTrue ? item.corporate_annual_target.uom : item.uom,
                                     parentTrue ? item.corporate_annual_target.kpi == "" ? null : { value: item.corporate_annual_target.kpi } : item.kpi_type == "" ? null : { value: item.kpi_type },
                                     parentTrue ? item.corporate_annual_target.max_ach == "" ? null : { value: titleCase(item.corporate_annual_target.max_ach) } : item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
@@ -188,7 +188,8 @@ export default class CorporateAnnualTargetRO extends Component {
                                 item.formula,
                                 item.level,
                                 item.description,
-                                item.weight == '' ? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
+                                // item.weight == '' ? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
+                                item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(item.corporate_annual_target.weight).toFixed(1),
                                 item.corporate_annual_target.uom,
                                 item.kpi_type == "" ? null : { value: item.kpi_type },
                                 item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
@@ -530,7 +531,7 @@ export default class CorporateAnnualTargetRO extends Component {
                                 item.formula,
                                 item.level,
                                 item.item_report,
-                                Number(String(item.weight).substr(0,String(item.weight).length-1)),
+                                Number(String(item.weight).substr(0, String(item.weight).length - 1)),
                                 item.uom,
                                 item.kpi == "" || item.kpi == null ? null : { value: item.kpi },
                                 item.max_ach == "" || item.max_ach == null ? null : { value: titleCase(item.max_ach) },