Merge branch 'release/2.2' into develop

apps/page/assortment/src/lib/price-update/price-update.component.store.ts

@@ -6,6 +6,7 @@ import { ComponentStore, OnStoreInit, tapResponse } from '@ngrx/component-store'
 import { ListResponseArgsOfProductListItemDTO, ProductListItemDTO, QuerySettingsDTO } from '@swagger/wws';
 import { UiFilter } from '@ui/filter';
 import { UiModalService } from '@ui/modal';
+import { isNil } from 'lodash';
 import { Subject } from 'rxjs';
 import { debounceTime, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 import { INITIAL_PRICE_UPDATE_COMPONENT_STATE, PriceUpdateComponentState } from './price-update.component.state';
@@ -176,7 +177,7 @@ export class PriceUpdateComponentStore extends ComponentStore<PriceUpdateCompone
 
   isSelectable(item: ProductListItemDTO) {
     // True wenn das Item das aktuelle oder ein älteres Datum beim gültig ab Wert hat
-    return new Date(item?.task?.dueDate) <= new Date(Date.now());
+    return new Date(item?.task?.dueDate) <= new Date(Date.now()) && isNil(item.task.completed);
   }
 
   restorePendingFilter = this.updater((state) => ({ ...state, pendingFilter: UiFilter.create(state.filter) }));

azure-pipelines.yml

@@ -12,7 +12,7 @@ variables:
     value: '2'
   # Minor Version einstellen
   - name: 'Minor'
-    value: '1'
+    value: '2'
   - name: 'Patch'
     value: "$[counter(format('{0}.{1}', variables['Major'], variables['Minor']),0)]"
   - name: 'BuildUniqueID'