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 @@
;
- 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);
}
|