Commit 52335ff8 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni-' into 'master'

pointer

See merge request !612
parents 470a5d4e c9c1a05f
...@@ -539,7 +539,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -539,7 +539,7 @@ export default class FixedAssetsMovement extends Component {
tambahan = false tambahan = false
opet = "" opet = ""
} }
} else { } else {
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = dataTable2[indexID][tableMeta.columnIndex].value == undefined ? dataTable2[indexID][tableMeta.columnIndex] : dataTable2[indexID][tableMeta.columnIndex].value let valuezz = dataTable2[indexID][tableMeta.columnIndex].value == undefined ? dataTable2[indexID][tableMeta.columnIndex] : dataTable2[indexID][tableMeta.columnIndex].value
anjay.push(valuezz == "" ? 0 : valuezz) anjay.push(valuezz == "" ? 0 : valuezz)
...@@ -584,7 +584,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -584,7 +584,7 @@ export default class FixedAssetsMovement extends Component {
}) })
total = R.equals(total, NaN) ? "0.0" : total total = R.equals(total, NaN) ? "0.0" : total
// // console.log(dataTable2[tableMeta.rowIndex][22]) // // console.log(dataTable2[tableMeta.rowIndex][22])
// // console.log(tableMeta.rowData[5]) // // console.log(tableMeta.rowData[5])
// if (tableMeta.rowData[5] == 'Beginning Balance') { // if (tableMeta.rowData[5] == 'Beginning Balance') {
// console.log(baru) // console.log(baru)
// console.log(anjay) // console.log(anjay)
...@@ -667,7 +667,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -667,7 +667,7 @@ export default class FixedAssetsMovement extends Component {
} }
const handleBfr = (value,tableMeta) => { const handleBfr = (value,tableMeta) => {
let total = 0 let total = 0
total = handleValueFormula(value, tableMeta, 'before') total = handleValueFormula(value, tableMeta, 'before')
return total return total
} }
...@@ -2433,7 +2433,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2433,7 +2433,7 @@ export default class FixedAssetsMovement extends Component {
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.buttonError === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
......
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