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

fix selectRegistration filter

Browse Source
This commit is contained in:
vchikalkin 2021-07-20 15:22:09 +03:00
parent aeb549be6b
commit fe18089cd4
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
View File

@ -358,14 +358,18 @@ const gibddReactions: IReactionEffect[] = [
}) => {
calculationStore.setFilter('selectRegistration', options =>
options.filter(x => {
if (!(x.evo_whom_register === objectRegistration)) {
if (!objectRegionRegistration && !regionRegistration) {
return false;
}
if (!(x?.evo_whom_register === objectRegistration)) {
return false;
}
if (
!(
x.evo_gibdd_region ===
(objectRegionRegistration.evo_regionid === regionRegistration)
x?.evo_gibdd_region ===
(objectRegionRegistration?.evo_regionid === regionRegistration)
)
) {
return false;
@ -373,23 +377,26 @@ const gibddReactions: IReactionEffect[] = [
if (
(typePTS &&
(!x.evo_pts_type ||
x.evo_pts_type.filter(t => t > 0).length === 0)) ||
x.evo_pts_type?.filter(t => t > 0).includes(typePTS) === false
(!x?.evo_pts_type ||
x?.evo_pts_type.filter(t => t > 0).length === 0)) ||
x?.evo_pts_type?.filter(t => t > 0).includes(typePTS) === false
) {
return false;
}
if (!x.evo_accountid) {
if (!x?.evo_accountid) {
return true;
}
return objectRegionRegistration.accounts
.map(r => r.accountid)
return objectRegionRegistration?.accounts
?.map(r => r.accountid)
.includes(x.evo_accountid);
}),
);
},
options: {
fireImmediately: true,
},
}),
(calculationStore, calculationProcess) => ({