Skip to content

T
Tia-dev
Commit 70af38bf authored by qorri_di's avatar qorri_di
Browse files
Options

Merge branch 'ENV-STAGING' into 'ENV-PROD' 

Env staging

See merge request !2146
parents 4786d711 53f19741
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5317 additions and 4944 deletions
src/container/BudgetTahunan/BalanceSheet.js
View file @ 70af38bf
This diff is collapsed.
src/container/BudgetTahunan/TaxPlanning.js
View file @ 70af38bf
This diff is collapsed.
src/container/MasterData/Parameter/CreateParameter.js
View file @ 70af38bf
...@@ -1020,7 +1020,7 @@ export default class CreateParameter extends Component { ...@@ -1020,7 +1020,7 @@ export default class CreateParameter extends Component {
validasiRegexValue() { validasiRegexValue() {
let obj = null let obj = null
if (R.isNil(this.state.getTypes)) { if (R.isNil(this.state.getTypes)) {
obj = { regexValue: "", valueLength: "" } obj = { regexValue: (/null.*$/), valueLength: 0 }
} else { } else {
if (this.state.getTypes.setting_group_name === "CURRENCY") { if (this.state.getTypes.setting_group_name === "CURRENCY") {
obj = { regexValue: (/\d+(\.\d+)?/), valueLength: 20 } obj = { regexValue: (/\d+(\.\d+)?/), valueLength: 20 }
...@@ -1054,6 +1054,8 @@ export default class CreateParameter extends Component { ...@@ -1054,6 +1054,8 @@ export default class CreateParameter extends Component {
obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 } obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 }
} }
} }
}else{
obj = { regexValue: (/null.*$/), valueLength: 20 }
} }
} }
return obj; return obj;
......
src/container/MonthlyReport/MonthlyReport.js
View file @ 70af38bf
...@@ -951,7 +951,7 @@ export default class MonthlyReport extends Component { ...@@ -951,7 +951,7 @@ export default class MonthlyReport extends Component {
visibleOI: false, visibleOI: false,
visibleCF: false, visibleCF: false,
}) })
} else if (item === 'List Of Credit Facilities and Investment') { } else if (item === 'List of Credit Facilities') {
this.setState({ this.setState({
visibleMonthlyReport: false, visibleMonthlyReport: false,
visibleBS: false, visibleBS: false,
......
src/container/OutlookPA/CashFlowOLPA.js
View file @ 70af38bf
...@@ -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