Commit 68148b67 authored by Riri Novita's avatar Riri Novita

Merge branch 'dev/riri' into 'ENV-DEV'

Issue Loading CAT

See merge request !1955
parents 3966ea81 3ed6a6f8
...@@ -509,7 +509,8 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -509,7 +509,8 @@ export default class CorporateAnnualTargetMR extends Component {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.props.onClickClose() this.props.saveToMonthlyReport()
// this.props.onClickClose()
// this.props.getReport() // this.props.getReport()
} else { } else {
this.setState({ visibleAlertSave: true, alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ visibleAlertSave: true, alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
...@@ -876,9 +877,9 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -876,9 +877,9 @@ export default class CorporateAnnualTargetMR extends Component {
let perfomanceScoreColor = '#fff' let perfomanceScoreColor = '#fff'
if (listPerfomanceDefault.length > 0) { if (listPerfomanceDefault.length > 0) {
listPerfomanceDefault.map((item, index) => { listPerfomanceDefault.map((item, index) => {
console.log(Number(lastTotal)) // console.log(Number(lastTotal))
console.log(Number(item.min_value)) // console.log(Number(item.min_value))
console.log(Number(item.max_value)) // console.log(Number(item.max_value))
if (Number(lastTotal) >= Number(item.min_value) && Number(lastTotal) <= Number(item.max_value)) { if (Number(lastTotal) >= Number(item.min_value) && Number(lastTotal) <= Number(item.max_value)) {
console.log('masuk') console.log('masuk')
perfomanceScore = item.description perfomanceScore = item.description
...@@ -1434,7 +1435,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1434,7 +1435,7 @@ export default class CorporateAnnualTargetMR extends Component {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(2) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(2)
if (tableMeta.rowIndex == dataTable2.length - 1) { if (tableMeta.rowIndex == dataTable2.length - 1) {
someXXX = Number(totalScore).toFixed(2) someXXX = Number(totalScore).toFixed(2)
console.log(someXXX) // console.log(someXXX)
} }
return null return null
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment