Skip to content

T
Tia-dev
Commit 320e8d45 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'ENV-PROD' into 'ENV-DEPLOYMENT-PROD' 

Fixing Issue Prod BSRO

See merge request !2375
parents 072d3304 7c361de8
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
src/container/Reports/TableSubHolding.js
View file @ 320e8d45
...@@ -26884,7 +26884,8 @@ export default class TableSubHolding extends Component { ...@@ -26884,7 +26884,8 @@ export default class TableSubHolding extends Component {
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
fixedDecimalScale fixedDecimalScale
value={fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)} value={fixNumber(Number(tableMeta.rowData[11]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[11]), 1)}
// value={fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)}
/> />
} }
/> />
...@@ -26907,7 +26908,8 @@ export default class TableSubHolding extends Component { ...@@ -26907,7 +26908,8 @@ export default class TableSubHolding extends Component {
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
fixedDecimalScale fixedDecimalScale
value={fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)} value={fixNumber(Number(tableMeta.rowData[12]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[12]), 1)}
// value={fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)}
/> />
} }
/> />
src/container/RollingOutlook/BalanceSheetRO.js
View file @ 320e8d45
...@@ -710,7 +710,7 @@ export default class BalanceSheetRO extends Component { ...@@ -710,7 +710,7 @@ export default class BalanceSheetRO extends Component {
let val = String(value).split(",").join("") let val = String(value).split(",").join("")
if (type === "actual") { if (type === "actual") {
console.log('masuk') console.log('masuk')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
} else { } else {
console.log('masuk2') console.log('masuk2')
let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2]) let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2])
...@@ -719,26 +719,27 @@ export default class BalanceSheetRO extends Component { ...@@ -719,26 +719,27 @@ export default class BalanceSheetRO extends Component {
let a = 0 let a = 0
if (type == 'r/e') { if (type == 'r/e') {
// console.log('masuk8') // console.log('masuk8')
a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val) a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = Number(val)
} else { } else {
// console.log('masuk9') // console.log('masuk9')
a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val) a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
} }
let jagain = dataTable2[indexParent][tableMeta.columnIndex] let jagain = dataTable2[indexParent][tableMeta.columnIndex]
if (this.props.defaultCurrency.id == 1) { a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? (0 + Number(val)) : Number(jagain + Number(val))
a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? fixNumber((0 + Number(val)), 1) : fixNumber(Number(jagain + Number(val)), 1) // if (this.props.defaultCurrency.id == 1) {
} else { // a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? fixNumber((0 + Number(val)), 1) : fixNumber(Number(jagain + Number(val)), 1)
a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? (0 + Number(val)) : Number(jagain + Number(val)) // } else {
}
// }
} else { } else {
// console.log('masuk3') // console.log('masuk3')
if (type == 'r/e') { if (type == 'r/e') {
// console.log('masuk4') // console.log('masuk4')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = Number(val)
} else { } else {
// console.log('masuk5') // console.log('masuk5')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
} }
} }
} }
...@@ -752,8 +753,11 @@ export default class BalanceSheetRO extends Component { ...@@ -752,8 +753,11 @@ export default class BalanceSheetRO extends Component {
total = item[data.columnIndex] === undefined ? Number(total) + 0 : Number(total) + itemVal total = item[data.columnIndex] === undefined ? Number(total) + 0 : Number(total) + itemVal
} }
}) })
// if (data.rowData[5] === "Acc. Depreciation & Amortization" && data.columnIndex == 17) {
// console.log(total)
// }
let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[data.rowIndex][2]) let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[data.rowIndex][2])
let a = dataTable2[data.rowIndex][data.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total) let a = dataTable2[data.rowIndex][data.columnIndex] = Number(total)
// console.log(indexParent); // console.log(indexParent);
return a return a
} }
...@@ -820,12 +824,6 @@ export default class BalanceSheetRO extends Component { ...@@ -820,12 +824,6 @@ export default class BalanceSheetRO extends Component {
} }
}) })
// if (tableMeta.columnIndex == 7) {
// console.log(splitFormula)
// console.log(baru)
// }
// console.log(baru)
baru.map((item, index) => { baru.map((item, index) => {
if (item == '-' || item == '+' || item == '/' || item == '*') { if (item == '-' || item == '+' || item == '/' || item == '*') {
anjay.push(item) anjay.push(item)
...@@ -894,7 +892,6 @@ export default class BalanceSheetRO extends Component { ...@@ -894,7 +892,6 @@ export default class BalanceSheetRO extends Component {
} }
} }
}) })
// console.log(anjay)
let total = 0 let total = 0
let opt = "" let opt = ""
...@@ -3320,7 +3317,7 @@ export default class BalanceSheetRO extends Component { ...@@ -3320,7 +3317,7 @@ export default class BalanceSheetRO extends Component {
</div> </div>
{this.state.visibleUpload && ( {this.state.visibleUpload && (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8, width: 679 }}>
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
<div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}> <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<div className="popup-title"> <div className="popup-title">
......
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