diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.html index 6ef8004..096c473 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.html @@ -11,7 +11,7 @@
{{omfattningToText(signal.omfattning)}}
Antal procent vid deltid
-
{{signal.percent}}%
+
{{signal.omfattningPercent}}%
Startdatum
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.ts index ccbc775..16e3e61 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/signal-view/signal-view.component.ts @@ -6,6 +6,7 @@ import { Signal } from '@msfa-models/signal.model'; import { Observable } from 'rxjs'; import { map, shareReplay, switchMap } from 'rxjs/operators'; import { SignalViewService } from './signal-view.service'; +import { SignalResponseOmfattning, SignalResponseType } from '@msfa-models/api/signal.response.model'; @Component({ selector: 'msfa-signal-view', @@ -28,21 +29,21 @@ export class SignalViewComponent { switchMap(({ handlingId }) => this.signalViewService.fetchSignal$(handlingId as string)), shareReplay(1) ); - typeToText(type: string): string { + typeToText(type: SignalResponseType): string { switch (type) { - case 'arbete': + case SignalResponseType.Work: return 'Arbete'; - case 'utbildning': + case SignalResponseType.Education: return 'Utbildning'; default: return 'Okänd'; } } - omfattningToText(omfattning: string): string { + omfattningToText(omfattning: SignalResponseOmfattning): string { switch (omfattning) { - case 'heltid': + case SignalResponseOmfattning.Heltid: return 'Heltid'; - case 'deltid': + case SignalResponseOmfattning.Deltid: return 'Deltid'; default: return 'Okänd';