evo/EvoCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vchikalkin/EvoCalculator

Browse Source
This commit is contained in:
vchikalkin 2022-04-25 15:22:27 +03:00
commit 5429791bbf
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/Containers/Calculation/Elements/props/common.ts
View File

@ -76,7 +76,7 @@ const elementsProps: Partial<Record<AllElementsNames, ElementProps>> = {
},
tbxLastPaymentPerc: {
min: '0',
max: '15',
max: '70',
step: '1.000000',
precision: 6,
formatter: formatNumber,

53
src/client/stores/CalculationStore/Effects/actions/calculate/validate/tables.ts
View File

@ -11,32 +11,12 @@ function validateInsuranceTable(this: ICalculationStore) {
rows => rows.findIndex(x => x?.key === 'osago'),
'value',
);
this.setTableRow('tableInsurance', rows =>
rows.findIndex(x => x?.key === 'osago'),
)({
insuranceCompany: {
validation: !isNil(osagoRow.insuranceCompany),
},
insured: {
validation: !isNil(osagoRow.insured),
},
});
const kaskoRow = this.getTableRowValues(
'tableInsurance',
rows => rows.findIndex(x => x?.key === 'kasko'),
'value',
);
this.setTableRow('tableInsurance', rows =>
rows.findIndex(x => x?.key === 'kasko'),
)({
insuranceCompany: {
validation: !isNil(kaskoRow.insuranceCompany),
},
insured: {
validation: !isNil(kaskoRow.insured),
},
});
/**
* если в СК ОСАГО поле evo_osago_with_kasko=True И СК ОСАГО != СК КАСКО,
@ -50,25 +30,52 @@ function validateInsuranceTable(this: ICalculationStore) {
const invalid =
osagoInsuranceCompanyOption?.evo_osago_with_kasko &&
osagoRow.insuranceCompany !== kaskoRow.insuranceCompany;
if (invalid)
if (invalid) {
openNotification({
type: 'error',
message: 'Ошибка',
description:
'Невозможно страхование ОСАГО отдельно от КАСКО - страховая компания должна быть одна!',
});
this.setTableRow('tableInsurance', rows =>
rows.findIndex(x => x?.key === 'osago'),
)({
insuranceCompany: {
validation: !invalid,
},
});
this.setTableRow('tableInsurance', rows =>
rows.findIndex(x => x?.key === 'kasko'),
)({
insuranceCompany: {
validation: !invalid,
},
});
return;
}
/**
* Проверка на заполнение ОСАГО и КАСКО
*/
this.setTableRow('tableInsurance', rows =>
rows.findIndex(x => x?.key === 'osago'),
)({
insuranceCompany: {
validation: !invalid,
validation: !isNil(osagoRow.insuranceCompany),
},
insured: {
validation: !isNil(osagoRow.insured),
},
});
this.setTableRow('tableInsurance', rows =>
rows.findIndex(x => x?.key === 'kasko'),
)({
insuranceCompany: {
validation: !invalid,
validation: !isNil(kaskoRow.insuranceCompany),
},
insured: {
validation: !isNil(kaskoRow.insured),
},
});
}