Skip to content

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

Merge branch 'GGMAC' into 'master' 

update CF OLPA

See merge request !1479
parents 3679ff8f 881f2e24
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
src/container/OutlookPA/CashFlowOLPA.js
View file @ 649a6c4c
...@@ -83,6 +83,7 @@ export default class CashFlow extends Component { ...@@ -83,6 +83,7 @@ export default class CashFlow extends Component {
console.log(checkApprover) console.log(checkApprover)
console.log(checkPrevRev) console.log(checkPrevRev)
this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev }) this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
// this.setState({viewOnly: true})
} }
componentDidMount() { componentDidMount() {
...@@ -504,10 +505,10 @@ export default class CashFlow extends Component { ...@@ -504,10 +505,10 @@ export default class CashFlow extends Component {
} }
} }
} else { } else {
let indexID = dataTable2.findIndex((val) => val[22] == item) let indexID = dataTable2.findIndex((val) => val[18] == item)
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = dataTable2[indexID][column].value == undefined ? dataTable2[indexID][column] : dataTable2[indexID][column].value let valuezz = dataTable2[indexID][column].value == undefined ? dataTable2[indexID][column] : dataTable2[indexID][column].value
if (item == dataTable2[tableMeta.rowIndex][22]) { if (item == dataTable2[tableMeta.rowIndex][18]) {
anjay.push(0) anjay.push(0)
} else { } else {
anjay.push(valuezz == "" ? 0 : valuezz) anjay.push(valuezz == "" ? 0 : valuezz)
...@@ -679,14 +680,14 @@ export default class CashFlow extends Component { ...@@ -679,14 +680,14 @@ export default class CashFlow extends Component {
total = R.equals(total, NaN) ? "0.0" : total total = R.equals(total, NaN) ? "0.0" : total
if (tableMeta.rowData[5] == '2.1 Additional fixed assets and CIP' && column == 7) { // if (tableMeta.rowData[1] == 3243762 && column == 17) {
console.log(tableMeta.rowData) // console.log(tableMeta.rowData)
console.log(splitFormula) // console.log(splitFormula)
console.log(baru) // console.log(baru)
console.log(anjay) // console.log(anjay)
console.log(anjay2) // console.log(anjay2)
console.log(total) // console.log(total)
} // }
if (dataTable2[tableMeta.rowIndex][column].value == undefined) { if (dataTable2[tableMeta.rowIndex][column].value == undefined) {
dataTable2[tableMeta.rowIndex][column] = total dataTable2[tableMeta.rowIndex][column] = total
...@@ -1510,7 +1511,8 @@ export default class CashFlow extends Component { ...@@ -1510,7 +1511,8 @@ export default class CashFlow extends Component {
/> />
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(Number(tableMeta.rowData[15]).toFixed(1) >= Number(this.state.minValue) && Number(tableMeta.rowData[15]).toFixed(1) <= Number(this.state.maxValue)) ? ((this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[15].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[15], tableMeta, 15)).toFixed(1)) >= Number(this.state.minValue) && (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[15].value).toFixed(1) : Number(handleValueFormula(tableMeta.rowData[15], tableMeta, 15)).toFixed(1)) <= Number(this.state.maxValue)) ?
// (Number(tableMeta.rowData[15]).toFixed(1) >= Number(this.state.minValue) && Number(tableMeta.rowData[15]).toFixed(1) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
......
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