Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -211,7 +211,7 @@ export default class CorporateAnnualTargetMR 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.weight).substr(0, String(item.weight).length - 1)
                             // console.log(weight)
                             dataTable.push([
                                 item.type_report_id,
@@ -220,7 +220,8 @@ export default class CorporateAnnualTargetMR 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(weight).toFixed(1),
+                                parentTrue ? weight : item.corporate_annual_target.weight,
                                 parentTrue ? item.corporate_annual_target.uom : item.uom,
                                 parentTrue ? item.corporate_annual_target.jenis_kpi == "" ? null : item.corporate_annual_target.jenis_kpi : item.jenis_kpi == "" ? null : item.kpi_type,
                                 // parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : { value: item.corporate_annual_target.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type },

src/container/SummaryTriputra/TableSummaryTriputra.js

@@ -3809,7 +3809,7 @@ export default class TableSummaryTriputra extends Component {
                     display: false
                 }
             }, {
-                name: `Total Equility`,
+                name: `Total Equity`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >