Merge branch 'didam' into 'master'

update

See merge request !973

src/api/index.js

@@ -258,6 +258,9 @@ const create = (type = "") => {
 
   // Monthly
   const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body)
+  const submitMonthlyReport = (body) => api.post('transaction/monthly_report/submit_monthly_report', body)
+  const approvalMonthly = (body) => api.post('transaction/monthly_report/approval_monthly', body)
+  const createPeriodeRevisionMonthly = (body) => api.post('transaction/monthly_report/create_periode_revision', body)
   const getMonthlyOI = (body) => api.post('transaction/operating_indicator/monthly_report/get_operating_indicator_id', body)
   const getMonthlyReportID = (body) => api.post('transaction/monthly_report/get_monthly_report_id', body)
   // const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
@@ -555,7 +558,10 @@ const create = (type = "") => {
     getParameterByGroupName,
     getSubmitMonthlyReport,
     getIdDeleteFromExcelLOCF,
-    deleteAllItemReportLOCF
+    deleteAllItemReportLOCF,
+    submitMonthlyReport,
+    approvalMonthly,
+    createPeriodeRevisionMonthly
   }
 }
 

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -662,7 +662,7 @@ export default class CorporateAnnualTargetMR extends Component {
                 let listParameterFilter = listParameter.filter((val) => val.setting_type == String(parameterMix).toLocaleUpperCase())
                 let listParameterFilterCompany = listParameterFilter.filter((val) => val.company_id == this.props.company.company_id)
                 let totalScore = 0
-                let achx100 = item[9] == '100%' ? Number(totalAch) / 100 > 1 ? 1 : Number(totalAch) / 100 : Number(totalAch) / 100
+                let achx100 = item[9] == '100%' && (item[8] == 'HIB' || item[8] == 'HIG')? Number(totalAch) / 100 > 1 ? 1 : Number(totalAch) / 100 : Number(totalAch) / 100
                 if (listParameterFilterCompany.length == 0) {
                     listParameterFilter.map((item, index) => {
                         if (Number(achx100) >= Number(item.min_value) && Number(achx100) <= Number(item.max_value)) {
@@ -1165,7 +1165,7 @@ export default class CorporateAnnualTargetMR extends Component {
             let listParameterFilter = listParameter.filter((val) => val.setting_type == String(parameterMix).toLocaleUpperCase())
             let listParameterFilterCompany = listParameterFilter.filter((val) => val.company_id == this.props.company.company_id)
             let totalScore = 0
-            let achx100 = tableMeta.rowData[9] == '100%' ? Number(tableMeta.rowData[13]) / 100 > 1 ? 1 : Number(tableMeta.rowData[13]) / 100 : Number(tableMeta.rowData[13]) / 100
+            let achx100 = tableMeta.rowData[9] == '100%' && (tableMeta.rowData[8] == 'HIB' || tableMeta.rowData[8] == 'HIG') ? Number(tableMeta.rowData[13]) / 100 > 1 ? 1 : Number(tableMeta.rowData[13]) / 100 : Number(tableMeta.rowData[13]) / 100
             if (listParameterFilterCompany.length == 0) {
                 listParameterFilter.map((item, index) => {
                     if (Number(achx100) >= Number(item.min_value) && Number(achx100) <= Number(item.max_value)) {