Skip to content

T
Tia-dev
Commit c45a1a48 authored by rifkaki's avatar rifkaki
Browse files
Options

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

parents 65995098 22986170
Expand all Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 1383 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ c45a1a48
...@@ -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],
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ c45a1a48
...@@ -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 = {
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ c45a1a48
...@@ -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)),
...@@ -401,13 +401,13 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -401,13 +401,13 @@ 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],
"mtd_mb": i[6], "mtd_mb": String(Number(i[6]).toFixed(1)),
"mtd_rb": i[7], "mtd_rb": String(Number(i[7]).toFixed(1)),
"mtd_actual": i[8], "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(i[9]), "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(i[10]), "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(i[11]), "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(i[12]) "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 = { let payload = {
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ c45a1a48
...@@ -384,11 +384,11 @@ export default class ProfitLossMR extends Component { ...@@ -384,11 +384,11 @@ export default class ProfitLossMR extends Component {
"ytd_actual": String(Number(i[11]).toFixed(1)), "ytd_actual": String(Number(i[11]).toFixed(1)),
"actual_previous_month": String(Number(i[12]).toFixed(1)), "actual_previous_month": String(Number(i[12]).toFixed(1)),
"amount_act_vs_previous_month": String(Number(i[13]).toFixed(1)), "amount_act_vs_previous_month": String(Number(i[13]).toFixed(1)),
"percent_act_vs_previous_month": String(Number(i[14]).toFixed(1)), "percent_act_vs_previous_month": i[14],
"amount_act_vs_mb": String(Number(i[15]).toFixed(1)), "amount_act_vs_mb": String(Number(i[15]).toFixed(1)),
"percent_act_vs_mb": String(Number(i[16]).toFixed(1)), "percent_act_vs_mb": i[16],
"amount_act_vs_rb": String(Number(i[17]).toFixed(1)), "amount_act_vs_rb": String(Number(i[17]).toFixed(1)),
"percent_act_vs_rb": String(Number(i[18]).toFixed(1)), "percent_act_vs_rb": i[18],
"mtd_vs_mb": String(i[19]), "mtd_vs_mb": String(i[19]),
"mtd_vs_rb": String(i[20]), "mtd_vs_rb": String(i[20]),
"mtd_vs_previous_month": String(i[21]), "mtd_vs_previous_month": String(i[21]),
...@@ -542,11 +542,11 @@ export default class ProfitLossMR extends Component { ...@@ -542,11 +542,11 @@ export default class ProfitLossMR extends Component {
ytd_actual: String(Number(i[11]).toFixed(1)), ytd_actual: String(Number(i[11]).toFixed(1)),
actual_previous_month: String(Number(i[12]).toFixed(1)), actual_previous_month: String(Number(i[12]).toFixed(1)),
amount_act_vs_previous_month: String(Number(i[13]).toFixed(1)), amount_act_vs_previous_month: String(Number(i[13]).toFixed(1)),
percent_act_vs_previous_month: String(Number(i[14]).toFixed(1)), percent_act_vs_previous_month: i[14],
amount_act_vs_mb: String(Number(i[15]).toFixed(1)), amount_act_vs_mb: String(Number(i[15]).toFixed(1)),
percent_act_vs_mb: String(Number(i[16]).toFixed(1)), percent_act_vs_mb: i[16],
amount_act_vs_rb: String(Number(i[17]).toFixed(1)), amount_act_vs_rb: String(Number(i[17]).toFixed(1)),
percent_act_vs_rb: String(Number(i[18]).toFixed(1)), percent_act_vs_rb: i[18],
mtd_vs_mb: String(i[19]), mtd_vs_mb: String(i[19]),
mtd_vs_rb: String(i[20]), mtd_vs_rb: String(i[20]),
mtd_vs_previous_month: String(i[21]), mtd_vs_previous_month: String(i[21]),
......
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