Merge branch 'rifka' into 'master'

mlm

See merge request !993

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -132,7 +132,7 @@ export default class CorporateAnnualTargetMR extends Component {
         api.create().getParameterByGroupName({
             "group_name": 'ACHIEVEMENT_KPI'
         }).then((response) => {
-            // console.log(response.data)
+            console.log(response.data)
             if (response.data) {
                 this.setState({ parameterScore: response.data.data })
             }
@@ -693,10 +693,9 @@ export default class CorporateAnnualTargetMR extends Component {
                 if (item[12] == '' || String(item[12]) == '0' || String(item[12]) == '0.0') {
                     totalSW = 0
                 } else {
-                    totalSW = Number(totalScore) * Number(handlePercent) / 100
+                    totalSW = Number(totalScore) * Number(handlePercent) / 1000
                 }
                 totalSW = Number(totalSW).toFixed(2)
-                
                 if (item[0] !== 1 && item[0] !== 4) {
                     total += Number(totalSW)
                 }
@@ -1183,9 +1182,13 @@ export default class CorporateAnnualTargetMR extends Component {
                     }
                 })
             }
-
-            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(0)
-            return Number(totalScore).toFixed(0)
+            if (Number(tableMeta.rowData[12]) > Number(0)){
+                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(0)
+                return Number(totalScore).toFixed(0)
+            } else {
+                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(0).toFixed(0)
+                return Number(0).toFixed(0)
+            }
         }
 
         let someXXX = this.state.aa

src/container/MonthlyReport/TaxPlanningMR.js

@@ -150,7 +150,7 @@ export default class TaxPlanningMR extends Component {
             "months": this.props.month.month_id
         }
         api.create().getLastestUpdateMR(payload).then(response => {
-            console.log(response)
+            // console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
@@ -806,7 +806,6 @@ export default class TaxPlanningMR extends Component {
         const handleTotal = (value, tableMeta, dex) => {
             // console.log(tableMeta)
             let total = 0
-
             dataTable2[tableMeta.rowIndex].map((item, index) => {
                 if (index == 9) {
                     let valItemTBF = item.tbf == undefined || item.tbf == "" || item.tbf == "undefined" ? 0.0 : item.tbf