sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 457: #1366 Prozess-ID wird bei neuem Vorgang / wechsel gesetzt

Browse Source 
#1366 Prozess-ID wird bei neuem Vorgang / wechsel gesetzt

Related work items: #1366
This commit is contained in:
Andreas Schickinger
2021-02-01 14:44:34 +00:00
committed by Lorenz Hilpert
parent 5ef4a2d4c5 778e9cf049
commit 813ad4afad
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/sales/src/app/components/process-header/process-header.component.ts
View File

@@ -11,6 +11,7 @@ import { takeUntil, switchMap, filter, distinctUntilChanged } from 'rxjs/operato
import { ProcessSelectors } from '../../core/store/selectors/process.selectors';
import { WindowRef } from '../../core/services/window-ref.service';
import { ModuleSwitcher } from '../../core/models/app-switcher.enum';
import { ApplicationService } from '@core/application';
@Component({
selector: 'app-process-header',
@@ -43,7 +44,13 @@ export class ProcessHeaderComponent implements OnInit, OnDestroy {
private iPadDetected = false;
private iPadEventRecieved = false;
constructor(private store: Store, private router: Router, private cdr: ChangeDetectorRef, private windowRef: WindowRef) {}
constructor(
private store: Store,
private router: Router,
private cdr: ChangeDetectorRef,
private windowRef: WindowRef,
private applicationService: ApplicationService
) {}
addProcess() {
const itemNo = !this.processes
@@ -76,6 +83,7 @@ export class ProcessHeaderComponent implements OnInit, OnDestroy {
);
this.router.navigate(['/product/search']);
});
this.applicationService.setActivatedProcessId(newProcess.id);
}
ngOnInit() {

10
apps/sales/src/app/components/process-tab/process-tab.component.ts
View File

@@ -34,6 +34,7 @@ import { ModuleSwitcher } from '../../core/models/app-switcher.enum';
import { USER_FORM_STATE_KEY, USER_EXTRAS_FORM_STATE_KEY, USER_ERRORS_FORM_STATE_KEY } from '../../core/utils/app.constants';
import { DeleteFormState } from '../../core/store/actions/forms.actions';
import { ApplicationService } from '@core/application';
@Component({
selector: 'app-process-tab',
@@ -73,7 +74,13 @@ export class ProcessTabComponent implements OnInit, OnDestroy, AfterViewInit {
cartanimation = '';
cartBackgroundForDownload = false;
constructor(private store: Store, private router: Router, private cdr: ChangeDetectorRef, private route: ActivatedRoute) {}
constructor(
private store: Store,
private router: Router,
private cdr: ChangeDetectorRef,
private route: ActivatedRoute,
private applicationService: ApplicationService
) {}
isProcessFinished = this.router.url === '/cart/confirmation';
deleteProcess(process: Process) {
@@ -123,6 +130,7 @@ export class ProcessTabComponent implements OnInit, OnDestroy, AfterViewInit {
}
}
});
this.applicationService.setActivatedProcessId(process.id);
}
ngOnInit() {