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 1234: #3118 Fixed Process nummeration

Browse Source 
#3118 Fixed Process nummeration
This commit is contained in:
Nino Righi
2022-05-12 14:56:23 +00:00
committed by Andreas Schickinger
parent c529134cd2
commit d206ba1606
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/isa-app/src/app/guards/can-activate-cart-with-process-id.guard.ts
View File

@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
import { ApplicationService } from '@core/application';
import { ApplicationProcess, ApplicationService } from '@core/application';
import { first } from 'rxjs/operators';
@Injectable({ providedIn: 'root' })
@@ -25,11 +25,16 @@ export class CanActivateCartWithProcessIdGuard implements CanActivate {
id: +route.params.processId,
type: 'cart',
section: 'customer',
name: `Vorgang ${processes.length + 1}`,
name: `Vorgang ${this.processNumber(processes)}`,
});
}
this._applicationService.activateProcess(+route.params.processId);
return true;
}
processNumber(processes: ApplicationProcess[]) {
const processNumbers = processes?.map((process) => Number(process?.name?.replace(/\D/g, '')));
return !!processNumbers && processNumbers?.length > 0 ? Math.max(...processNumbers) + 1 : 1;
}
}

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

@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
import { ApplicationService } from '@core/application';
import { ApplicationProcess, ApplicationService } from '@core/application';
import { first } from 'rxjs/operators';
@Injectable({ providedIn: 'root' })
@@ -25,11 +25,16 @@ export class CanActivateCustomerWithProcessIdGuard implements CanActivate {
id: +route.params.processId,
type: 'cart',
section: 'customer',
name: `Vorgang ${processes.length + 1}`,
name: `Vorgang ${this.processNumber(processes)}`,
});
}
this._applicationService.activateProcess(+route.params.processId);
return true;
}
processNumber(processes: ApplicationProcess[]) {
const processNumbers = processes?.map((process) => Number(process?.name?.replace(/\D/g, '')));
return !!processNumbers && processNumbers?.length > 0 ? Math.max(...processNumbers) + 1 : 1;
}
}

9
apps/isa-app/src/app/guards/can-activate-product-with-process-id.guard.ts
View File

@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
import { ApplicationService } from '@core/application';
import { ApplicationProcess, ApplicationService } from '@core/application';
import { first } from 'rxjs/operators';
@Injectable({ providedIn: 'root' })
@@ -25,11 +25,16 @@ export class CanActivateProductWithProcessIdGuard implements CanActivate {
id: +route.params.processId,
type: 'cart',
section: 'customer',
name: `Vorgang ${processes.length + 1}`,
name: `Vorgang ${this.processNumber(processes)}`,
});
}
this._applicationService.activateProcess(+route.params.processId);
return true;
}
processNumber(processes: ApplicationProcess[]) {
const processNumbers = processes?.map((process) => Number(process?.name?.replace(/\D/g, '')));
return !!processNumbers && processNumbers?.length > 0 ? Math.max(...processNumbers) + 1 : 1;
}
}