diff --git a/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts b/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts
index 550ce6d1b4..fb24d8e7ed 100644
--- a/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts
+++ b/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts
@@ -159,7 +159,7 @@ export class ContractsComponent {
...this.contractFilter,
contractType: filterList,
};
- this.contractsFacade.setContracts(this.pagination.page, this.pagination.pageSize, [ this.pagination.sorting ], this.contractFilter);
+ this.contractsFacade.setContracts(0, this.pagination.pageSize, [ this.pagination.sorting ], this.contractFilter);
}
ngOnDestroy() {
diff --git a/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.html b/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.html
index e96b70c6e5..9a1849564a 100644
--- a/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.html
+++ b/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.html
@@ -20,22 +20,15 @@
- {{ 'quickFilter.asBuilt' | i18n }}
-
-
- {{ 'quickFilter.asPlanned' | i18n }}
+ (click)="emitQuickFilter([ContractType.ASSET_AS_BUILT, ContractType.ASSET_AS_PLANNED])"
+ (keydown)="emitQuickFilter([ContractType.ASSET_AS_BUILT, ContractType.ASSET_AS_PLANNED])">
+ {{ 'quickFilter.parts' | i18n }}
+ (click)="emitQuickFilter([ContractType.NOTIFICATION])"
+ (keydown)="emitQuickFilter([ContractType.NOTIFICATION])">
{{ 'quickFilter.notification' | i18n }}
diff --git a/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.spec.ts b/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.spec.ts
index 29fe1fcbfd..61585ecab9 100644
--- a/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.spec.ts
+++ b/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.spec.ts
@@ -24,7 +24,7 @@ describe('BomLifecycleActivatorComponent', () => {
const { fixture } = await renderQuickFilter();
const { componentInstance } = fixture;
componentInstance.activeContractTypes = [];
- componentInstance.emitQuickFilter(ContractType.ASSET_AS_BUILT);
+ componentInstance.emitQuickFilter([ ContractType.ASSET_AS_BUILT ]);
expect(componentInstance.activeContractTypes).toEqual([ ContractType.ASSET_AS_BUILT ]);
});
@@ -32,7 +32,7 @@ describe('BomLifecycleActivatorComponent', () => {
const { fixture } = await renderQuickFilter();
const { componentInstance } = fixture;
componentInstance.activeContractTypes = [ ContractType.ASSET_AS_PLANNED ];
- componentInstance.emitQuickFilter(ContractType.ASSET_AS_PLANNED);
+ componentInstance.emitQuickFilter([ ContractType.ASSET_AS_PLANNED ]);
expect(componentInstance.activeContractTypes).toEqual([]);
});
});
diff --git a/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.ts b/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.ts
index 1d4a9b625d..6d640c7c0c 100644
--- a/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.ts
+++ b/frontend/src/app/modules/shared/components/contracts-quick-filter/contracts-quick-filter.component.ts
@@ -29,11 +29,12 @@ export class ContractsQuickFilterComponent {
activeContractTypes: ContractType[] = [];
@Output() buttonClickEvent = new EventEmitter();
- emitQuickFilter(contractType: ContractType) {
- if (this.activeContractTypes?.includes(contractType)) {
- this.activeContractTypes = this.activeContractTypes.filter(type => type !== contractType);
+ emitQuickFilter(contractTypeList: ContractType[]) {
+ if (this.activeContractTypes?.includes(contractTypeList[0])) {
+ this.activeContractTypes = this.activeContractTypes.filter(type => type !== contractTypeList[0]);
+ this.activeContractTypes = this.activeContractTypes.filter(type => type !== contractTypeList?.[1]);
} else {
- this.activeContractTypes.push(contractType);
+ this.activeContractTypes.push(...contractTypeList);
}
this.buttonClickEvent.emit(this.activeContractTypes);
}
diff --git a/frontend/src/assets/locales/de/common.json b/frontend/src/assets/locales/de/common.json
index 56df65dca5..e593942f44 100644
--- a/frontend/src/assets/locales/de/common.json
+++ b/frontend/src/assets/locales/de/common.json
@@ -399,7 +399,8 @@
"customer" : "KUNDE",
"asBuilt" : "As built",
"asPlanned" : "As planned",
- "notification" : "Qualitätsthemen"
+ "notification" : "Qualitätsthemen",
+ "parts" : "Produkte"
},
"multiSelect": {
"filterLabel": "Filter",
diff --git a/frontend/src/assets/locales/en/common.json b/frontend/src/assets/locales/en/common.json
index 4d3172f548..24c61e8f5b 100644
--- a/frontend/src/assets/locales/en/common.json
+++ b/frontend/src/assets/locales/en/common.json
@@ -398,7 +398,8 @@
"customer" : "CUSTOMER",
"asBuilt" : "As built",
"asPlanned" : "As planned",
- "notification" : "Quality incidents"
+ "notification" : "Quality incidents",
+ "parts" : "Parts"
},
"multiSelect": {
"filterLabel": "Filter",