Commit 22986170 authored by Faisal Hamdi's avatar Faisal Hamdi

Merge branch 'faisal' into 'master'

update

See merge request !1054
parents a8884d63 1ccfb604
...@@ -438,7 +438,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -438,7 +438,7 @@ export default class CorporateAnnualTargetMR extends Component {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
item_report: String(i[5]).trim(), item_report: String(i[5]),
weight: String(i[6]), weight: String(i[6]),
uom: String(i[7]), uom: String(i[7]),
jenis_kpi: i[8] == null ? "" : i[8], jenis_kpi: i[8] == null ? "" : i[8],
...@@ -449,7 +449,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -449,7 +449,7 @@ export default class CorporateAnnualTargetMR extends Component {
achivement_monthly: String(Number(i[13]).toFixed(1)), achivement_monthly: String(Number(i[13]).toFixed(1)),
score: String(Number(i[14]).toFixed(0)), score: String(Number(i[14]).toFixed(0)),
score_x_weight: String(Number(i[15]).toFixed(2)), score_x_weight: String(Number(i[15]).toFixed(2)),
notes: String(i[16]).trim() notes: String(i[16])
}) })
}) })
let body = { let body = {
......
...@@ -347,7 +347,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -347,7 +347,7 @@ export default class FixedAssetsMovementMR extends Component {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
item_report: String(i[5]).trim(), item_report: String(i[5]),
mtd_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[6]).toFixed(1)) : i[0] === 3 && i[6] === "" ? "0.0" : String(Number(i[6]).toFixed(1)), mtd_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[6]).toFixed(1)) : i[0] === 3 && i[6] === "" ? "0.0" : String(Number(i[6]).toFixed(1)),
mtd_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[7]).toFixed(1)) : i[0] === 3 && i[7] === "" ? "0.0" : String(Number(i[7]).toFixed(1)), mtd_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[7]).toFixed(1)) : i[0] === 3 && i[7] === "" ? "0.0" : String(Number(i[7]).toFixed(1)),
mtd_actual: i[0] === 5 || i[0] === 6 ? String(Number(i[8]).toFixed(1)) : i[0] === 3 && i[8] === "" ? "0.0" : String(Number(i[8]).toFixed(1)), mtd_actual: i[0] === 5 || i[0] === 6 ? String(Number(i[8]).toFixed(1)) : i[0] === 3 && i[8] === "" ? "0.0" : String(Number(i[8]).toFixed(1)),
......
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