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 @@
Avvikelserapport (avvikelse) för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen.