From 0661d2209bc1a92be8c1642e3fd873797a2ad2d2 Mon Sep 17 00:00:00 2001 From: Nicolas Fuentes Maturana Date: Wed, 25 Aug 2021 10:54:21 +0200 Subject: [PATCH] Merge pull request #66 in TEA/dafa-web-monorepo from feature/TV-406 to develop Squashed commit of the following: commit e6d9ed4bb24901433a126981d949e4085719a275 Author: fueno Date: Tue Aug 24 16:53:06 2021 +0200 TV-406 updated spec file, deleted inline style commit dfd9ec31950a7f06ca8935452ff7d022da2685c1 Author: fueno Date: Tue Aug 24 16:06:52 2021 +0200 TV-406 some html commit 84e3e05b79c33209d04107c79df3a2600665cc0a Author: fueno Date: Tue Aug 24 15:21:03 2021 +0200 TV-406 DeltagareReportComponent, routing created --- .../deltagare/deltagare-routing.module.ts | 8 +++-- .../deltagare-report.component.html | 13 ++++++++ .../deltagare-report.component.scss | 0 .../deltagare-report.component.spec.ts | 30 +++++++++++++++++++ .../deltagare-report.component.ts | 13 ++++++++ .../deltagare-report.module.ts | 19 ++++++++++++ 6 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.html create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.scss create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.spec.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.ts create mode 100644 apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.module.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 d62a51c..3b3bf8e 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 @@ -9,12 +9,16 @@ const routes: Routes = [ }, { path: ':deltagareId', - loadChildren: () => import('./pages/deltagare-card/deltagare-card.module').then(m => m.DeltagareCardModule), + loadChildren: () => import('./pages/deltagare-card/deltagare-card.module').then(m => m.DeltagareCardModule) }, + { + path: 'rapportera/:deltagareId', + loadChildren: () => import('./pages/deltagare-report/deltagare-report.module').then(m => m.DeltagareReportModule) + } ]; @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-report/deltagare-report.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.html new file mode 100644 index 0000000..9c2f60c --- /dev/null +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.html @@ -0,0 +1,13 @@ + +
+ +

Avvikelserapport

+

Här ska det komma en förklarande text om avvikelserapporter.

+

Skapa rapport

+
+

Deltagare: Göran Ekman

+

Personnummer: 999999

+
+
+
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.spec.ts new file mode 100644 index 0000000..7ad0608 --- /dev/null +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.spec.ts @@ -0,0 +1,30 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { LayoutComponent } from '@msfa-shared/components/layout/layout.component'; + +import { DeltagareReportComponent } from './deltagare-report.component'; + +describe('DeltagareReportComponent', () => { + let component: DeltagareReportComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [DeltagareReportComponent, LayoutComponent], + imports: [RouterTestingModule, HttpClientTestingModule] + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(DeltagareReportComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.ts new file mode 100644 index 0000000..db026e6 --- /dev/null +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.component.ts @@ -0,0 +1,13 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; + +@Component({ + selector: 'msfa-deltagare-report', + templateUrl: './deltagare-report.component.html', + styleUrls: ['./deltagare-report.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class DeltagareReportComponent { + + + +} diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.module.ts new file mode 100644 index 0000000..4d58ea6 --- /dev/null +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/deltagare-report.module.ts @@ -0,0 +1,19 @@ +import { CommonModule } from '@angular/common'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { DeltagareReportComponent } from './deltagare-report.component'; + + + +@NgModule({ + schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [DeltagareReportComponent], + imports: [ + CommonModule, + RouterModule.forChild([{ path: '', component: DeltagareReportComponent }]), + LayoutModule + ], + exports: [DeltagareReportComponent] +}) +export class DeltagareReportModule { }