diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html index 041117f..c127379 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html @@ -21,13 +21,21 @@
{{avrop.tjanst}}
Startdatum
-
{{avrop.startDate | date:'longDate'}}
+
+ +
Slutdatum
-
{{avrop.endDate | date:'longDate'}}
+
+ +
Avser period
-
{{avrop.startDate | date:'longDate'}} - {{avrop.endDate | date:'longDate'}}
+
+ + - + +
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html index b8e74ad..9263183 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html @@ -18,21 +18,26 @@ - - {{handelse.receivedDate | date}} - - {{handelse.description}} - - - {{handelse.effectDescription}}: {{handelse.effectDate | date }} - - - - - - {{handelse.description}} - - + + + + + + {{handelse.description}} + + + + {{handelse.effectDescription}}: + + + + + + + {{handelse.description}} + + + diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts index 005c648..f17a99e 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts @@ -16,7 +16,7 @@ export class DeltagareListHandelserDialogComponent implements OnInit { iconType = IconType; deltagareHandelser$: Observable; - constructor(private deltagareHandelserApiService: DeltagareHandelserApiService) {} + constructor(private deltagareHandelserApiService: DeltagareHandelserApiService) { } ngOnInit(): void { if (this.deltagare) { @@ -25,4 +25,8 @@ export class DeltagareListHandelserDialogComponent implements OnInit { ); } } + + getHandelseDate(handelse: DeltagareHandelse, handelseDate?: string): Date { + return handelseDate === 'receivedDate' ? new Date(handelse.receivedDate) : new Date(handelse.effectDate); + } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.html index 7eaac65..8dd8d9c 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.html @@ -40,9 +40,14 @@ {{ singleDeltagare.tjanst }} {{ singleDeltagare.utforandeVerksamhet }} - {{ singleDeltagare.startdatumAvrop | date }} - {{ singleDeltagare.slutdatumAvrop | date }} + + + + +
Avbrott diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.ts index f9cbfaa..042dfab 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-table/deltagare-list-table.component.ts @@ -75,6 +75,10 @@ export class DeltagareListTableComponent { return end < this.count ? end : this.count; } + getAvropDate(deltagare: DeltagareCompact, avropDate?: string): Date { + return avropDate === 'startdatumAvrop' ? new Date(deltagare.startdatumAvrop) : new Date(deltagare.slutdatumAvrop) + } + handleSort(key: keyof DeltagareCompact): void { this.sorted.emit(key); }