arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed removal of avrop

Browse Source
This commit is contained in:
Erik Tiekstra
2021-09-20 11:55:40 +02:00
parent bfffed4099
commit ffc5a46807
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.html
View File

@@ -50,6 +50,7 @@
af-label="Välj handledare att tilldela" af-label="Välj handledare att tilldela"
af-placeholder="Välj handledare" af-placeholder="Välj handledare"
[afRequired]="true" [afRequired]="true"
af-validation="error"
(afOnChange)="changeHandledare($event.detail)" (afOnChange)="changeHandledare($event.detail)"
> >
<option <option
@@ -76,7 +77,7 @@
[handledare]="selectedHandledare$ | async" [handledare]="selectedHandledare$ | async"
[handledareConfirmed]="handledareConfirmed$ | async" [handledareConfirmed]="handledareConfirmed$ | async"
[avropLoading]="avropLoading$ | async" [avropLoading]="avropLoading$ | async"
(selectionChanged)="updateSelectedAvrop($event)" (selectionChanged)="updateSelectedAvrop($event, currentStep)"
(paginated)="setNewPage($event)" (paginated)="setNewPage($event)"
></msfa-avrop-list> ></msfa-avrop-list>
</div> </div>

8
apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.ts
View File

@@ -29,8 +29,12 @@ export class AvropComponent {
constructor(private avropService: AvropService) {} constructor(private avropService: AvropService) {}
updateSelectedAvrop(deltagareList: Avrop[]): void { updateSelectedAvrop(deltagareList: Avrop[], currentStep: number): void {
this.avropService.setSelectedAvrop(deltagareList); if (currentStep !== 1 && !deltagareList.length) {
this.avropService.goToStep1();
} else {
this.avropService.setSelectedAvrop(deltagareList);
}
} }
lockSelectedAvrop(): void { lockSelectedAvrop(): void {

2
apps/mina-sidor-fa/src/app/shared/services/avrop.service.ts
View File

@@ -85,7 +85,7 @@ export class AvropService {
); );
public availableHandledare$: Observable<Handledare[]> = this._lockedAvrop$.pipe( public availableHandledare$: Observable<Handledare[]> = this._lockedAvrop$.pipe(
filter(lockedAvrop => !!lockedAvrop), filter(lockedAvrop => !!lockedAvrop?.length),
switchMap(lockedAvrop => this.avropApiService.fetchAvailableHandledare$(lockedAvrop)) switchMap(lockedAvrop => this.avropApiService.fetchAvailableHandledare$(lockedAvrop))
); );