Skip to content

T
Tia-dev
Commit 25367a46 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'GGMAC' into 'master' 

update

See merge request !1529
parents 56f833b5 9711b392
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 16 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 25367a46
...@@ -759,7 +759,7 @@ export default class BalanceSheetMR extends Component { ...@@ -759,7 +759,7 @@ export default class BalanceSheetMR extends Component {
// } // }
if (dex === 1) { if (dex === 1) {
let selisih = Number(dataTable2[tableMeta.rowIndex][11]) let selisih = Number(dataTable2[tableMeta.rowIndex][11])
let prevMonth = Number(dataTable2[tableMeta.rowIndex][10]) let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][10]).includes('-')? Number(dataTable2[tableMeta.rowIndex][10]) *-1 : dataTable2[tableMeta.rowIndex][10])
total = R.equals(selisih/prevMonth, 0) total = R.equals(selisih/prevMonth, 0)
|| R.equals(selisih/prevMonth, NaN) || R.equals(selisih/prevMonth, NaN)
|| R.equals(selisih/prevMonth, Infinity) || R.equals(selisih/prevMonth, Infinity)
...@@ -767,7 +767,7 @@ export default class BalanceSheetMR extends Component { ...@@ -767,7 +767,7 @@ export default class BalanceSheetMR extends Component {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[10])? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[10])? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100) // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100)
...@@ -779,27 +779,27 @@ export default class BalanceSheetMR extends Component { ...@@ -779,27 +779,27 @@ export default class BalanceSheetMR extends Component {
// } // }
} else if (dex === 2) { } else if (dex === 2) {
let selisih = Number(dataTable2[tableMeta.rowIndex][13]) let selisih = Number(dataTable2[tableMeta.rowIndex][13])
let prevMonth = Number(dataTable2[tableMeta.rowIndex][7]) let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][7]).includes('-')? Number(dataTable2[tableMeta.rowIndex][7]) *-1 : dataTable2[tableMeta.rowIndex][7])
total = R.equals(selisih/prevMonth, 0) total = R.equals(selisih/prevMonth, 0)
|| R.equals(selisih/prevMonth, NaN) || R.equals(selisih/prevMonth, NaN)
|| R.equals(selisih/prevMonth, Infinity) || R.equals(selisih/prevMonth, Infinity)
|| R.equals(selisih/prevMonth, -Infinity) ? 0 : (selisih/prevMonth) * 100 || R.equals(selisih/prevMonth, -Infinity) ? 0 : (selisih/prevMonth) * 100
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[7]) ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[7]) ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100) // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
} else if (dex === 3) { } else if (dex === 3) {
let selisih = Number(dataTable2[tableMeta.rowIndex][15]) let selisih = Number(dataTable2[tableMeta.rowIndex][15])
let prevMonth = Number(dataTable2[tableMeta.rowIndex][8]) let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][8]).includes('-')? Number(dataTable2[tableMeta.rowIndex][8]) *-1 : dataTable2[tableMeta.rowIndex][8])
total = R.equals(selisih/prevMonth, 0) total = R.equals(selisih/prevMonth, 0)
|| R.equals(selisih/prevMonth, NaN) || R.equals(selisih/prevMonth, NaN)
|| R.equals(selisih/prevMonth, Infinity) || R.equals(selisih/prevMonth, Infinity)
|| R.equals(selisih/prevMonth, -Infinity) ? 0 : (selisih/prevMonth) * 100 || R.equals(selisih/prevMonth, -Infinity) ? 0 : (selisih/prevMonth) * 100
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[8])? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[8])? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// total = R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8]) // total = R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100) // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100)
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 25367a46
...@@ -816,19 +816,21 @@ export default class ProfitLossMR extends Component { ...@@ -816,19 +816,21 @@ export default class ProfitLossMR extends Component {
let total = 0 let total = 0
if (dex === 1) { if (dex === 1) {
let selisih = Number(dataTable2[tableMeta.rowIndex][13]) let selisih = Number(dataTable2[tableMeta.rowIndex][13])
let prevMonth = Number(dataTable2[tableMeta.rowIndex][12]) let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][12]).includes('-')? Number(dataTable2[tableMeta.rowIndex][12]) *-1 : dataTable2[tableMeta.rowIndex][12])
total = (R.equals(selisih / prevMonth, 0) total = (R.equals(selisih / prevMonth, 0)
|| R.equals(selisih / prevMonth, NaN) || R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity) || R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity)) ? 0 : (selisih / prevMonth) * 100 || R.equals(selisih / prevMonth, -Infinity)) ? 0 : (selisih / prevMonth) * 100
// if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'interest expenses - affiliated/shareholders') {
// total = (Number(tableMeta.rowData[10]) > Number(tableMeta.rowData[12]))? (String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// if (String(tableMeta.rowData[5]).toLocaleUpperCase() == 'CORPORATE INCOME TAX') {
// console.log(Number(tableMeta.rowData[10]))
// console.log(Number(tableMeta.rowData[12]))
// console.log(selisih) // console.log(selisih)
// console.log(prevMonth) // console.log(prevMonth)
// console.log(total) // console.log(total)
// }' // }
total = String(selisih).includes('-') && Number(tableMeta.rowData[10]) < Number(tableMeta.rowData[12])? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
// total = Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12]) // total = Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) /
...@@ -840,13 +842,13 @@ export default class ProfitLossMR extends Component { ...@@ -840,13 +842,13 @@ export default class ProfitLossMR extends Component {
// (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])) * 100) // (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])) * 100)
} else if (dex === 2) { } else if (dex === 2) {
let selisih = Number(dataTable2[tableMeta.rowIndex][15]) let selisih = Number(dataTable2[tableMeta.rowIndex][15])
let prevMonth = Number(dataTable2[tableMeta.rowIndex][8]) let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][8]).includes('-')? Number(dataTable2[tableMeta.rowIndex][8]) *-1 : dataTable2[tableMeta.rowIndex][8])
total = R.equals(selisih / prevMonth, 0) total = R.equals(selisih / prevMonth, 0)
|| R.equals(selisih / prevMonth, NaN) || R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity) || R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100 || R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
total = String(selisih).includes('-') && Number(tableMeta.rowData[10]) < Number(tableMeta.rowData[9])? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = (Number(tableMeta.rowData[10]) > Number(tableMeta.rowData[8]))? (String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'corporate income tax') { // if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'corporate income tax') {
// console.log(String(selisih).includes('-')) // console.log(String(selisih).includes('-'))
...@@ -859,13 +861,13 @@ export default class ProfitLossMR extends Component { ...@@ -859,13 +861,13 @@ export default class ProfitLossMR extends Component {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
} else if (dex === 3) { } else if (dex === 3) {
let selisih = Number(dataTable2[tableMeta.rowIndex][17]) let selisih = Number(dataTable2[tableMeta.rowIndex][17])
let prevMonth = Number(dataTable2[tableMeta.rowIndex][9]) let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][9]).includes('-')? Number(dataTable2[tableMeta.rowIndex][9]) *-1 : dataTable2[tableMeta.rowIndex][9])
total = R.equals(selisih / prevMonth, 0) total = R.equals(selisih / prevMonth, 0)
|| R.equals(selisih / prevMonth, NaN) || R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity) || R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100 || R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
total = String(selisih).includes('-') && Number(tableMeta.rowData[10]) < Number(tableMeta.rowData[12]) ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = (Number(tableMeta.rowData[10]) > Number(tableMeta.rowData[9])) ? (String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// total = Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9]) // total = Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100) // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100)
......
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