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

Some minor bugfixes

Browse Source
This commit is contained in:
Erik Tiekstra
2021-10-11 12:22:08 +02:00
parent 771e73b086
commit 99c0ac3ae3
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html
View File

@@ -13,10 +13,7 @@
af-variation="success" af-variation="success"
class="deltagare-avvikelse__alert" class="deltagare-avvikelse__alert"
> >
<p> <p>Avvikelserapport (avvikelse) för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen.</p>
Avvikelserapport för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen och inväntar
godkännande.
</p>
<dl> <dl>
<dt>Datum</dt> <dt>Datum</dt>
<dd>{{submittedDate | date:'longDate'}} kl {{submittedDate | date:'shortTime'}}</dd> <dd>{{submittedDate | date:'longDate'}} kl {{submittedDate | date:'shortTime'}}</dd>

4
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html
View File

@@ -313,9 +313,9 @@
<dd>{{knownReasonCommentFormControl.value}}</dd> <dd>{{knownReasonCommentFormControl.value}}</dd>
</ng-container> </ng-container>
</ng-container> </ng-container>
<dt>Datum</dt> <dt>Dag för frånvaro</dt>
<dd> <dd>
<digi-typography-time [afDateTime]="dateFormControl.value"></digi-typography-time> <digi-typography-time [afDateTime]="dateFormValueAsDate"></digi-typography-time>
</dd> </dd>
<dt>Heldag eller del av dag</dt> <dt>Heldag eller del av dag</dt>
<dd>{{dayOrPartOfDayFromValue}}</dd> <dd>{{dayOrPartOfDayFromValue}}</dd>

8
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.ts
View File

@@ -58,7 +58,9 @@ export class FranvaroReportComponent {
{ label: 'Del av dag', value: false }, { label: 'Del av dag', value: false },
]; ];
constructor(private franvaroReportService: FranvaroReportService, private activatedRoute: ActivatedRoute) {} constructor(private franvaroReportService: FranvaroReportService, private activatedRoute: ActivatedRoute) {
this.dateFormControl.valueChanges.subscribe(value => console.log(value));
}
get showOtherKnownReasonsSelect(): boolean { get showOtherKnownReasonsSelect(): boolean {
return this.reasonFormControl.value === ANNAN_KAND_ORSAK_ID; return this.reasonFormControl.value === ANNAN_KAND_ORSAK_ID;
@@ -112,6 +114,10 @@ export class FranvaroReportComponent {
return this.franvaroFormGroup.get('knownReasonComment') as FormControl; return this.franvaroFormGroup.get('knownReasonComment') as FormControl;
} }
get dateFormValueAsDate(): Date {
return new Date(this.dateFormControl.value);
}
getReasonNameFromValue(reasons: OrsaksKoderFranvaro[], value: string): string { getReasonNameFromValue(reasons: OrsaksKoderFranvaro[], value: string): string {
return reasons.find(reason => reason.value.toString() === value)?.name; return reasons.find(reason => reason.value.toString() === value)?.name;
} }