Merge branch 'GGMAC' into 'master'

update isssue 8jun

See merge request !1501

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -212,6 +212,7 @@ export default class CorporateAnnualTargetMR extends Component {
                         if (indexIDzz === -1) {
                             let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
                             let weight = String(item.weight).substr(0, String(item.weight).length - 1)
+                            let weightTB = String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)
                             // console.log(weight)
                             dataTable.push([
                                 item.type_report_id,
@@ -221,7 +222,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                 item.level,
                                 item.description,
                                 // item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
-                                parentTrue ? weight : item.corporate_annual_target.weight,
+                                parentTrue ? weight : weightTB,
                                 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 },
@@ -330,8 +331,9 @@ export default class CorporateAnnualTargetMR extends Component {
     }
 
     downloadTemplate = async () => {
+        console.log(`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&${this.props.periode}`)
         let res = await fetch(
-            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=2021`
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&${this.props.periode}`
         )
         console.log(res);
         res = await res.blob()
@@ -417,7 +419,7 @@ export default class CorporateAnnualTargetMR extends Component {
                             item.formula,
                             item.level,
                             item.item_report,
-                            String(item.weight).includes("%") ? String(item.weight).substr(0, String(item.weight).length - 1) : item.weight,
+                            String(item.weight).includes("%") ? String(item.weight).trim().substr(0, String(item.weight).trim().length - 1) : item.weight,
                             item.uom,
                             item.jenis_kpi,
                             item.max_ach,