Merge branch 'didam' into 'master'

apdet

See merge request !970

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -631,13 +631,12 @@ export default class CorporateAnnualTargetMR extends Component {
         this.setState({ alert: false })
     }
 
-    handleCalculate(datatable2, someXXX) {
+    handleCalculate(datatable2) {
         this.setState({ loading: true }, () => {
             let total = 0
             let perfomanceScore = ''
 
             let datatable3 = datatable2.map((item, index) => {
-
                 //ach
                 let totalAch = 0
                 if (item[8] == 'HIB') {
@@ -654,6 +653,7 @@ export default class CorporateAnnualTargetMR extends Component {
                 // if (item[5] == "People Benchstrength") {
                 //     console.log(totalAch)
                 // }
+                
                 //score
                 let listParameter = this.state.parameterScore
                 let parameterKpi = item[8]
@@ -742,8 +742,7 @@ export default class CorporateAnnualTargetMR extends Component {
                 perfomanceScore = 'IST'
             }
             setTimeout(() => {
-                this.setState({ totalScore: total, perfomanceScore, loading: false })   
-                // console.log(total)
+                this.setState({ totalScore: total, perfomanceScore, loading: false})
             }, 500);
         })
 
@@ -1900,7 +1899,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                                 this.setState({ loading: true, dataTable: dataTable2, saveDraft: false, buttonError: false }, () => {
                                                     setTimeout(() => {
                                                         // this.handleValidate()
-                                                        this.handleCalculate(dataTable2, someXXX)
+                                                        this.handleCalculate(dataTable2)
                                                     }, 100);
                                                 })
                                             }}