From 0045cafd77dbe720723870ac88d795e4d28b0fbc Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Tue, 12 Oct 2021 14:23:27 +0200 Subject: [PATCH] feat(reports): Added report views to view single reports. (TV-205) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squashed commit of the following: commit bb28714969a6ac2d2b57134179344169edc1dc1d Author: Erik Tiekstra Date: Tue Oct 12 14:15:45 2021 +0200 Updated routing for signal commit deb5082659065089c7014c7114538851e13fd6e4 Author: Erik Tiekstra Date: Tue Oct 12 14:07:33 2021 +0200 Moved around files commit 2637261f21968e63fcab4b13cccd8d68ab2ac6fe Author: Erik Tiekstra Date: Tue Oct 12 11:22:11 2021 +0200 Added avvikelse to single report page... also started with refactoring models a bit commit 53c6a59551bfa0887b22d03419b3434a8c213b50 Author: Erik Tiekstra Date: Tue Oct 12 09:56:22 2021 +0200 Implemented frånvaro report commit e8ccbf15885f0bfa6eb86a9681464a2e04457f99 Author: Erik Tiekstra Date: Mon Oct 11 16:42:16 2021 +0200 Added gemensam planering page commit ebbf6f43cab750816c72fe929a5f59756d5fecf4 Merge: 45aec375 eac45ebd Author: Erik Tiekstra Date: Mon Oct 11 15:14:02 2021 +0200 Merge branch 'next' into develop commit 45aec3755feea123848c7adfce697422bbade4cd Merge: e4cff086 99c0ac3a Author: Erik Tiekstra Date: Mon Oct 11 13:24:11 2021 +0200 Merge branch 'next' into develop commit e4cff086c43416ee641302bdab849890a06c4bd5 Merge: ef10270f 631418bc Author: Erik Tiekstra Date: Mon Oct 11 09:47:05 2021 +0200 Merge branch 'next' into develop commit ef10270fa941a697bb8f494c6df46dea9c23e05f Author: Erik Tiekstra Date: Mon Oct 11 09:23:59 2021 +0200 Removed test build from develop --- .../deltagare/deltagare-routing.module.ts | 10 +- .../report-layout.component.html | 0 .../report-layout.component.scss | 0 .../report-layout.component.spec.ts | 0 .../report-layout/report-layout.component.ts | 0 .../report-layout/report-layout.module.ts | 0 .../deltagare-details.module.ts | 50 ++++++-- .../reports-list/reports-list.component.html | 7 +- .../reports-list/reports-list.component.ts | 14 +++ .../report-alternatives.ts | 13 --- .../avvikelse-report-form.component.html} | 23 ++-- .../avvikelse-report-form.component.scss} | 2 +- .../avvikelse-report-form.component.spec.ts} | 16 +-- .../avvikelse-report-form.component.ts} | 35 +++--- .../avvikelse-report-form.module.ts} | 16 +-- .../avvikelse-report-form.service.ts} | 8 +- .../periodisk-redovisning-form.component.html | 0 .../periodisk-redovisning-form.component.scss | 0 ...riodisk-redovisning-form.component.spec.ts | 0 .../periodisk-redovisning-form.component.ts | 0 .../periodisk-redovisning-form.module.ts | 0 ...agare-periodisk-redovisning.component.html | 0 ...agare-periodisk-redovisning.component.scss | 0 ...re-periodisk-redovisning.component.spec.ts | 0 ...ltagare-periodisk-redovisning.component.ts | 0 .../deltagare-periodisk-redovisning.module.ts | 2 +- ...ltagare-confirm-signal-form.component.html | 0 ...ltagare-confirm-signal-form.component.scss | 0 ...gare-confirm-signal-form.component.spec.ts | 0 ...deltagare-confirm-signal-form.component.ts | 0 .../deltagare-confirm-signal-form.module.ts | 0 ...agare-signal-arbete-studier.component.html | 0 ...agare-signal-arbete-studier.component.scss | 0 ...re-signal-arbete-studier.component.spec.ts | 0 ...ltagare-signal-arbete-studier.component.ts | 0 .../deltagare-signal-arbete-studier.module.ts | 6 +- .../franvaro-report-form.component.html} | 61 +++++----- .../franvaro-report-form.component.scss} | 2 +- .../franvaro-report-form.component.spec.ts} | 16 +-- .../franvaro-report-form.component.ts} | 28 ++--- .../franvaro-report-form.module.ts} | 16 +-- .../franvaro-report-form.service.ts} | 6 +- .../franvaro-report-form.validator.ts} | 2 +- .../gemensam-planering-form.component.html} | 44 +++---- .../gemensam-planering-form.component.scss} | 2 +- ...gemensam-planering-form.component.spec.ts} | 18 +-- .../gemensam-planering-form.component.ts} | 31 +++-- .../gemensam-planering-form.module.ts} | 14 ++- .../gemensam-planering-form.service.ts} | 6 +- .../gemensam-planering.validator.ts | 0 .../avvikelse-report-view.component.html | 31 +++++ .../avvikelse-report-view.component.scss | 31 +++++ .../avvikelse-report-view.component.spec.ts | 31 +++++ .../avvikelse-report-view.component.ts | 37 ++++++ .../avvikelse-report-view.module.ts | 29 +++++ .../avvikelse-report-view.service.ts | 18 +++ .../franvaro-report-view.component.html | 47 ++++++++ .../franvaro-report-view.component.scss | 31 +++++ .../franvaro-report-view.component.spec.ts | 31 +++++ .../franvaro-report-view.component.ts | 37 ++++++ .../franvaro-report-view.module.ts | 29 +++++ .../franvaro-report-view.service.ts | 18 +++ .../gemensam-planering-view.component.html | 37 ++++++ .../gemensam-planering-view.component.scss | 31 +++++ .../gemensam-planering-view.component.spec.ts | 31 +++++ .../gemensam-planering-view.component.ts | 40 +++++++ .../gemensam-planering-view.module.ts | 29 +++++ .../gemensam-planering-view.service.ts | 21 ++++ .../models/api/avvikelse-response.model.ts | 15 +++ .../models/api/franvaro-response.model.ts | 20 ++++ .../api/gemensam-planering.response.model.ts | 5 + .../src/app/shared/models/avvikelse.model.ts | 53 +++++++-- .../src/app/shared/models/franvaro.model.ts | 30 +++++ .../shared/models/gemensam-planering.model.ts | 21 ++++ .../src/app/shared/models/report.model.ts | 6 + .../services/api/avvikelse-api.service.ts | 10 +- .../api/franvaro-report.api.service.ts | 4 +- .../api/gemensam-planering-api.service.ts | 22 +++- .../shared/services/api/report.api.service.ts | 107 ++++++++++++++++++ .../utils/map-paths-to-breadcrumbs.util.ts | 12 +- openshift/dev/Jenkinsfile | 30 ++--- 81 files changed, 1104 insertions(+), 238 deletions(-) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/{pages/deltagare-reports => }/components/report-layout/report-layout.component.html (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/{pages/deltagare-reports => }/components/report-layout/report-layout.component.scss (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/{pages/deltagare-reports => }/components/report-layout/report-layout.component.spec.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/{pages/deltagare-reports => }/components/report-layout/report-layout.component.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/{pages/deltagare-reports => }/components/report-layout/report-layout.module.ts (100%) delete mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/report-alternatives.ts rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html => report-forms/avvikelse-report-form/avvikelse-report-form.component.html} (88%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.scss => report-forms/avvikelse-report-form/avvikelse-report-form.component.scss} (92%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.spec.ts => report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts} (66%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.ts => report-forms/avvikelse-report-form/avvikelse-report-form.component.ts} (84%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts => report-forms/avvikelse-report-form/avvikelse-report-form.module.ts} (75%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.service.ts => report-forms/avvikelse-report-form/avvikelse-report-form.service.ts} (85%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.html (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.scss (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.module.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.html (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.scss (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.spec.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module.ts (92%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.html (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.scss (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.spec.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.module.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.html (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.scss (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.spec.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts (100%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports => report-forms}/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module.ts (91%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/franvaro-report/franvaro-report.component.html => report-forms/franvaro-report-form/franvaro-report-form.component.html} (87%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/franvaro-report/franvaro-report.component.scss => report-forms/franvaro-report-form/franvaro-report-form.component.scss} (96%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/franvaro-report/franvaro-report.component.spec.ts => report-forms/franvaro-report-form/franvaro-report-form.component.spec.ts} (59%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/franvaro-report/franvaro-report.component.ts => report-forms/franvaro-report-form/franvaro-report-form.component.ts} (87%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/franvaro-report/franvaro-report.module.ts => report-forms/franvaro-report-form/franvaro-report-form.module.ts} (79%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/franvaro-report/franvaro-report.service.ts => report-forms/franvaro-report-form/franvaro-report-form.service.ts} (87%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/franvaro-report/franvaro-report.validator.ts => report-forms/franvaro-report-form/franvaro-report-form.validator.ts} (98%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.html => report-forms/gemensam-planering-form/gemensam-planering-form.component.html} (80%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.scss => report-forms/gemensam-planering-form/gemensam-planering-form.component.scss} (96%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.spec.ts => report-forms/gemensam-planering-form/gemensam-planering-form.component.spec.ts} (65%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.ts => report-forms/gemensam-planering-form/gemensam-planering-form.component.ts} (79%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.module.ts => report-forms/gemensam-planering-form/gemensam-planering-form.module.ts} (71%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-gemensam-planering/gemensam-planering.service.ts => report-forms/gemensam-planering-form/gemensam-planering-form.service.ts} (92%) rename apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/{deltagare-reports/deltagare-gemensam-planering => report-forms/gemensam-planering-form}/gemensam-planering.validator.ts (100%) create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.html create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.scss create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.spec.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.component.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.module.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/avvikelse-report-view/avvikelse-report-view.service.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.html create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.scss create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.spec.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.component.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.module.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/franvaro-report-view/franvaro-report-view.service.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.html create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.scss create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.spec.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.component.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.module.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/gemensam-planering-view/gemensam-planering-view.service.ts create mode 100644 apps/mina-sidor-fa/src/app/shared/models/api/avvikelse-response.model.ts create mode 100644 apps/mina-sidor-fa/src/app/shared/models/api/franvaro-response.model.ts create mode 100644 apps/mina-sidor-fa/src/app/shared/models/api/gemensam-planering.response.model.ts create mode 100644 apps/mina-sidor-fa/src/app/shared/services/api/report.api.service.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare-routing.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare-routing.module.ts index 56d2fef..cd90c27 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare-routing.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare-routing.module.ts @@ -12,17 +12,9 @@ const routes: Routes = [ loadChildren: () => import('./pages/deltagare-details/deltagare-details.module').then(m => m.DeltagareDetailsModule), }, - { - path: ':genomforandeReferens/signal', - data: { title: 'Skapa signal om arbete eller studier' }, - loadChildren: () => - import( - './pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module' - ).then(m => m.DeltagareSignalArbeteStudierModule), - }, ]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class DeltagareRoutingModule { } +export class DeltagareRoutingModule {} 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/components/report-layout/report-layout.component.html similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.component.html diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.component.scss similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.scss rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.component.scss diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.component.spec.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.spec.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.component.spec.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.component.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.component.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.module.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.module.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/components/report-layout/report-layout.module.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts index f9de288..ed4a921 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/deltagare-details.module.ts @@ -9,34 +9,68 @@ const routes: Routes = [ }, { path: 'avvikelserapport', - data: { title: 'Skapa avvikelserapport' }, + data: { title: 'Skapa Avvikelserapport (Avvikelse)' }, loadChildren: () => - import('./pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module').then( - m => m.DeltagareAvvikelserapportModule + import('./pages/report-forms/avvikelse-report-form/avvikelse-report-form.module').then( + m => m.AvvikelseReportFormModule + ), + }, + { + path: 'avvikelserapport/:reportId', + data: { title: 'Avvikelserapport (avvikelse)' }, + loadChildren: () => + import('./pages/report-views/avvikelse-report-view/avvikelse-report-view.module').then( + m => m.AvvikelseReportViewModule ), }, { path: 'franvarorapport', - data: { title: 'Skapa rapport' }, + data: { title: 'Skapa Avvikelserapport (frånvaro)' }, loadChildren: () => - import('./pages/deltagare-reports/franvaro-report/franvaro-report.module').then(m => m.FranvaroReportModule), + import('./pages/report-forms/franvaro-report-form/franvaro-report-form.module').then( + m => m.FranvaroReportFormModule + ), + }, + { + path: 'franvarorapport/:reportId', + data: { title: 'Avvikelserapport (frånvaro)' }, + loadChildren: () => + import('./pages/report-views/franvaro-report-view/franvaro-report-view.module').then( + m => m.FranvaroReportViewModule + ), }, { path: 'gemensam-planering', data: { title: 'Skapa Gemensam planering' }, loadChildren: () => - import('./pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.module').then( - m => m.DeltagareGemensamPlaneringModule + import('./pages/report-forms/gemensam-planering-form/gemensam-planering-form.module').then( + m => m.GemensamPlaneringFormModule + ), + }, + { + path: 'gemensam-planering/:reportId', + data: { title: 'Gemensam planering' }, + loadChildren: () => + import('./pages/report-views/gemensam-planering-view/gemensam-planering-view.module').then( + m => m.GemensamPlaneringViewModule ), }, { path: 'periodisk-redovisning', data: { title: 'Skapa periodisk redovisning' }, loadChildren: () => - import('./pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module').then( + import('./pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module').then( m => m.DeltagarePeriodiskRedovisningModule ), }, + { + path: 'signal', + data: { title: 'Skapa signal om arbete eller studier' }, + loadChildren: () => + import('./pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module').then( + m => m.DeltagareSignalArbeteStudierModule + ), + }, ]; @NgModule({ 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 0659ada..bdb6720 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 @@ -9,7 +9,12 @@ - {{ report.type }} + + {{ report.type }} + {{report.type}} + {{ report.date | date:'longDate' }} {{ report.date | date:'shortTime' }} {{ report.status }} 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 c98523a..581b32b 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 @@ -1,4 +1,5 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { ReportType } from '@msfa-enums/report-type.enum'; import { PaginationMeta } from '@msfa-models/pagination-meta.model'; import { Report } from '@msfa-models/report.model'; @@ -49,6 +50,19 @@ export class ReportsListComponent { return end < this.count ? end : this.count; } + getReportLink(report: Report): string { + switch (report.type) { + case ReportType.GemensamPlanering: + return `./gemensam-planering/${report.id}`; + case ReportType.Franvaro: + return `./franvarorapport/${report.id}`; + case ReportType.Avvikelse: + return `./avvikelserapport/${report.id}`; + default: + return null; + } + } + emitNewPage(page: number): void { this.paginated.emit(page); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/report-alternatives.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/report-alternatives.ts deleted file mode 100644 index 02fbcb5..0000000 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/report-alternatives.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { DayOrPartOfDay } from '@msfa-enums/day-or-part-of-day.enum'; -import { RadiobuttonModel } from '@af/digi-ng/_form/form-radiobutton-group'; - -export const dayOrPartOfDay: RadiobuttonModel[] = [ - { - label: 'Heldag', - value: DayOrPartOfDay.HELDAG, - }, - { - label: 'Del av dag', - value: DayOrPartOfDay.DEL_AV_DAG, - }, -]; diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html similarity index 88% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html index 444bfea..783dcf5 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html @@ -5,13 +5,13 @@ description="Här rapporterar du deltagarens avvikelser. Exempelvis kan du rapportera om tjänsten inte fungerar för deltagaren eller om deltagaren misskött sig under tjänsten." reportTitle="Avvikelserapport (avvikelse)" > -
-
+
+

Avvikelserapport (avvikelse) för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen.

@@ -23,8 +23,8 @@
-
-
+ +
-
+
-
+
Förhandsgranska Avbryt @@ -134,7 +134,10 @@ - + diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.scss similarity index 92% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.scss rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.scss index f94ae02..e48ed8e 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.scss @@ -1,6 +1,6 @@ @import 'variables/gutters'; -.deltagare-avvikelse { +.avvikelse-report-form { max-width: var(--digi--typography--text--max-width); &__confirmation, diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts similarity index 66% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.spec.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts index f21a3d6..b210cdc 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.spec.ts @@ -6,17 +6,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { LayoutComponent } from '@msfa-shared/components/layout/layout.component'; -import { DeltagareAvvikelserapportComponent } from './deltagare-avvikelserapport.component'; -import { DeltagareAvvikelserapportService } from './deltagare-avvikelserapport.service'; +import { AvvikelseReportFormComponent } from './avvikelse-report-form.component'; +import { AvvikelseReportFormService } from './avvikelse-report-form.service'; -describe('DeltagareAvvikelseComponent', () => { - let component: DeltagareAvvikelserapportComponent; - let fixture: ComponentFixture; +describe('AvvikelseReportFormComponent', () => { + let component: AvvikelseReportFormComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], - declarations: [DeltagareAvvikelserapportComponent, LayoutComponent], + declarations: [AvvikelseReportFormComponent, LayoutComponent], imports: [ RouterTestingModule, HttpClientTestingModule, @@ -24,12 +24,12 @@ describe('DeltagareAvvikelseComponent', () => { DigiNgFormRadiobuttonGroupModule, DigiNgFormDatepickerModule, ], - providers: [DeltagareAvvikelserapportService], + providers: [AvvikelseReportFormService], }).compileComponents(); }); beforeEach(() => { - fixture = TestBed.createComponent(DeltagareAvvikelserapportComponent); + fixture = TestBed.createComponent(AvvikelseReportFormComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts similarity index 84% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts index 3180f4e..2248354 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts @@ -3,17 +3,16 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/ import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { Avrop } from '@msfa-models/avrop.model'; -import { AvvikelseAlternativ, AvvikelseRequestData } from '@msfa-models/avvikelse.model'; +import { AvvikelseAlternativ_OLD, AvvikelseRequestData_OLD } from '@msfa-models/avvikelse.model'; import { CustomError } from '@msfa-models/error/custom-error'; import { FragorForAvvikelser } from '@msfa-models/fragor-for-avvikelser.model'; import { OrsaksKoderAvvikelse } from '@msfa-models/orsaks-koder-avvikelse.model'; -import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { markControlsAsDirty } from '@msfa-utils/mark-controls-as-dirty.util'; import { RegexValidator } from '@msfa-utils/validators/regex.validator'; import { RequiredValidator } from '@msfa-validators/required.validator'; import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; import { map, shareReplay, switchMap, take } from 'rxjs/operators'; -import { DeltagareAvvikelserapportService } from './deltagare-avvikelserapport.service'; +import { AvvikelseReportFormService } from './avvikelse-report-form.service'; interface Params { genomforandeReferens: string; @@ -28,12 +27,12 @@ interface AvvikelseFormData { type AvvikelseFormKeys = keyof AvvikelseFormData; @Component({ - selector: 'msfa-deltagare-avvikelse', - templateUrl: './deltagare-avvikelserapport.component.html', - styleUrls: ['./deltagare-avvikelserapport.component.scss'], + selector: 'msfa-avvikelse-report-form', + templateUrl: './avvikelse-report-form.component.html', + styleUrls: ['./avvikelse-report-form.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class DeltagareAvvikelserapportComponent implements OnInit, OnDestroy { +export class AvvikelseReportFormComponent implements OnInit, OnDestroy { shouldValidate$ = new BehaviorSubject(false); reasonFormName: AvvikelseFormKeys = 'reason'; @@ -46,20 +45,20 @@ export class DeltagareAvvikelserapportComponent implements OnInit, OnDestroy { map((params: Params) => +params.genomforandeReferens) ); avrop$: Observable = this.genomforandeReferens$.pipe( - switchMap(genomforandeReferens => this.deltagareAvvikelseService.fetchAvropInformation$(genomforandeReferens)), + switchMap(genomforandeReferens => this.avvikelseReportFormService.fetchAvropInformation$(genomforandeReferens)), shareReplay(1) ); - reasons$: Observable = this.deltagareAvvikelseService.getAvvikelseOrsaker$; + reasons$: Observable = this.avvikelseReportFormService.getAvvikelseOrsaker$; reasonsAsNgDigiFormSelectItems$: Observable = this.reasons$.pipe( map(reasons => reasons.map(reason => ({ name: reason.name, value: reason.id }))) ); - allAvvikelseQuestions$ = this.deltagareAvvikelseService.fragorForAvvikelser$; + allAvvikelseQuestions$ = this.avvikelseReportFormService.fragorForAvvikelser$; chosenReasonId$: Observable; chosenReason$: Observable; questionsForChosenReason$: Observable; - avvikelseSubmitData$: Observable; + avvikelseSubmitData$: Observable; confirmDialogIsOpen$ = new BehaviorSubject(false); submittedDate$ = new BehaviorSubject(null); private subscriptions: Subscription[] = []; @@ -73,11 +72,7 @@ export class DeltagareAvvikelserapportComponent implements OnInit, OnDestroy { .valueChanges as Observable; private currentQuestions: FragorForAvvikelser[]; - constructor( - private deltagareAvvikelseService: DeltagareAvvikelserapportService, - private deltagareApiService: DeltagareApiService, - private activatedRoute: ActivatedRoute - ) {} + constructor(private avvikelseReportFormService: AvvikelseReportFormService, private activatedRoute: ActivatedRoute) {} get reasonFormControl(): AbstractControl | undefined { return this.avvikelseFormGroup.get(this.reasonFormName); @@ -154,7 +149,7 @@ export class DeltagareAvvikelserapportComponent implements OnInit, OnDestroy { submitAndCloseConfirmDialog(): void { this.submitIsLoading$.next(true); this.avvikelseSubmitData$.pipe(take(1)).subscribe(avvikelseSubmitData => - this.deltagareAvvikelseService.createAvvikelse$(avvikelseSubmitData).subscribe({ + this.avvikelseReportFormService.createAvvikelse$(avvikelseSubmitData).subscribe({ next: () => { this.submitIsLoading$.next(false); this.submittedDate$.next(new Date()); @@ -180,15 +175,15 @@ export class DeltagareAvvikelserapportComponent implements OnInit, OnDestroy { genomforandeReferens: number, chosenReason: string, formData: AvvikelseFormData - ): AvvikelseRequestData { - const avvikelseAlternativ: AvvikelseAlternativ = { + ): AvvikelseRequestData_OLD { + const avvikelseAlternativ: AvvikelseAlternativ_OLD = { avvikelseorsakskod: chosenReason, frageformular: formData.questions.map((question, index) => ({ fraga: this.currentQuestions[index].id, svar: question, })), rapporteringsdatum: formData.reportingDate, - } as AvvikelseAlternativ; + } as AvvikelseAlternativ_OLD; return { genomforandeReferens, avvikelseAlternativ }; } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts similarity index 75% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts index 92a71ed..1658ba9 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.module.ts @@ -15,16 +15,16 @@ import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/conf import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { LoaderModule } from '@msfa-shared/components/loader/loader.module'; -import { ReportLayoutModule } from '../components/report-layout/report-layout.module'; -import { DeltagareAvvikelserapportComponent } from './deltagare-avvikelserapport.component'; -import { DeltagareAvvikelserapportService } from './deltagare-avvikelserapport.service'; +import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; +import { AvvikelseReportFormComponent } from './avvikelse-report-form.component'; +import { AvvikelseReportFormService } from './avvikelse-report-form.service'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], - declarations: [DeltagareAvvikelserapportComponent], + declarations: [AvvikelseReportFormComponent], imports: [ CommonModule, - RouterModule.forChild([{ path: '', component: DeltagareAvvikelserapportComponent }]), + RouterModule.forChild([{ path: '', component: AvvikelseReportFormComponent }]), LayoutModule, ReactiveFormsModule, DigiNgFormRadiobuttonGroupModule, @@ -41,7 +41,7 @@ import { DeltagareAvvikelserapportService } from './deltagare-avvikelserapport.s DigiNgFormInputModule, DigiNgDialogModule, ], - providers: [DeltagareAvvikelserapportService], - exports: [DeltagareAvvikelserapportComponent], + providers: [AvvikelseReportFormService], + exports: [AvvikelseReportFormComponent], }) -export class DeltagareAvvikelserapportModule {} +export class AvvikelseReportFormModule {} diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.service.ts similarity index 85% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.service.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.service.ts index 53e966f..2ca892f 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; -import { Avvikelse } from '@msfa-models/avvikelse.model'; +import { Avvikelse_OLD } from '@msfa-models/avvikelse.model'; import { FragorForAvvikelser } from '@msfa-models/fragor-for-avvikelser.model'; import { OrsaksKoderAvvikelse } from '@msfa-models/orsaks-koder-avvikelse.model'; import { AvvikelseApiService } from '@msfa-services/api/avvikelse-api.service'; +import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; import { Observable } from 'rxjs'; import { shareReplay } from 'rxjs/operators'; -import { DeltagareApiService } from '@msfa-services/api/deltagare.api.service'; @Injectable() -export class DeltagareAvvikelserapportService { +export class AvvikelseReportFormService { fragorForAvvikelser$: Observable = this.avvikelseApiService .getFragorForAvvikelser$() .pipe(shareReplay(1)); @@ -17,7 +17,7 @@ export class DeltagareAvvikelserapportService { constructor(private avvikelseApiService: AvvikelseApiService, private deltagareApiService: DeltagareApiService) {} - createAvvikelse$(avvikelse: Avvikelse): Observable { + createAvvikelse$(avvikelse: Avvikelse_OLD): Observable { return this.avvikelseApiService.createAvvikelse$(avvikelse); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.html similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.html rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.html diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.scss similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.scss rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.scss diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.spec.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.module.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.module.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.module.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.html similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.html rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.html diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.scss similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.scss rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.scss diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.spec.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.spec.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.spec.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.component.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module.ts similarity index 92% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module.ts index b132812..5525896 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-periodisk-redovisning/deltagare-periodisk-redovisning.module.ts @@ -4,7 +4,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; -import { ReportLayoutModule } from '../components/report-layout/report-layout.module'; +import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { PeriodiskRedovisningFormModule } from './components/periodisk-redovisning-form/periodisk-redovisning-form.module'; import { DeltagarePeriodiskRedovisningComponent } from './deltagare-periodisk-redovisning.component'; diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.html similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.html rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.html diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.scss similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.scss rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.scss diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.spec.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.spec.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.spec.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.component.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.module.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.module.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.module.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.html similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.html rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.html diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.scss similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.scss rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.scss diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.spec.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.spec.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.spec.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts similarity index 100% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module.ts similarity index 91% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module.ts rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module.ts index c971b2e..d4f3e1d 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.module.ts @@ -10,7 +10,7 @@ import { RouterModule } from '@angular/router'; import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module'; import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module'; import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; -import { ReportLayoutModule } from '../components/report-layout/report-layout.module'; +import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module'; import { DeltagareConfirmSignalFormModule } from './components/deltagare-confirm-signal-form/deltagare-confirm-signal-form.module'; import { DeltagareSignalArbeteStudierComponent } from './deltagare-signal-arbete-studier.component'; @@ -30,8 +30,8 @@ import { DeltagareSignalArbeteStudierComponent } from './deltagare-signal-arbete ReportLayoutModule, ConfirmDialogModule, DigiNgSkeletonBaseModule, - BackLinkModule + BackLinkModule, ], exports: [DeltagareSignalArbeteStudierComponent], }) -export class DeltagareSignalArbeteStudierModule { } +export class DeltagareSignalArbeteStudierModule {} diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.html similarity index 87% rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.html index 4589209..2d2b113 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/franvaro-report-form/franvaro-report-form.component.html @@ -5,8 +5,8 @@ description="Här rapporterar du deltagarens frånvaro i tjänsten." reportTitle="Avvikelserapport (frånvaro)" > -
-
+
+

Det går inte att rapportera frånvaro eftersom tjänsten inte har startat ännu.

 @@ -16,7 +16,7 @@
@@ -32,12 +32,12 @@
-
+
@@ -63,7 +63,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
-
+

Tiden deltagaren var frånvarande

-
-
+
+
-
+
@@ -188,7 +188,7 @@
@@ -197,8 +197,8 @@

Tiden deltagaren skulle varit närvarande

-
-
+
+
-
+
@@ -240,7 +240,7 @@
@@ -248,17 +248,17 @@
-