Skip to content

T
Tia-dev
Commit 5087ad5d authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

Riri

See merge request !1522
parents 1c488e3e f5210e5b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 5087ad5d
...@@ -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(dataTable2[tableMeta.rowIndex][10])
let 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
...@@ -776,7 +776,7 @@ export default class BalanceSheetMR extends Component { ...@@ -776,7 +776,7 @@ 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(dataTable2[tableMeta.rowIndex][7])
let 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
...@@ -788,16 +788,16 @@ export default class BalanceSheetMR extends Component { ...@@ -788,16 +788,16 @@ export default class BalanceSheetMR extends Component {
} 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(dataTable2[tableMeta.rowIndex][8])
let 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 = 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)
// console.log(total); // console.log(total);
} }
return total return total
...@@ -2713,7 +2713,7 @@ export default class BalanceSheetMR extends Component { ...@@ -2713,7 +2713,7 @@ export default class BalanceSheetMR extends Component {
<div className="col-2"> <div className="col-2">
</div> : </div> :
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}> <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
{this.state.get_for == 'view' && this.state.viewOnly && <button {this.state.get_for == 'view' && <button
className="button" className="button"
type="button" type="button"
style={{ style={{
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 5087ad5d
...@@ -817,7 +817,7 @@ export default class ProfitLossMR extends Component { ...@@ -817,7 +817,7 @@ export default class ProfitLossMR extends Component {
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(dataTable2[tableMeta.rowIndex][12])
let 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
...@@ -834,7 +834,7 @@ export default class ProfitLossMR extends Component { ...@@ -834,7 +834,7 @@ export default class ProfitLossMR extends Component {
} 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(dataTable2[tableMeta.rowIndex][8])
let 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
...@@ -847,7 +847,7 @@ export default class ProfitLossMR extends Component { ...@@ -847,7 +847,7 @@ export default class ProfitLossMR extends Component {
} 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(dataTable2[tableMeta.rowIndex][9])
let 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
...@@ -2145,7 +2145,7 @@ export default class ProfitLossMR extends Component { ...@@ -2145,7 +2145,7 @@ export default class ProfitLossMR extends Component {
<div className="col-2"> <div className="col-2">
</div> : </div> :
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}> <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
{this.state.get_for == 'view' && this.state.viewOnly && {this.state.get_for == 'view' &&
<button <button
className="button" className="button"
type="button" type="button"
......
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