diff --git a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts index 442831c..a2438f6 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts @@ -169,8 +169,11 @@ const gibddReactions: IReactionEffect[] = [ expression: () => { return calculationStore.getOption('selectLeaseObjectType'); }, - effect: ({ evo_category }) => { - calculationStore.setValue('leaseObjectCategory', evo_category); + effect: selectLeaseObjectType => { + calculationStore.setValue( + 'leaseObjectCategory', + selectLeaseObjectType?.evo_category, + ); }, options: { fireImmediately: true, @@ -347,6 +350,7 @@ const gibddReactions: IReactionEffect[] = [ 'objectRegistration', 'regionRegistration', 'typePTS', + 'leaseObjectCategory', ]), }; }, @@ -355,6 +359,7 @@ const gibddReactions: IReactionEffect[] = [ objectRegionRegistration, regionRegistration, typePTS, + leaseObjectCategory, }) => { calculationStore.setFilter('selectRegistration', options => options.filter(x => { @@ -366,6 +371,10 @@ const gibddReactions: IReactionEffect[] = [ return false; } + if (leaseObjectCategory !== 100000001 && x?.evo_towtruck) { + return false; + } + if ( !( x?.evo_gibdd_region ===