kuni vor 3 Wochen
Ursprung
Commit
157806e70f
2 geänderte Dateien mit 30 neuen und 19 gelöschten Zeilen
  1. 13
    5
      src/app/pages/danka-edit/danka-edit.ts
  2. 17
    14
      src/app/pages/family-edit/family-edit.ts

+ 13
- 5
src/app/pages/danka-edit/danka-edit.ts Datei anzeigen

1
-import { Component, inject } from '@angular/core';
1
+import { Component, inject, OnInit } from '@angular/core';
2
 import {
2
 import {
3
   FormBuilder,
3
   FormBuilder,
4
   FormGroup,
4
   FormGroup,
19
   templateUrl: './danka-edit.html',
19
   templateUrl: './danka-edit.html',
20
   styleUrl: './danka-edit.scss',
20
   styleUrl: './danka-edit.scss',
21
 })
21
 })
22
-export class DankaEdit {
22
+export class DankaEdit implements OnInit {
23
   danka: Danka | undefined;
23
   danka: Danka | undefined;
24
 
24
 
25
   dankaForm = new FormGroup({
25
   dankaForm = new FormGroup({
38
     private route: ActivatedRoute,
38
     private route: ActivatedRoute,
39
     private router: Router,
39
     private router: Router,
40
   ) {
40
   ) {
41
+  }
42
+
43
+  ngOnInit(): void {
44
+    this.init();
45
+  }
46
+
47
+  async init(): Promise<void> {
41
     const id = this.route.snapshot.params['id'];
48
     const id = this.route.snapshot.params['id'];
49
+
42
     if (id) {
50
     if (id) {
43
-      this.danka = this.dankaService.getDankaById(id);
51
+      this.danka = await this.dankaService.getDankaById(id);
44
 
52
 
45
       if (this.danka) {
53
       if (this.danka) {
46
         this.dankaForm.patchValue({
54
         this.dankaForm.patchValue({
60
         }
68
         }
61
       }
69
       }
62
     }
70
     }
63
-    console.log(this.danka);
71
+
64
   }
72
   }
65
 
73
 
66
   get phones() {
74
   get phones() {
79
   }
87
   }
80
 
88
 
81
   removePhone(index: number) {
89
   removePhone(index: number) {
82
-    if(this.phones.length > 1) {
90
+    if (this.phones.length > 1) {
83
       this.phones.removeAt(index);
91
       this.phones.removeAt(index);
84
     }
92
     }
85
   }
93
   }

+ 17
- 14
src/app/pages/family-edit/family-edit.ts Datei anzeigen

23
   templateUrl: './family-edit.html',
23
   templateUrl: './family-edit.html',
24
   styleUrl: './family-edit.scss',
24
   styleUrl: './family-edit.scss',
25
 })
25
 })
26
-export class FamilyEdit implements OnInit{
26
+export class FamilyEdit implements OnInit {
27
   danka: Danka | undefined;
27
   danka: Danka | undefined;
28
   family: Family | undefined;
28
   family: Family | undefined;
29
   families: Family[] = [];
29
   families: Family[] = [];
135
     return this.families.filter((family) => family.id !== this.familyId);
135
     return this.families.filter((family) => family.id !== this.familyId);
136
   }
136
   }
137
 
137
 
138
-  patchMarriageRelationFields(familyId: string): void {
139
-    const relations = this.marriageRelationService.getMarriageRelationsByFamilyId(familyId);
138
+  async patchMarriageRelationFields(familyId: string): Promise<void> {
139
+    const relations = await this.marriageRelationService.getMarriageRelationsByFamilyId(familyId);
140
+
140
     const relation =
141
     const relation =
141
       relations.find((marriageRelation) => marriageRelation.status === 'current') ?? relations[0];
142
       relations.find((marriageRelation) => marriageRelation.status === 'current') ?? relations[0];
142
 
143
 
143
-    if (!relation) {
144
-      return;
145
-    }
144
+    if (!relation) return;
146
 
145
 
147
     this.familyForm.patchValue({
146
     this.familyForm.patchValue({
148
       spouseId: relation.person1Id === familyId ? relation.person2Id : relation.person1Id,
147
       spouseId: relation.person1Id === familyId ? relation.person2Id : relation.person1Id,
150
     });
149
     });
151
   }
150
   }
152
 
151
 
153
-  findMarriageRelation(person1Id: string, person2Id: string): MarriageRelation | undefined {
154
-    return this.marriageRelationService
155
-      .getMarriageRelationsByFamilyId(person1Id)
156
-      .find(
157
-        (relation) =>
158
-          (relation.person1Id === person1Id && relation.person2Id === person2Id) ||
159
-          (relation.person1Id === person2Id && relation.person2Id === person1Id),
160
-      );
152
+  async findMarriageRelation(
153
+    person1Id: string,
154
+    person2Id: string
155
+  ): Promise<MarriageRelation | undefined> {
156
+
157
+    const relations = await this.marriageRelationService.getMarriageRelationsByFamilyId(person1Id);
158
+
159
+    return relations.find(
160
+      (relation) =>
161
+        (relation.person1Id === person1Id && relation.person2Id === person2Id) ||
162
+        (relation.person1Id === person2Id && relation.person2Id === person1Id),
163
+    );
161
   }
164
   }
162
 
165
 
163
   saveFamily() {
166
   saveFamily() {

Laden…
Abbrechen
Speichern