Skip to content

T
Tia-dev
Commit 31e8a437 authored by fahrur huzain's avatar fahrur huzain
Browse files
Options

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

issue MB BS should be null merah

See merge request !2240
parents d03e9e4c 831dc09c
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 15 deletions
src/container/BudgetTahunan/BalanceSheet.js
View file @ 31e8a437
...@@ -1175,7 +1175,8 @@ export default class BalanceSheet extends Component { ...@@ -1175,7 +1175,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -1362,7 +1363,8 @@ export default class BalanceSheet extends Component { ...@@ -1362,7 +1363,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -1550,7 +1552,8 @@ export default class BalanceSheet extends Component { ...@@ -1550,7 +1552,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -1737,7 +1740,8 @@ export default class BalanceSheet extends Component { ...@@ -1737,7 +1740,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -1924,7 +1928,8 @@ export default class BalanceSheet extends Component { ...@@ -1924,7 +1928,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -2111,7 +2116,8 @@ export default class BalanceSheet extends Component { ...@@ -2111,7 +2116,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -2298,7 +2304,8 @@ export default class BalanceSheet extends Component { ...@@ -2298,7 +2304,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -2485,7 +2492,8 @@ export default class BalanceSheet extends Component { ...@@ -2485,7 +2492,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -2672,7 +2680,8 @@ export default class BalanceSheet extends Component { ...@@ -2672,7 +2680,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -2859,7 +2868,8 @@ export default class BalanceSheet extends Component { ...@@ -2859,7 +2868,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -3046,7 +3056,8 @@ export default class BalanceSheet extends Component { ...@@ -3046,7 +3056,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -3233,7 +3244,8 @@ export default class BalanceSheet extends Component { ...@@ -3233,7 +3244,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -3420,7 +3432,8 @@ export default class BalanceSheet extends Component { ...@@ -3420,7 +3432,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -3607,7 +3620,8 @@ export default class BalanceSheet extends Component { ...@@ -3607,7 +3620,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -3794,7 +3808,8 @@ export default class BalanceSheet extends Component { ...@@ -3794,7 +3808,8 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(fixNumber(Number(handleValidation(value, tableMeta)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 1) <= Number(this.state.maxValue)) ? (this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleValidation(value, tableMeta)), 1) : fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= 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