diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.html
index ec229dd..effb6a3 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.html
@@ -20,6 +20,17 @@
{{ report.date | date:'shortTime' }}
{{ report.status }} |
+
+
+
+ Motivering till beslut
+
+ |
@@ -36,3 +47,17 @@
af-result-name="rapporter"
>
+
+
+ {{deltagareName}}
+ Genomförandereferens: {{activeReportMotivation.genomforandeReferens}}
+ {{activeReportMotivation.motivation}}
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.scss
index 6c8c245..8c1de57 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.scss
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.scss
@@ -1,6 +1,11 @@
@import 'variables/gutters';
.reports-list {
+ &__sub-heading {
+ margin-top: 0;
+ font-size: var(--digi--typography--font-size--h2--desktop) !important;
+ font-weight: var(--digi--typography--font-weight) !important;
+ }
&__pagination {
display: block;
margin-top: var(--digi--layout--gutter);
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.ts
index d74d5e3..275659e 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.ts
@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from
import { ReportType } from '@msfa-enums/report-type.enum';
import { PaginationMeta } from '@msfa-models/pagination-meta.model';
import { Report } from '@msfa-models/report.model';
+import { BehaviorSubject } from 'rxjs';
@Component({
selector: 'msfa-reports-list',
@@ -12,7 +13,9 @@ import { Report } from '@msfa-models/report.model';
export class ReportsListComponent {
@Input() reports: Report[];
@Input() paginationMeta: PaginationMeta;
+ @Input() deltagareName?: string;
@Output() paginated = new EventEmitter();
+ private _activeReportMotivation$ = new BehaviorSubject(null);
columnHeaders: { label: string; key: keyof Report }[] = [
{
@@ -27,8 +30,16 @@ export class ReportsListComponent {
label: 'Status',
key: 'status',
},
+ {
+ label: 'Motivering',
+ key: 'motivation',
+ },
];
+ get activeReportMotivation(): Report {
+ return this._activeReportMotivation$.getValue();
+ }
+
get currentPage(): number {
return this.paginationMeta?.page;
}
@@ -75,4 +86,12 @@ export class ReportsListComponent {
emitNewPage(page: number): void {
this.paginated.emit(page);
}
+
+ openMotivationDialog(report: Report): void {
+ this._activeReportMotivation$.next(report);
+ }
+
+ closeMotivationDialog(): void {
+ this._activeReportMotivation$.next(null);
+ }
}
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.module.ts
index d788156..ec3686e 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.module.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.module.ts
@@ -1,13 +1,15 @@
+import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { LocalDatePipeModule } from '@msfa-shared/pipes/local-date/local-date.module';
+import { UiIconModule } from '@ui/icon/icon.module';
import { ReportsListComponent } from './reports-list.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [ReportsListComponent],
- imports: [CommonModule, RouterModule, LocalDatePipeModule],
+ imports: [CommonModule, RouterModule, LocalDatePipeModule, DigiNgDialogModule, UiIconModule],
exports: [ReportsListComponent],
})
export class ReportsListModule {}
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html
index 834b5c6..c16d653 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html
@@ -44,6 +44,7 @@
Inskickade rapporter
= this.activatedRoute.params.pipe(
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html
index c2f4f0a..c560886 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html
@@ -29,7 +29,10 @@
af-id="deltagare-card-reports"
*ngIf="reportingTabVisible"
>
-
+
(null);
submittedDate$ = new BehaviorSubject(null);
- slutredovisning$: Observable;
+ slutredovisning$: Observable;
goBack(): void {
this.backClick.emit();
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html
index 0a7b4ed..4ef5f93 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html
@@ -37,7 +37,7 @@
-
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.html
index 40ede1a..64de61c 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.html
@@ -1,13 +1,21 @@
-
+
+
+ {{slutredovisning.motivation}}
+
+
+
+
-
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.scss
index 95bf4e8..2aba4bb 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.scss
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/slutredovisning-view/slutredovisning-view.component.scss
@@ -1,28 +1,12 @@
@import 'mixins/list';
@import 'variables/gutters';
-.gemensam-planering-view {
+.slutredovisning-view {
max-width: var(--digi--typography--text--max-width);
display: flex;
flex-direction: column;
gap: $digi--layout--gutter--l;
- &__activity-list {
- @include msfa__reset-list;
- margin-bottom: var(--digi--layout--gutter--s);
- }
-
- &__activity-item {
- display: flex;
- align-items: center;
- gap: var(--digi--layout--gutter--s);
- margin-top: var(--digi--layout--gutter--s);
- }
-
- &__activity-check {
- color: var(--digi--ui--color--border--success);
- }
-
&__footer {
display: flex;
flex-direction: column;
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 be1f3d4..9a902eb 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
@@ -1,61 +1,89 @@
-
-
Genomförandereferens: {{deltagare?.genomforandeReferens}}
+
+
+
{{deltagare.fullName}}
+
Genomförandereferens: {{deltagare.genomforandeReferens}}
+
+
+ {{activeHandelseMotivation.motivation}}
+
-
- 0; else noEvents">
-
-
- Lista med alla händelser för {{deltagare?.fullName}}
-
-
-
- | Inkom |
- Händelse |
- Effekt |
-
-
-
-
- |
-
- |
-
- {{handelse.description}}
- |
-
-
- {{handelse.effectDescription}}:
-
-
- |
-
-
-
- {{handelse.description}}
- |
-
-
-
-
+
+ 0; else noEventsRef">
+
+
+ Lista med alla händelser för {{deltagare.fullName}}
+
+
+
+ | Inkom |
+ Händelse |
+ Effekt |
+ Motivering |
+
+
+
+
+ |
+
+ |
+
+
+ {{handelse.description}}
+ |
+
+
+ {{handelse.effectDescription}}:
+
+
+ |
+
+
+
+ Motivering till beslut
+
+ |
+
+
+
+
+
+ 1"
+ class="deltagare-list-handelser__pagination"
+ [afTotalPages]="paginationMeta?.totalPage"
+ [afInitActivePage]="paginationMeta?.page"
+ [afCurrentResultStart]="currentResultStart(paginationMeta)"
+ [afCurrentResultEnd]="currentResultEnd(paginationMeta)"
+ [afTotalResults]="paginationMeta?.count"
+ (afOnPageChange)="setNewPage($event.detail)"
+ af-result-name="händelser"
+ >
+
+
+
-
- 1"
- class="deltagare-list-handelser__pagination"
- [afTotalPages]="paginationMeta?.totalPage"
- [afInitActivePage]="paginationMeta?.page"
- [afCurrentResultStart]="currentResultStart(paginationMeta)"
- [afCurrentResultEnd]="currentResultEnd(paginationMeta)"
- [afTotalResults]="paginationMeta?.count"
- (afOnPageChange)="setNewPage($event.detail)"
- af-result-name="händelser"
- >
-
-
-
-
+
+
-
+
Inga händelser har inkommit.
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.scss
index e023f57..eb31922 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.scss
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/components/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.scss
@@ -1,15 +1,21 @@
@import 'variables/gutters';
.deltagare-list-handelser {
+ &__sub-heading {
+ margin-top: 0;
+ font-size: var(--digi--typography--font-size--h2--desktop) !important;
+ font-weight: var(--digi--typography--font-weight) !important;
+ }
+
&__heading-row {
white-space: nowrap;
}
&__table-cell {
white-space: nowrap;
- }
- &__avbrott-cell {
- color: var(--digi--ui--color--danger);
+ &--avbrott {
+ color: var(--digi--ui--color--danger);
+ }
}
&__pagination {
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 2298f7e..b7d88bf 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
@@ -1,11 +1,24 @@
-import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { UiIconType } from '@ui/icon/icon-type.enum';
-import { DeltagareHandelse, DeltagareHandelseData } from '@msfa-models/deltagare-handelse.model';
+import {
+ ChangeDetectionStrategy,
+ Component,
+ EventEmitter,
+ Input,
+ OnChanges,
+ OnDestroy,
+ Output,
+ SimpleChanges,
+} from '@angular/core';
+import {
+ DeltagareHandelse,
+ DeltagareHandelseData,
+ DeltagareHandelseMotivation,
+} from '@msfa-models/deltagare-handelse.model';
import { DeltagareCompact } from '@msfa-models/deltagare.model';
import { PaginationMeta } from '@msfa-models/pagination-meta.model';
import { DeltagareHandelserService } from '@msfa-services/deltagare-handelser.service';
-import { Observable } from 'rxjs';
import { UiIconSize } from '@ui/icon/icon-size.enum';
+import { UiIconType } from '@ui/icon/icon-type.enum';
+import { BehaviorSubject, Observable } from 'rxjs';
@Component({
selector: 'msfa-deltagare-list-handelser-dialog',
@@ -13,11 +26,13 @@ import { UiIconSize } from '@ui/icon/icon-size.enum';
styleUrls: ['./deltagare-list-handelser-dialog.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class DeltagareListHandelserDialogComponent implements OnInit, OnDestroy {
+export class DeltagareListHandelserDialogComponent implements OnChanges, OnDestroy {
@Input() deltagare: DeltagareCompact;
+ @Output() closeDialog = new EventEmitter();
IconType = UiIconType;
IconSize = UiIconSize;
deltagareHandelserData$: Observable;
+ private _activeHandelseMotivation$ = new BehaviorSubject(null);
constructor(private deltagareHandelserService: DeltagareHandelserService) {}
@@ -25,13 +40,23 @@ export class DeltagareListHandelserDialogComponent implements OnInit, OnDestroy
this.deltagareHandelserService.resetParams();
}
- ngOnInit(): void {
- if (this.deltagare) {
+ ngOnChanges(changes: SimpleChanges): void {
+ if (changes.deltagare && changes.deltagare.currentValue) {
this.deltagareHandelserService.setGenomforandeReferens$(this.deltagare.genomforandeReferens);
this.deltagareHandelserData$ = this.deltagareHandelserService.deltagareHandelserData$;
}
}
+ get activeHandelseMotivation(): DeltagareHandelseMotivation {
+ return this._activeHandelseMotivation$.getValue();
+ }
+
+ get heading(): string {
+ return this.activeHandelseMotivation
+ ? `Motivering till beslut: ${this.activeHandelseMotivation.title}`
+ : `Händelser för ${this.deltagare.fullName}`;
+ }
+
getHandelseDate(handelse: DeltagareHandelse, handelseDate?: string): Date {
return handelseDate === 'receivedDate' ? new Date(handelse.receivedDate) : new Date(handelse.effectDate);
}
@@ -48,4 +73,22 @@ export class DeltagareListHandelserDialogComponent implements OnInit, OnDestroy
setNewPage(page: number): void {
this.deltagareHandelserService.setPage(page);
}
+
+ openMotivation(handelse: DeltagareHandelse): void {
+ this._activeHandelseMotivation$.next({
+ title: handelse.description,
+ motivation:
+ handelse.motivation ||
+ 'Lorem ipsum dolor sit amet consectetur, adipisicing elit. Sed nemo magni in nihil dolores eum harum obcaecati, nam enim illo iusto aut expedita, animi, itaque voluptatibus. Nisi reprehenderit animi facilis!',
+ });
+ }
+
+ closeMotivation(): void {
+ this._activeHandelseMotivation$.next(null);
+ }
+
+ emitCloseDialog(): void {
+ this._activeHandelseMotivation$.next(null);
+ this.closeDialog.emit();
+ }
}
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 5cd580b..bc5cd2c 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
@@ -60,7 +60,7 @@
af-variation="tertiary"
af-size="s"
(click)="openHandelser(singleDeltagare)"
- aria-controls="deltagareHandelser"
+ aria-controls="deltagare-handelser"
>
Visa händelser
@@ -85,7 +85,12 @@
-
+
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 7fee26d..b442333 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
@@ -1,13 +1,13 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import { ErrorSeverity } from '@msfa-enums/error-severity.enum';
-import { UiIconType } from '@ui/icon/icon-type.enum';
import { SortOrder } from '@msfa-enums/sort-order.enum';
import { DeltagareCompact } from '@msfa-models/deltagare.model';
import { PaginationMeta } from '@msfa-models/pagination-meta.model';
import { Sort } from '@msfa-models/sort.model';
+import { UiIconSize } from '@ui/icon/icon-size.enum';
+import { UiIconType } from '@ui/icon/icon-type.enum';
import { BehaviorSubject } from 'rxjs';
import { map } from 'rxjs/operators';
-import { UiIconSize } from '@ui/icon/icon-size.enum';
@Component({
selector: 'msfa-deltagare-list-table',
@@ -24,7 +24,7 @@ export class DeltagareListTableComponent {
@Output() paginated = new EventEmitter();
handelserDialogDeltagare$ = new BehaviorSubject(null);
- handelserDialogIsOpen$ = this.handelserDialogDeltagare$.pipe(map(genomforandereferens => !!genomforandereferens));
+ handelserDialogIsOpen$ = this.handelserDialogDeltagare$.pipe(map(deltagare => !!deltagare));
IconType = UiIconType;
IconSize = UiIconSize;
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.module.ts
index 5d75caa..2cc43f0 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.module.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.module.ts
@@ -3,6 +3,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { UnauthorizedAlertModule } from '@msfa-shared/components/unauthorized-alert/unauthorized-alert.module';
+import { UiIconModule } from '@ui/icon/icon.module';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
import { DeltagareListTableModule } from './components/deltagare-list-table/deltagare-list-table.module';
@@ -24,6 +25,7 @@ import { DeltagareListComponent } from './deltagare-list.component';
UiSkeletonModule,
UnauthorizedAlertModule,
UiLoaderModule,
+ UiIconModule,
],
})
export class DeltagareListModule {}
diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/report.response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/report.response.model.ts
index 54969a2..51ba640 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/report.response.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/report.response.model.ts
@@ -8,6 +8,7 @@ export interface ReportResponse {
inskickadDatum: string;
statusRapport: string;
ciamUserId: string;
+ motivation: string;
}
export interface ReportsDataResponse {
data: ReportResponse[];
diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts
index 85d9b98..22854c8 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts
@@ -71,4 +71,6 @@ export interface SlutredovisningResponse {
progressDescription: string;
nextStepDescription: string;
otherInformation: string;
+ status?: string;
+ motivation?: string;
}
diff --git a/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts b/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts
index b7da7d7..0b0408f 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts
@@ -21,6 +21,7 @@ export interface DeltagareHandelse {
isAvbrott: boolean;
effectDate: Date;
effectDescription: string;
+ motivation: string;
}
export interface DeltagareHandelseData {
@@ -28,12 +29,18 @@ export interface DeltagareHandelseData {
meta: PaginationMeta;
}
+export interface DeltagareHandelseMotivation {
+ title: string;
+ motivation: string;
+}
+
interface DeltagareHandelseApiResponse {
description: string;
receivedDate: Date;
isAvbrott: boolean;
tidpunkt: Date;
tidpunktDescription: string;
+ motivation: string;
}
export interface DeltagareHandelserApiResponse {
@@ -44,11 +51,11 @@ export interface DeltagareHandelserApiResponse {
export function mapDeltagareHandelseApiResponse(
deltagareHandelseApiResponse: DeltagareHandelseApiResponse
): DeltagareHandelse {
- const { description, receivedDate, isAvbrott } = deltagareHandelseApiResponse;
+ const { description, receivedDate, isAvbrott, motivation } = deltagareHandelseApiResponse;
const effectDate = deltagareHandelseApiResponse.tidpunkt;
const effectDescription =
(GENOMFORANDEHANDELSE_EFFECT_MAP[deltagareHandelseApiResponse.tidpunktDescription] as string) ??
deltagareHandelseApiResponse.tidpunktDescription ??
'';
- return { description, receivedDate, isAvbrott, effectDate, effectDescription };
+ return { description, receivedDate, isAvbrott, effectDate, effectDescription, motivation };
}
diff --git a/apps/mina-sidor-fa/src/app/shared/models/report.model.ts b/apps/mina-sidor-fa/src/app/shared/models/report.model.ts
index b15cffc..3428007 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/report.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/report.model.ts
@@ -1,6 +1,5 @@
import { ReportType } from '@msfa-enums/report-type.enum';
import { ReportResponse } from './api/report.response.model';
-import { Franvaro } from './franvaro.model';
import { PaginationMeta } from './pagination-meta.model';
export interface Report {
@@ -10,11 +9,7 @@ export interface Report {
date: Date;
status: string;
ciamUserId: string;
-}
-
-export interface ReportDetail {
- genomforandeReferens: string;
- franvaro?: Franvaro;
+ motivation: string;
}
export interface ReportsData {
@@ -23,7 +18,7 @@ export interface ReportsData {
}
export function mapResponseToReport(data: ReportResponse): Report {
- const { id, genomforandeReferens, typAvRapport, inskickadDatum, statusRapport, ciamUserId } = data;
+ const { id, genomforandeReferens, typAvRapport, inskickadDatum, statusRapport, ciamUserId, motivation } = data;
return {
id,
genomforandeReferens,
@@ -31,5 +26,6 @@ export function mapResponseToReport(data: ReportResponse): Report {
date: new Date(inskickadDatum),
status: statusRapport,
ciamUserId,
+ motivation,
};
}