Commit 7ff16832 authored by fahrur huzain's avatar fahrur huzain

Merge branch 'dev/fahrur-new' into 'ENV-DEV'

cashflow issue

See merge request !2139
parents f1f4cee7 73c50817
...@@ -916,8 +916,8 @@ export default class CashFlow extends Component { ...@@ -916,8 +916,8 @@ export default class CashFlow extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(tableMeta.rowData[6].value).toFixed(1)} // value={fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1)}
value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))} value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
/> />
</span> </span>
: :
...@@ -929,7 +929,7 @@ export default class CashFlow extends Component { ...@@ -929,7 +929,7 @@ export default class CashFlow extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(tableMeta.rowData[6].value).toFixed(1)} // value={Number(tableMeta.rowData[6].value).toFixed(1)}
value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))} value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
/> />
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
...@@ -951,7 +951,7 @@ export default class CashFlow extends Component { ...@@ -951,7 +951,7 @@ export default class CashFlow extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(tableMeta.rowData[6].value).toFixed(1)} // value={Number(tableMeta.rowData[6].value).toFixed(1)}
value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))} value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
/> />
: :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[24]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[24]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
...@@ -970,7 +970,7 @@ export default class CashFlow extends Component { ...@@ -970,7 +970,7 @@ export default class CashFlow extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(tableMeta.rowData[6].value).toFixed(1)} // value={Number(tableMeta.rowData[6].value).toFixed(1)}
value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))} value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -990,7 +990,7 @@ export default class CashFlow extends Component { ...@@ -990,7 +990,7 @@ export default class CashFlow extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(tableMeta.rowData[6].value).toFixed(1)} // value={Number(tableMeta.rowData[6].value).toFixed(1)}
value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))} value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
/> />
: :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[24]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[24]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
...@@ -1009,7 +1009,7 @@ export default class CashFlow extends Component { ...@@ -1009,7 +1009,7 @@ export default class CashFlow extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(tableMeta.rowData[6].value).toFixed(1)} // value={Number(tableMeta.rowData[6].value).toFixed(1)}
value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))} value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
/> />
</LightTooltip> </LightTooltip>
: :
......
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