From a3e369f011fb8629aba271ecc367cf9a357d2ea0 Mon Sep 17 00:00:00 2001
From: Tom Winter <tom@aam-digital.com>
Date: Thu, 31 Oct 2024 10:12:13 +0100
Subject: [PATCH] fix: attendance status now always reliably saved (#2641)

fixes #2615
---
 .../edit-attendance/edit-attendance.component.html  | 10 ++--------
 .../edit-attendance/edit-attendance.component.ts    | 13 +++++--------
 .../entity-select/entity-select.component.ts        |  8 ++++----
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.html b/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.html
index fd3cbe5cfc..937a4c757e 100644
--- a/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.html
+++ b/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.html
@@ -24,10 +24,7 @@
           </button>
         </td>
         <td>
-          <app-entity-block
-            [entityId]="childId"
-            entityType="Child"
-          ></app-entity-block>
+          <app-entity-block [entityId]="childId"></app-entity-block>
         </td>
         <td>
           <app-attendance-status-select
@@ -66,10 +63,7 @@
     >
       <mat-card-content>
         <div class="attendance-item--header margin-bottom-regular">
-          <app-entity-block
-            [entityId]="childId"
-            entityType="Child"
-          ></app-entity-block>
+          <app-entity-block [entityId]="childId"></app-entity-block>
 
           <button
             mat-icon-button
diff --git a/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.ts b/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.ts
index 5b8eee01ed..6f274ad3f1 100644
--- a/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.ts
+++ b/src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.ts
@@ -46,7 +46,6 @@ export class EditAttendanceComponent
   mobile = false;
 
   @Input() declare entity: Note;
-  attendanceForm: FormControl<Map<string, EventAttendance>>;
 
   constructor(screenWithObserver: ScreenWidthObserver) {
     super();
@@ -65,23 +64,22 @@ export class EditAttendanceComponent
       category.valueChanges.pipe(startWith(category.value)).subscribe((val) => {
         this.showAttendance = !!val?.isMeeting;
         if (this.showAttendance) {
-          this.attendanceForm = new FormControl(
+          let childrenAttendanceForm = new FormControl(
             this.entity.copy()["childrenAttendance"],
           );
-          this.parent.addControl("childrenAttendance", this.attendanceForm);
+          this.parent.addControl("childrenAttendance", childrenAttendanceForm);
         } else {
           this.parent.removeControl("childrenAttendance");
-          this.attendanceForm = undefined;
         }
       });
     }
   }
 
   getAttendance(childId: string) {
-    let attendance = this.attendanceForm.value.get(childId);
+    let attendance = this.parent.get("childrenAttendance").value.get(childId);
     if (!attendance) {
       attendance = new EventAttendance();
-      this.attendanceForm.value.set(childId, attendance);
+      this.parent.get("childrenAttendance").value.set(childId, attendance);
     }
     return attendance;
   }
@@ -90,7 +88,7 @@ export class EditAttendanceComponent
     const children = this.formControl.value;
     const index = children.indexOf(id);
     children.splice(index, 1);
-    this.attendanceForm.value.delete(id);
+    this.parent.get("childrenAttendance").value.delete(id);
     this.formControl.markAsDirty();
     this.formControl.setValue([...children]);
   }
@@ -98,6 +96,5 @@ export class EditAttendanceComponent
   updateAttendanceValue(childId, property: "status" | "remarks", newValue) {
     this.formControl.markAsDirty();
     this.getAttendance(childId)[property] = newValue;
-    this.attendanceForm.setValue(this.attendanceForm.value);
   }
 }
diff --git a/src/app/core/common-components/entity-select/entity-select.component.ts b/src/app/core/common-components/entity-select/entity-select.component.ts
index e9518d182c..0f80f39d77 100644
--- a/src/app/core/common-components/entity-select/entity-select.component.ts
+++ b/src/app/core/common-components/entity-select/entity-select.component.ts
@@ -69,7 +69,7 @@ export class EntitySelectComponent<
     }
 
     this._entityType = Array.isArray(type) ? type : [type];
-    this.loadAvailableEntities();
+    this.loadAvailableEntities().then((_) => {});
   }
 
   private _entityType: string[];
@@ -91,7 +91,7 @@ export class EntitySelectComponent<
   @Input() label: string;
 
   /**
-   * The placeholder is what is seen when someone clicks into the input-
+   * The placeholder is what is seen when someone clicks into the input
    * field and adds new entities.
    * In the note-details-view, this is "Add children..."
    * The placeholder is only displayed if `loading === false`
@@ -174,7 +174,7 @@ export class EntitySelectComponent<
    * @private
    */
   private async alignAvailableAndSelectedEntities(availableEntities: E[]) {
-    if (this.form.value === null || this.form.value === undefined) {
+    if (this.form?.value === null || this.form?.value === undefined) {
       return;
     }
 
@@ -245,7 +245,7 @@ export class EntitySelectComponent<
     if (this._entityType?.length < 1) {
       return;
     }
-    if (this._entityType.length > 1) {
+    if (this._entityType?.length > 1) {
       Logging.warn(
         "EntitySelect with multiple types is always creating a new entity of the first listed type only.",
       );