fix(gemensam-planering): Now only possible to send Gemensam planering when startdate > today. (TV-747)
This commit is contained in:
@@ -6,6 +6,14 @@
|
|||||||
[isPeriodDate]="true"
|
[isPeriodDate]="true"
|
||||||
>
|
>
|
||||||
<div class="gemensam-planering" *ngIf="currentGenomforandeReferens$ | async as genomforandeReferens">
|
<div class="gemensam-planering" *ngIf="currentGenomforandeReferens$ | async as genomforandeReferens">
|
||||||
|
<div class="gemensam-planering__warning" *ngIf="today < avrop.startDate; else reportRef">
|
||||||
|
<digi-notification-alert af-variation="warning" af-heading="Kan inte skapa Gemensam planering">
|
||||||
|
<p>Det går inte att skicka Gemensam planering eftersom tjänsten inte har startat ännu.</p>
|
||||||
|
</digi-notification-alert>
|
||||||
|
|
||||||
|
<msfa-back-link [route]="['../']">Tillbaka till deltagaren</msfa-back-link>
|
||||||
|
</div>
|
||||||
|
<ng-template #reportRef>
|
||||||
<div class="gemensam-planering__confirmation" *ngIf="lastSubmittedGP$ | async as lastSubmittedGP; else formRef">
|
<div class="gemensam-planering__confirmation" *ngIf="lastSubmittedGP$ | async as lastSubmittedGP; else formRef">
|
||||||
<digi-notification-alert
|
<digi-notification-alert
|
||||||
class="gemensam-planering__alert"
|
class="gemensam-planering__alert"
|
||||||
@@ -101,7 +109,10 @@
|
|||||||
<dt>Aktiviteter</dt>
|
<dt>Aktiviteter</dt>
|
||||||
<dd>
|
<dd>
|
||||||
<ul class="gemensam-planering__activity-list" *ngFor="let activity of activities$ | async">
|
<ul class="gemensam-planering__activity-list" *ngFor="let activity of activities$ | async">
|
||||||
<li class="gemensam-planering__activity-item" *ngIf="activityIdsFormArray.value.includes(activity.id)">
|
<li
|
||||||
|
class="gemensam-planering__activity-item"
|
||||||
|
*ngIf="activityIdsFormArray.value.includes(activity.id)"
|
||||||
|
>
|
||||||
<digi-icon-check-circle
|
<digi-icon-check-circle
|
||||||
class="msfa__digi-icon gemensam-planering__activity-check"
|
class="msfa__digi-icon gemensam-planering__activity-check"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -113,6 +124,7 @@
|
|||||||
</dl>
|
</dl>
|
||||||
</msfa-confirm-dialog>
|
</msfa-confirm-dialog>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
</msfa-report-layout>
|
</msfa-report-layout>
|
||||||
</msfa-layout>
|
</msfa-layout>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
max-width: var(--digi--typography--text--max-width);
|
max-width: var(--digi--typography--text--max-width);
|
||||||
|
|
||||||
&__confirmation,
|
&__confirmation,
|
||||||
|
&__warning,
|
||||||
&__form {
|
&__form {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ export class DeltagareGemensamPlaneringComponent {
|
|||||||
shouldValidate = false;
|
shouldValidate = false;
|
||||||
RadiobuttonGroupDirection = RadiobuttonGroupDirection;
|
RadiobuttonGroupDirection = RadiobuttonGroupDirection;
|
||||||
confirmDialogOpen = false;
|
confirmDialogOpen = false;
|
||||||
|
today = new Date();
|
||||||
private _error$ = new BehaviorSubject<CustomError>(null);
|
private _error$ = new BehaviorSubject<CustomError>(null);
|
||||||
error$: Observable<CustomError> = this._error$.asObservable();
|
error$: Observable<CustomError> = this._error$.asObservable();
|
||||||
private _lastSubmittedGP$ = new BehaviorSubject<Date>(null);
|
private _lastSubmittedGP$ = new BehaviorSubject<Date>(null);
|
||||||
|
|||||||
@@ -6,26 +6,20 @@
|
|||||||
reportTitle="Avvikelserapport (frånvaro)"
|
reportTitle="Avvikelserapport (frånvaro)"
|
||||||
>
|
>
|
||||||
<div class="franvaro-report" *ngIf="currentGenomforandeReferens$ | async as genomforandeReferens">
|
<div class="franvaro-report" *ngIf="currentGenomforandeReferens$ | async as genomforandeReferens">
|
||||||
<ng-container *ngIf="maxDate < avrop.startDate; else reportRef">
|
<div class="franvaro-report__warning" *ngIf="maxDate < avrop.startDate; else reportRef">
|
||||||
<digi-notification-alert af-variation="warning" af-heading="Kan inte skapa Avvikelserapport (frånvaro)">
|
<digi-notification-alert af-variation="warning" af-heading="Kan inte skapa Avvikelserapport (frånvaro)">
|
||||||
<p>Det går inte att rapportera frånvaro eftersom tjänsten inte har startat ännu.</p>
|
<p>Det går inte att rapportera frånvaro eftersom tjänsten inte har startat ännu.</p>
|
||||||
</digi-notification-alert>
|
</digi-notification-alert>
|
||||||
|
|
||||||
<!-- TODO: add spacing-->
|
|
||||||
<msfa-back-link [route]="['../']">Tillbaka till deltagaren</msfa-back-link>
|
<msfa-back-link [route]="['../']">Tillbaka till deltagaren</msfa-back-link>
|
||||||
</ng-container>
|
</div>
|
||||||
|
|
||||||
<ng-template #reportRef>
|
<ng-template #reportRef>
|
||||||
<div
|
<div
|
||||||
class="franvaro-report__confirmation"
|
class="franvaro-report__confirmation"
|
||||||
*ngIf="lastSubmittedFranvaroReport$ | async as lastSubmittedFranvaroReport; else formRef"
|
*ngIf="lastSubmittedFranvaroReport$ | async as lastSubmittedFranvaroReport; else formRef"
|
||||||
>
|
>
|
||||||
<digi-notification-alert
|
<digi-notification-alert af-variation="success" af-heading="Allt gick bra" af-heading-level="h3">
|
||||||
class="franvaro-report__alert"
|
|
||||||
af-variation="success"
|
|
||||||
af-heading="Allt gick bra"
|
|
||||||
af-heading-level="h3"
|
|
||||||
>
|
|
||||||
<p>Avvikelserapport (frånvaro) för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen.</p>
|
<p>Avvikelserapport (frånvaro) för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen.</p>
|
||||||
<dl>
|
<dl>
|
||||||
<dt>Datum</dt>
|
<dt>Datum</dt>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
max-width: var(--digi--typography--text--max-width);
|
max-width: var(--digi--typography--text--max-width);
|
||||||
|
|
||||||
&__confirmation,
|
&__confirmation,
|
||||||
|
&__warning,
|
||||||
&__form {
|
&__form {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
Reference in New Issue
Block a user