Skip to content

T
Tia-dev
Commit 7283eac9 authored by Riri Novita's avatar Riri Novita
Browse files
Options

update

parent 095baca7
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
src/container/BudgetTahunan/BalanceSheet.js
View file @ 7283eac9
...@@ -1175,7 +1175,7 @@ export default class BalanceSheet extends Component { ...@@ -1175,7 +1175,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -1363,7 +1363,7 @@ export default class BalanceSheet extends Component { ...@@ -1363,7 +1363,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -1552,7 +1552,7 @@ export default class BalanceSheet extends Component { ...@@ -1552,7 +1552,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -1740,7 +1740,7 @@ export default class BalanceSheet extends Component { ...@@ -1740,7 +1740,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -1928,7 +1928,7 @@ export default class BalanceSheet extends Component { ...@@ -1928,7 +1928,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -2116,7 +2116,7 @@ export default class BalanceSheet extends Component { ...@@ -2116,7 +2116,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -2304,7 +2304,7 @@ export default class BalanceSheet extends Component { ...@@ -2304,7 +2304,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -2492,7 +2492,7 @@ export default class BalanceSheet extends Component { ...@@ -2492,7 +2492,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -2680,7 +2680,7 @@ export default class BalanceSheet extends Component { ...@@ -2680,7 +2680,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -2868,7 +2868,7 @@ export default class BalanceSheet extends Component { ...@@ -2868,7 +2868,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -3056,7 +3056,7 @@ export default class BalanceSheet extends Component { ...@@ -3056,7 +3056,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -3244,7 +3244,7 @@ export default class BalanceSheet extends Component { ...@@ -3244,7 +3244,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -3432,7 +3432,7 @@ export default class BalanceSheet extends Component { ...@@ -3432,7 +3432,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -3620,7 +3620,7 @@ export default class BalanceSheet extends Component { ...@@ -3620,7 +3620,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
...@@ -3808,7 +3808,7 @@ export default class BalanceSheet extends Component { ...@@ -3808,7 +3808,7 @@ export default class BalanceSheet extends Component {
null null
: :
tableMeta.rowData[0] === 7 ? tableMeta.rowData[0] === 7 ?
(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)) ?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && 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}
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 7283eac9
...@@ -219,7 +219,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -219,7 +219,7 @@ export default class CorporateAnnualTarget extends Component {
item.level, item.level,
"", "",
item.description, item.description,
item.type_report_id == 1 ? (`${String(item.weight).includes('%') ? String(item.weight) : String((fixNumber(Number(item.weight) * 100)) + '% ')}`) : (String(Number(String(item.cat.weight).substr(0, String(item.cat.weight).length - 1))) + '%'), item.type_report_id == 1 ? (`${String(item.weight).includes('%') ? String(item.weight) : String(fixNumber((Number(item.weight) * 100)) + '% ')}`) : (String(Number(String(item.cat.weight).substr(0, String(item.cat.weight).length - 1))) + '%'),
item.cat.uom, item.cat.uom,
item.kpi_type == "" ? null : { value: item.kpi_type }, item.kpi_type == "" ? null : { value: item.kpi_type },
item.max_ach == "" ? null : { value: titleCase(item.max_ach) }, item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
......
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