Skip to content

T
Tia-dev
Commit 3e6690e3 authored by qorri_di's avatar qorri_di
Browse files
Options

Merge branch 'ENV-DEPLOYMENT' into 'ENV-DEV' 

# Conflicts:
#   src/library/Utils.js
parents f6d9257f 0336cf03
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 29 deletions
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ 3e6690e3
......@@ -133,24 +133,28 @@ export default class CorporateAnnualTargetMR extends Component {
}
getParameterGroup() {
api.create().getParameterByGroupName({
"group_name": 'ACHIEVEMENT_KPI'
}).then((response) => {
console.log(response.data)
if (response.data) {
this.setState({ parameterScore: response.data.data })
}
this.setState({ loading: true }, () => {
api.create().getParameterByGroupName({
"group_name": 'ACHIEVEMENT_KPI'
}).then((response) => {
console.log(response.data)
if (response.data) {
this.setState({ parameterScore: response.data.data, loading: false })
}
})
})
}
getParameterGroupPerfom() {
api.create().getParameterByGroupName({
"group_name": "PERFORMANCE_KPI"
}).then((response) => {
console.log(response.data)
if (response.data) {
this.setState({ parameterPerfom: response.data.data })
}
this.setState({ loading: true }, () => {
api.create().getParameterByGroupName({
"group_name": "PERFORMANCE_KPI"
}).then((response) => {
console.log(response.data)
if (response.data) {
this.setState({ parameterPerfom: response.data.data, loading: false })
}
})
})
}
......@@ -582,7 +586,9 @@ export default class CorporateAnnualTargetMR extends Component {
getOptionLabel: (option) => titleCase(option.value),
};
// setTimeout(() => {
this.setState({ maxAchList: defaultProps })
this.setState({ maxAchList: defaultProps }, () => {
this.getItemHierarki()
})
// }, 300);
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
......@@ -601,7 +607,7 @@ export default class CorporateAnnualTargetMR extends Component {
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
this.getItemHierarki()
})
}
......
src/container/RollingOutlook/CorporateAnnualTargetRO.js
View file @ 3e6690e3
......@@ -826,14 +826,14 @@ export default class CorporateAnnualTargetRO extends Component {
} else {
let convertID = -1
if (tableMeta.rowData[11].value == 'FORMULA') {
if (tableMeta.rowData[10].value == 'FORMULA') {
let indexIDReport = dataTable2.findIndex((val) => val[1] == item)
convertID = dataTable2[indexIDReport][31]
convertID = dataTable2[indexIDReport][26]
}
let indexID = dataTable2.findIndex((val) => val[31] == (convertID == -1 ? item : convertID))
let indexID = dataTable2.findIndex((val) => val[26] == (convertID == -1 ? item : convertID))
if (indexID !== -1) {
let valuezz = dataTable2[indexID][tableMeta.columnIndex].value == undefined ? dataTable2[indexID][tableMeta.columnIndex] : dataTable2[indexID][tableMeta.columnIndex].value
if (item == dataTable2[tableMeta.rowIndex][31]) {
if (item == dataTable2[tableMeta.rowIndex][26]) {
anjay.push(0)
} else {
anjay.push(valuezz == "" ? "0" : valuezz)
......@@ -847,8 +847,8 @@ export default class CorporateAnnualTargetRO extends Component {
}
})
// if (tableMeta.rowData[11].value == 'FORMULA') {
// console.log(anjay)
// console.log(column)
// console.log(anjay)
// console.log(column)
// }
......@@ -1445,7 +1445,7 @@ export default class CorporateAnnualTargetRO extends Component {
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
this.state.get_for == "view" ?
this.state.get_for == "view" || this.props.quartal == "q2" || this.props.quartal == "q3" ?
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1545,7 +1545,7 @@ export default class CorporateAnnualTargetRO extends Component {
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
this.state.get_for == "view" ?
this.state.get_for == "view" || this.props.quartal == "q2" || this.props.quartal == "q3" ?
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1645,7 +1645,7 @@ export default class CorporateAnnualTargetRO extends Component {
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
this.state.get_for == "view" ?
this.state.get_for == "view" || this.props.quartal == "q2" || this.props.quartal == "q3" ?
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1745,7 +1745,7 @@ export default class CorporateAnnualTargetRO extends Component {
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
this.state.get_for == "view" ?
this.state.get_for == "view" || this.props.quartal == "q3" ?
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1845,7 +1845,7 @@ export default class CorporateAnnualTargetRO extends Component {
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
this.state.get_for == "view" ?
this.state.get_for == "view" || this.props.quartal == "q3" ?
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......@@ -1945,7 +1945,7 @@ export default class CorporateAnnualTargetRO extends Component {
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
this.state.get_for == "view" ?
this.state.get_for == "view" || this.props.quartal == "q3" ?
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......
src/library/Utils.js
View file @ 3e6690e3
......@@ -9,7 +9,7 @@ export function titleCase(text) {
export function roundMath(number, decimalPlaces) {
const factorOfTen = Math.pow(10, decimalPlaces)
return Math.round(number * factorOfTen) / factorOfTen
return Math.round(number * factorOfTen) / factorOfTen
}
export function fixNumber(num, decimalCount = 2) {
......
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