sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 1669: #4431 Adjusted Process Tab Logic for Customer Order Area

Browse Source 
#4431 Adjusted Process Tab Logic for Customer Order Area
This commit is contained in:
Nino Righi
2023-11-03 09:13:10 +00:00
committed by Lorenz Hilpert
parent c9782a7d29
commit 9c9e061f6d
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/isa-app/src/app/guards/can-activate-customer-orders-with-process-id.guard.ts
View File

@@ -15,11 +15,12 @@ export class CanActivateCustomerOrdersWithProcessIdGuard {
.toPromise();
if (!process) {
const processes = await this._applicationService.getProcesses$('customer').pipe(first()).toPromise();
await this._applicationService.createProcess({
id: +route.params.processId,
type: 'customer-order',
type: 'cart',
section: 'customer',
name: `Kundenbestellungen`,
name: `Vorgang ${this.processNumber(processes.filter((process) => process.type === 'cart'))}`,
});
}
@@ -46,6 +47,18 @@ export class CanActivateCustomerOrdersWithProcessIdGuard {
processNumber(processes: ApplicationProcess[]) {
const processNumbers = processes?.map((process) => Number(process?.name?.replace(/\D/g, '')));
return !!processNumbers && processNumbers?.length > 0 ? Math.max(...processNumbers) + 1 : 1;
return !!processNumbers && processNumbers.length > 0 ? this.findMissingNumber(processNumbers) : 1;
}
findMissingNumber(processNumbers: number[]) {
// Ticket #3272 Bei Klick auf "+" bzw. neuen Prozess hinzufügen soll der neue Tab immer die höchste Nummer haben (wie aktuell im Produktiv)
// ----------------------------------------------------------------------------------------------------------------------------------------
// for (let missingNumber = 1; missingNumber < Math.max(...processNumbers); missingNumber++) {
// if (!processNumbers.find((number) => number === missingNumber)) {
// return missingNumber;
// }
// }
return Math.max(...processNumbers) + 1;
}
}

3
apps/page/customer-order/src/lib/customer-order-search/search-main/customer-order-search-main.component.ts
View File

@@ -62,9 +62,6 @@ export class CustomerOrderSearchMainComponent implements OnInit, OnDestroy {
) {}
ngOnInit() {
// Clear scroll position
localStorage.removeItem(`SCROLL_POSITION_${this.processId}`);
this._subscriptions.add(
combineLatest([this.processId$, this._activatedRoute.queryParams])
.pipe(debounceTime(50))