From 25cdf78b7066a3b18146abf0f57ac8bd421c6ffc Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 28 Jun 2021 11:59:22 +0200
Subject: [PATCH] OZG-928 Eingang um zustaendige Stelle erweitert
---
.../vorgang-forward-form.component.spec.ts | 4 +++-
.../vorgang-forward-form.component.ts | 3 +--
.../libs/vorgang-shared/src/lib/vorgang.model.ts | 6 +++++-
goofy-client/libs/vorgang-shared/test/vorgang.ts | 11 +++++++++--
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
index 2cd23dc193..1b237530e0 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
@@ -10,6 +10,7 @@ import { TextEditorComponent } from 'libs/ui/src/lib/ui/text-editor/text-editor.
import { MockComponent } from 'ng-mocks';
import { VorgangForwardFormComponent } from './vorgang-forward-form.component';
import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
describe('VorgangForwardFormComponent', () => {
let component: VorgangForwardFormComponent;
@@ -48,10 +49,11 @@ describe('VorgangForwardFormComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(VorgangForwardFormComponent);
component = fixture.componentInstance;
+ component.vorgang = createVorgangWithEingangResource();
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
-});
\ No newline at end of file
+});
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
index dc4c850b7a..7ef73f676a 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
@@ -20,8 +20,7 @@ export class VorgangForwardFormComponent {
readonly formServiceClass = VorgangForwardFormService;
constructor(private formService: VorgangForwardFormService) {
- this.formService.patch({'email': 'test'})
- this.formService.patchField('email', this.vorgang.aktenzeichen)
+ //this.formService.patchField('email', this.vorgang.eingang.zustaendigeStelle.email)
}
get form(): FormGroup {
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts
index fcc348cdfc..89d0e13408 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts
@@ -17,7 +17,7 @@ export interface VorgangWithEingang extends Vorgang {
export interface Eingang {
id: string,
antragsteller: Antragsteller,
- zustaendigeStelle: string,
+ zustaendigeStelle: ZustaendigeStelle,
header: EingangHeader,
formData: ReadonlyMap<number, string> | object
}
@@ -33,6 +33,10 @@ export interface Antragsteller {
formData: ReadonlyMap<number, string> | object
}
+export interface ZustaendigeStelle {
+ email: string;
+}
+
export interface EingangHeader {
client: string,
clientId: string,
diff --git a/goofy-client/libs/vorgang-shared/test/vorgang.ts b/goofy-client/libs/vorgang-shared/test/vorgang.ts
index 6b5c63b442..7799048059 100644
--- a/goofy-client/libs/vorgang-shared/test/vorgang.ts
+++ b/goofy-client/libs/vorgang-shared/test/vorgang.ts
@@ -1,4 +1,4 @@
-import { Antragsteller, Eingang, EingangHeader, ForwardRequest, Vorgang, VorgangListLinkRel, VorgangListResource, VorgangResource, VorgangWithEingang, VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
+import { Antragsteller, Eingang, EingangHeader, ForwardRequest, Vorgang, VorgangListLinkRel, VorgangListResource, VorgangResource, VorgangWithEingang, VorgangWithEingangResource, ZustaendigeStelle } from '@goofy-client/vorgang-shared';
import * as faker from 'faker';
import { toResource } from 'libs/tech-shared/test/resource';
import { times } from 'lodash-es';
@@ -21,6 +21,7 @@ export function createEingang(): Eingang {
return {
id: faker.random.uuid,
antragsteller: createAntragsteller(),
+ zustaendigeStelle: createZustaendigeStelle(),
header: createHeader(),
formData: null
}
@@ -39,6 +40,12 @@ export function createAntragsteller(): Antragsteller {
}
}
+export function createZustaendigeStelle(): ZustaendigeStelle {
+ return {
+ email: faker.internet.email()
+ }
+}
+
export function createHeader(): EingangHeader {
return {
client: faker.lorem.word(),
@@ -77,4 +84,4 @@ export function createVorgangForwardRequest(): ForwardRequest {
email: faker.internet.email(),
password: faker.internet.password()
}
-}
\ No newline at end of file
+}
--
GitLab