Skip to content

T
Tia-dev
Commit c8adf3ea authored by d.arizona's avatar d.arizona
Browse files
Options

push pl bs

parent d98bcdfc
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 14 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ c8adf3ea
...@@ -765,7 +765,10 @@ export default class BalanceSheetMR extends Component { ...@@ -765,7 +765,10 @@ export default class BalanceSheetMR extends Component {
|| 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(total * -1).toFixed(1) : Number(total).toFixed(1)
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)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
...@@ -782,8 +785,9 @@ export default class BalanceSheetMR extends Component { ...@@ -782,8 +785,9 @@ export default class BalanceSheetMR extends Component {
|| 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(total * -1).toFixed(1) : Number(total).toFixed(1)
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) {
...@@ -794,8 +798,9 @@ export default class BalanceSheetMR extends Component { ...@@ -794,8 +798,9 @@ export default class BalanceSheetMR extends Component {
|| 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(total * -1).toFixed(1) : Number(total).toFixed(1)
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)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ c8adf3ea
...@@ -137,7 +137,7 @@ export default class ProfitLossMR extends Component { ...@@ -137,7 +137,7 @@ export default class ProfitLossMR extends Component {
} }
this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev }) this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
// this.setState({viewOnly: true}) // this.setState({ viewOnly: true })
} }
handleGetFor(type) { handleGetFor(type) {
...@@ -826,8 +826,10 @@ export default class ProfitLossMR extends Component { ...@@ -826,8 +826,10 @@ export default class ProfitLossMR extends Component {
// console.log(selisih) // console.log(selisih)
// console.log(prevMonth) // console.log(prevMonth)
// console.log(total) // console.log(total)
// } // }'
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) total = String(selisih).includes('-') ? 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)
// 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]) /
// Number(dataTable2[tableMeta.rowIndex][12])) * 100), NaN) ? '0' : // Number(dataTable2[tableMeta.rowIndex][12])) * 100), NaN) ? '0' :
...@@ -843,9 +845,14 @@ export default class ProfitLossMR extends Component { ...@@ -843,9 +845,14 @@ export default class ProfitLossMR extends Component {
|| 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(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) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'corporate income tax') {
// console.log(String(selisih).includes('-'))
// console.log(selisih)
// console.log(prevMonth)
// console.log(total)
// }
// total = Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8]) // total = 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)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
...@@ -856,8 +863,8 @@ export default class ProfitLossMR extends Component { ...@@ -856,8 +863,8 @@ export default class ProfitLossMR extends Component {
|| 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(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) 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)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).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