Skip to content

T
Tia-dev
Commit 7cc0e206 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents 74a4a584 fdb96806
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 7cc0e206
...@@ -434,7 +434,7 @@ export default class BalanceSheetMR extends Component { ...@@ -434,7 +434,7 @@ export default class BalanceSheetMR 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]),
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)), 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)), 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)), 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 { ...@@ -497,16 +497,16 @@ export default class BalanceSheetMR 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],
"rolling_outlook": i[6], "rolling_outlook": String(Number(i[6]).toFixed(1)),
"master_budget": i[7], "master_budget": String(Number(i[7]).toFixed(1)),
"rolling_budget": i[8], "rolling_budget": String(Number(i[8]).toFixed(1)),
"actual": i[9], "actual": String(Number(i[9]).toFixed(1)),
"actual_previous_month": i[10], "actual_previous_month": String(Number(i[10]).toFixed(1)),
"amount_act_vs_previous_month": i[11], "amount_act_vs_previous_month": String(Number(i[11]).toFixed(1)),
"percent_act_vs_previous_month": i[12], "percent_act_vs_previous_month": String(Number(i[12]).toFixed(1)),
"amount_act_vs_mb": i[13], "amount_act_vs_mb": String(Number(i[13]).toFixed(1)),
"percent_act_vs_mb": i[14], "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], "percent_act_vs_rb": i[16],
"mtd_vs_previous_month": i[17], "mtd_vs_previous_month": i[17],
"mtd_vs_mb": i[18], "mtd_vs_mb": i[18],
......
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