Commit 1a981588 authored by Riri Novita's avatar Riri Novita

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 98098b9a 5837cac9
......@@ -434,7 +434,7 @@ export default class BalanceSheetMR extends Component {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
item_report: String(i[5]).trim(),
item_report: String(i[5]),
rolling_outlook: 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)),
master_budget: 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)),
rolling_budget: 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)),
......@@ -497,16 +497,16 @@ export default class BalanceSheetMR extends Component {
this.state.dataTable.map(i => {
data.push({
"item_report_id": i[1],
"rolling_outlook": i[6],
"master_budget": i[7],
"rolling_budget": i[8],
"actual": i[9],
"actual_previous_month": i[10],
"amount_act_vs_previous_month": i[11],
"percent_act_vs_previous_month": i[12],
"amount_act_vs_mb": i[13],
"rolling_outlook": String(Number(i[6]).toFixed(1)),
"master_budget": String(Number(i[7]).toFixed(1)),
"rolling_budget": String(Number(i[8]).toFixed(1)),
"actual": String(Number(i[9]).toFixed(1)),
"actual_previous_month": String(Number(i[10]).toFixed(1)),
"amount_act_vs_previous_month": String(Number(i[11]).toFixed(1)),
"percent_act_vs_previous_month": String(Number(i[12]).toFixed(1)),
"amount_act_vs_mb": String(Number(i[13]).toFixed(1)),
"percent_act_vs_mb": i[14],
"amount_act_vs_rb": i[15],
"amount_act_vs_rb": String(Number(i[15]).toFixed(1)),
"percent_act_vs_rb": i[16],
"mtd_vs_previous_month": i[17],
"mtd_vs_mb": i[18],
......
......@@ -447,7 +447,7 @@ export default class CorporateAnnualTargetMR extends Component {
actual_monthly: String(Number(i[11]).toFixed(1)),
target_monthly: String(Number(i[12]).toFixed(1)),
achivement_monthly: String(Number(i[13]).toFixed(1)),
score: String(Number(i[14]).toFixed(1)),
score: String(Number(i[14]).toFixed(0)),
score_x_weight: String(Number(i[15]).toFixed(2)),
notes: String(i[16]).trim()
})
......@@ -591,10 +591,10 @@ export default class CorporateAnnualTargetMR extends Component {
"max_ach": i[9] == null ? "" : i[9],
"formula_ytd": i[10] == null ? "" : i[10],
"actual_monthly": i[11] == null || i[11] == "" ? 0.0 : String(Number(i[11]).toFixed(1)),
"target_monthly": i[12] == null || i[12] == "" ? 0.0 : i[12],
"target_monthly": i[12] == null || i[12] == "" ? 0.0 : String(Number(i[12]).toFixed(1)),
"achivement_monthly": String(Number(i[13]).toFixed(1)),
"score": i[14],
"score_x_weight": i[15],
"score": String(Number(i[14]).toFixed(0)),
"score_x_weight": String(Number(i[15]).toFixed(2)),
"notes": i[16]
})
})
......
......@@ -401,13 +401,13 @@ export default class FixedAssetsMovementMR extends Component {
this.state.dataTable.map(i => {
data.push({
"item_report_id": i[1],
"mtd_mb": i[6],
"mtd_rb": i[7],
"mtd_actual": i[8],
"act_vs_mb_amount": String(i[9]) === 'NaN' || String(i[9]) === 'Infinity' || String(i[9]) === '-Infinity' ? '0.0' : String(i[9]),
"act_vs_mb_percent": String(i[10]) === 'NaN' || String(i[10]) === 'Infinity' || String(i[10]) === '-Infinity' ? '0.0' : String(i[10]),
"act_vs_rb_amount": String(i[11]) === 'NaN' || String(i[11]) === 'Infinity' || String(i[11]) === '-Infinity' ? '0.0' : String(i[11]),
"act_vs_rb_percent": String(i[12]) === 'NaN' || String(i[12]) === 'Infinity' || String(i[12]) === '-Infinity' ? '0.0' : String(i[12])
"mtd_mb": String(Number(i[6]).toFixed(1)),
"mtd_rb": String(Number(i[7]).toFixed(1)),
"mtd_actual": String(Number(i[8]).toFixed(1)),
"act_vs_mb_amount": String(i[9]) === 'NaN' || String(i[9]) === 'Infinity' || String(i[9]) === '-Infinity' ? '0.0' : String(Number(i[9]).toFixed(1)),
"act_vs_mb_percent": String(i[10]) === 'NaN' || String(i[10]) === 'Infinity' || String(i[10]) === '-Infinity' ? '0.0' : String(Number(i[10]).toFixed(1)),
"act_vs_rb_amount": String(i[11]) === 'NaN' || String(i[11]) === 'Infinity' || String(i[11]) === '-Infinity' ? '0.0' : String(Number(i[11]).toFixed(1)),
"act_vs_rb_percent": String(i[12]) === 'NaN' || String(i[12]) === 'Infinity' || String(i[12]) === '-Infinity' ? '0.0' : String(Number(i[12]).toFixed(1))
})
})
let payload = {
......
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