Merge branch 'faisal' into 'master'

cat pq!

See merge request !1425

src/container/Laporan/SubHolding.js

@@ -2906,26 +2906,30 @@ export default class SubHolding extends Component {
                                     item.itemName,
                                     item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
                                     item.corporate_annual_target.uom,
+                                    item.corporate_annual_target.kpiType,
+                                    item.corporate_annual_target.maxAch,
+                                    item.corporate_annual_target.formulaYtd,
 
                                     item.corporate_annual_target.lastYearActualQx,
-                                    item.corporate_annual_target.thisYearPercentGrowthYoy,
                                     item.corporate_annual_target.lastYearActualFy,
-
+                                    
                                     item.corporate_annual_target.thisYearbudgetQx,
                                     item.corporate_annual_target.thisYearActualQx,
                                     item.corporate_annual_target.thisYearPercentAch,
+                                    item.corporate_annual_target.thisYearPercentGrowthYoy,
                                     item.corporate_annual_target.thisYearScore,
                                     item.corporate_annual_target.thisYearScoreXWeight,
 
                                     item.corporate_annual_target.thisYearBudgetYtd,
                                     item.corporate_annual_target.thisYearActualYtd,
                                     item.corporate_annual_target.thisYearPercentAchYtd,
-                                    item.corporate_annual_target.thisYearScoreFy,
-                                    item.corporate_annual_target.thisYearScoreXWeightFy,
 
                                     item.corporate_annual_target.thisYearBudgetFy,
                                     item.corporate_annual_target.thisYearOlFy,
-                                    percentVar,
+                                    item.corporate_annual_target.thisYearPercentAchFy,
+                                    item.corporate_annual_target.thisYearScoreFy,
+                                    item.corporate_annual_target.thisYearScoreXWeightFy,
+
                                     item.orders
                                 ])
                             }
@@ -2947,26 +2951,30 @@ export default class SubHolding extends Component {
                                 item.itemName,
                                 item.weight == '' ? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
                                 item.uom,
+                                item.typeKpi,
+                                item.maxAch,
+                                item.formulaYtd,
 
                                 item.corporate_annual_target.lastYearActualQx,
-                                item.corporate_annual_target.thisYearPercentGrowthYoy,
                                 item.corporate_annual_target.lastYearActualFy,
-
+                                
                                 item.corporate_annual_target.thisYearbudgetQx,
                                 item.corporate_annual_target.thisYearActualQx,
                                 item.corporate_annual_target.thisYearPercentAch,
+                                item.corporate_annual_target.thisYearPercentGrowthYoy,
                                 item.corporate_annual_target.thisYearScore,
                                 item.corporate_annual_target.thisYearScoreXWeight,
 
                                 item.corporate_annual_target.thisYearBudgetYtd,
                                 item.corporate_annual_target.thisYearActualYtd,
                                 item.corporate_annual_target.thisYearPercentAchYtd,
-                                item.corporate_annual_target.thisYearScoreFy,
-                                item.corporate_annual_target.thisYearScoreXWeightFy,
 
                                 item.corporate_annual_target.thisYearBudgetFy,
                                 item.corporate_annual_target.thisYearOlFy,
-                                "",
+                                item.corporate_annual_target.thisYearPercentAchFy,
+                                item.corporate_annual_target.thisYearScoreFy,
+                                item.corporate_annual_target.thisYearScoreXWeightFy,
+                                
                                 item.orders
                             ])
                             if (item.children !== null) {
@@ -3899,7 +3907,7 @@ export default class SubHolding extends Component {
             }
         } else if (this.state.report.value === 11) {
             let res = await fetch(
-                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/quarterly/export_report?report_id=17&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&quarter=${this.state.quarter}`
+                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/quarterly/export_report?report_id=17&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&quarter=${this.state.quarter.name}`
             )
             console.log(res);
             res = await res.blob()