Skip to content

T
Tia-dev
Commit 4af02019 authored by Faisal Hamdi's avatar Faisal Hamdi
Browse files
Options

Merge branch 'faisal' into 'master' 

cat pq!

See merge request !1433
parents 937d2578 0016a7b5
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 9 deletions
src/container/Laporan/SubHolding.js
View file @ 4af02019
...@@ -2917,7 +2917,7 @@ export default class SubHolding extends Component { ...@@ -2917,7 +2917,7 @@ export default class SubHolding extends Component {
item.corporate_annual_target.thisYearActualQx, item.corporate_annual_target.thisYearActualQx,
item.corporate_annual_target.thisYearPercentAch, item.corporate_annual_target.thisYearPercentAch,
item.corporate_annual_target.thisYearPercentGrowthYoy, item.corporate_annual_target.thisYearPercentGrowthYoy,
item.corporate_annual_target.thisYearScore, item.corporate_annual_target.thisYearScore === null ? "0" : item.corporate_annual_target.thisYearScore,
item.corporate_annual_target.thisYearScoreXWeight, item.corporate_annual_target.thisYearScoreXWeight,
item.corporate_annual_target.thisYearBudgetYtd, item.corporate_annual_target.thisYearBudgetYtd,
...@@ -2927,7 +2927,7 @@ export default class SubHolding extends Component { ...@@ -2927,7 +2927,7 @@ export default class SubHolding extends Component {
item.corporate_annual_target.thisYearBudgetFy, item.corporate_annual_target.thisYearBudgetFy,
item.corporate_annual_target.thisYearOlFy, item.corporate_annual_target.thisYearOlFy,
item.corporate_annual_target.thisYearPercentAchFy, item.corporate_annual_target.thisYearPercentAchFy,
item.corporate_annual_target.thisYearScoreFy, item.corporate_annual_target.thisYearScoreFy === null ? "0" : item.corporate_annual_target.thisYearScoreFy,
item.corporate_annual_target.thisYearScoreXWeightFy, item.corporate_annual_target.thisYearScoreXWeightFy,
item.orders item.orders
......
src/container/Laporan/TableSubHolding.js
View file @ 4af02019
...@@ -58,7 +58,7 @@ export default class TableSubHolding extends Component { ...@@ -58,7 +58,7 @@ export default class TableSubHolding extends Component {
api.create().getParameterByGroupName({ api.create().getParameterByGroupName({
"group_name": 'ACHIEVEMENT_KPI' "group_name": 'ACHIEVEMENT_KPI'
}).then((response) => { }).then((response) => {
console.log(response.data) // console.log(response.data)
if (response.data) { if (response.data) {
this.setState({ parameterScore: response.data.data }) this.setState({ parameterScore: response.data.data })
} }
...@@ -69,7 +69,7 @@ export default class TableSubHolding extends Component { ...@@ -69,7 +69,7 @@ export default class TableSubHolding extends Component {
api.create().getParameterByGroupName({ api.create().getParameterByGroupName({
"group_name": "PERFORMANCE_KPI" "group_name": "PERFORMANCE_KPI"
}).then((response) => { }).then((response) => {
console.log(response.data) // console.log(response.data)
if (response.data) { if (response.data) {
this.setState({ parameterPerfom: response.data.data }, () => { this.setState({ parameterPerfom: response.data.data }, () => {
this.handleTotalScore(this.props.dataTable) this.handleTotalScore(this.props.dataTable)
...@@ -24355,6 +24355,9 @@ export default class TableSubHolding extends Component { ...@@ -24355,6 +24355,9 @@ export default class TableSubHolding extends Component {
}, },
] ]
const totalArray = (item) => {
console.log(item);
}
const columnCatPQ = [ const columnCatPQ = [
{ {
name: "", name: "",
...@@ -24683,7 +24686,7 @@ export default class TableSubHolding extends Component { ...@@ -24683,7 +24686,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
suffix={`%`} suffix={`%`}
disabled={true} disabled={true}
value={value} value={tableMeta.rowData[15]}
/> />
} }
/> />
...@@ -24728,7 +24731,7 @@ export default class TableSubHolding extends Component { ...@@ -24728,7 +24731,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={tableMeta.rowData[17]}
/> />
} }
/> />
...@@ -24843,7 +24846,7 @@ export default class TableSubHolding extends Component { ...@@ -24843,7 +24846,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
suffix={`%`} suffix={`%`}
disabled={true} disabled={true}
value={value} value={tableMeta.rowIndex[21]}
/> />
} }
/> />
...@@ -24942,7 +24945,7 @@ export default class TableSubHolding extends Component { ...@@ -24942,7 +24945,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
suffix={`%`} suffix={`%`}
disabled={true} disabled={true}
value={value} value={tableMeta.rowData[24]}
/> />
} }
/> />
...@@ -24963,7 +24966,7 @@ export default class TableSubHolding extends Component { ...@@ -24963,7 +24966,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={tableMeta.rowData[25]}
/> />
} }
/> />
...@@ -25001,6 +25004,66 @@ export default class TableSubHolding extends Component { ...@@ -25001,6 +25004,66 @@ export default class TableSubHolding extends Component {
options: { options: {
display: false display: false
} }
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
} }
] ]
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