Merge pull request #28 in TEA/dafa-web-monorepo from feature/TV-285-hantera-avrop-skelett to develop
Squashed commit of the following: commit 4d31c7c490c37ba2b9715b6d4b5ee2cb58f1fb06 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 23 14:18:52 2021 +0200 add step 4 commit cfeb21b69200a70987cd93caa17527402d0447a1 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 23 13:49:20 2021 +0200 Update avrop-table.component.ts commit 253f77f8882028d1590bd7e5ff2a17516ab9ed01 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 23 13:18:01 2021 +0200 Update avrop-table.component.ts commit 86f8ea2a6840834c9661b715c08bdfaeb20f7e98 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 22 13:50:39 2021 +0200 remove unused tests commit 5ec16261ba95911a808c1535233950509df1235f Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 22 13:02:05 2021 +0200 cleanup commit f80630704573fac90b618f06ba50db6409a576ae Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 22 11:53:28 2021 +0200 filters only in step 1 commit 0c1c2ac6c5c8c8016b676ef4ba7959c10d0e5b74 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 22 11:52:09 2021 +0200 default checked commit 1516ac5074846dabfaa354a8dca7e1cd81e8174c Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 22 11:42:04 2021 +0200 add filters and checkboxes commit b5b5d96a713c37a03ab4a4dcbe34d2f236ccc1c3 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 22 10:46:38 2021 +0200 add apis methods for filters commit 3a71113b9dc7bde5306be7e47fc3a3e3568dcd27 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 21 15:56:35 2021 +0200 selectableDeltagareList$ from API service commit 7efcfcbb9e19fff41b3424b079910000954fec03 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 21 15:46:16 2021 +0200 add avrop api service commit 7146c45ea88e4871856efe0bc263db901f0ee393 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 21 14:02:32 2021 +0200 Fixed flow commit d8690eb36b13c5f01f8bfe655d9885b50e6631a7 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 21 12:21:41 2021 +0200 structure start commit 06344cb34c1e0702310cfabaccb094094eb44649 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 21 11:10:31 2021 +0200 add table and row components commit 28dba7accfc819b3a91150275ec5f1ec10494d3b Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 21 11:03:46 2021 +0200 added avrop-filters commit f477dc3d19e30ae461b09de1b0817b41e120c9f2 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 21 11:02:17 2021 +0200 rename call-off to avrop commit 9109bd15b518dcb5e3b1c272dcc8c90fa9e6843b Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Fri Jun 18 14:24:31 2021 +0200 fix: removed comment and console print commit e75537d2434ae57d4933b435150641ddabd262fa Merge: 9c8a224f7081d8Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 18 13:03:49 2021 +0200 Merge branch 'develop' into feature/TV-285-hantera-avrop-skelett commit 9c8a22424e4a7e692a38148e1d06da464f136748 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 18 10:04:10 2021 +0200 feature/tv-285: added basic logic to toggle between the progress steps and render correct ui commit e39b5b9b1dc513e1a24dd945590343b5c063f65f Merge: 8004cd588c68e1Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Thu Jun 17 17:21:19 2021 +0200 Merge branch 'develop' into feature/TV-285-hantera-avrop-skelett ... and 2 more commits
This commit is contained in:
@@ -0,0 +1,110 @@
|
||||
<dafa-logged-in-shell>
|
||||
<section class="call-off" *ngIf="currentStep$ | async; let currentStep; else loadingRef">
|
||||
<digi-typography>
|
||||
<h2>Välj deltagare att tilldela</h2>
|
||||
<p>Steg {{ currentStep }} av {{ steps }}:</p>
|
||||
</digi-typography>
|
||||
<digi-ng-progress-progressbar
|
||||
[afSteps]="steps"
|
||||
afAriaLabel="An aria label"
|
||||
[afActiveStep]="currentStep">
|
||||
</digi-ng-progress-progressbar>
|
||||
|
||||
<div class="" style="height:300px; padding: 30px 0;">
|
||||
<ng-container *ngIf="currentStep == 4">
|
||||
<h2>Avropet är sparat</h2>
|
||||
<digi-button
|
||||
af-size="m"
|
||||
class="employee-form__read-more"
|
||||
(afOnClick)="goToStep1()">
|
||||
Tillbaka till nya deltagare
|
||||
</digi-button>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="currentStep == 1">
|
||||
<dafa-avrop-filters></dafa-avrop-filters>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="currentStep == 3">
|
||||
<h2>Vänligen bekräfta</h2>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="currentStep < 4">
|
||||
<dafa-avrop-table
|
||||
[selectableDeltagareList]="selectableDeltagareList$ | async"
|
||||
[selectedDeltagareListInput]="selectedDeltagareList$ | async"
|
||||
[isLocked]="deltagareListIsLocked$ | async"
|
||||
(changedSelectedDeltagareList)="updateSelectedDeltagareList($event)"
|
||||
[handledare]="selectedHandledare$ | async"
|
||||
[handledareConfirmed]="handledareConfirmed$ | async"
|
||||
></dafa-avrop-table>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="currentStep == 1">
|
||||
<digi-button
|
||||
af-size="m"
|
||||
class="employee-form__read-more"
|
||||
(afOnClick)="lockSelectedDeltagare()">
|
||||
Lås deltagare
|
||||
</digi-button>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="currentStep == 2">
|
||||
<h2>Välj handledare</h2>
|
||||
<ng-container *ngIf="selectableHandledareList$ | async; let selectableHandledareList; else loadingRefSmall">
|
||||
<select [value]="(selectedHandledare$ | async)?.id ? (selectedHandledare$ | async)?.id : ''" (change)="changeHandledare($event)">
|
||||
<option disabled value="" >Välj handledare</option>
|
||||
|
||||
<option
|
||||
*ngFor="let selectableHandledare of selectableHandledareList"
|
||||
[value]="selectableHandledare?.id"
|
||||
>{{selectableHandledare?.fullName}}</option>
|
||||
</select>
|
||||
|
||||
<span *ngIf="selectableHandledareList.length === 0">Inga handledare har behörighet till alla markerade deltagare</span>
|
||||
</ng-container>
|
||||
|
||||
|
||||
<br><br>
|
||||
<digi-button af-variation="secondary"
|
||||
af-size="m"
|
||||
class="employee-form__read-more"
|
||||
(afOnClick)="unlockSelectedDeltagare()">
|
||||
Tillbaka
|
||||
</digi-button>
|
||||
<digi-button
|
||||
af-size="m"
|
||||
class="employee-form__read-more"
|
||||
(afOnClick)="confirmHandledare()">
|
||||
Tilldela
|
||||
</digi-button>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="currentStep == 3">
|
||||
<br><br>
|
||||
<digi-button af-variation="secondary"
|
||||
af-size="m"
|
||||
class="employee-form__read-more"
|
||||
(afOnClick)="unconfirmHandledare()">
|
||||
Tillbaka
|
||||
</digi-button>
|
||||
<digi-button
|
||||
af-size="m"
|
||||
class="employee-form__read-more"
|
||||
(afOnClick)="save()">
|
||||
Spara avrop
|
||||
</digi-button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</dafa-logged-in-shell>
|
||||
|
||||
|
||||
<ng-template #loadingRef>
|
||||
<digi-ng-skeleton-base [afCount]="3" afText="Laddar personal"></digi-ng-skeleton-base>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #loadingRefSmall>
|
||||
<digi-icon-spinner af-title="Laddar innehåll"></digi-icon-spinner>
|
||||
</ng-template>
|
||||
|
||||
|
||||
<hr>
|
||||
Reference in New Issue
Block a user