Merge branch 'master' into feature/draggable-form-groups

doc/compodoc_sources/concepts/configuration.md

@@ -472,15 +472,15 @@ In the List View columns config, use the "DisplayConfigurableEnum" component for
 #### Allowing multi select
 
 A property can also be defined in a way that multiple values can be selected.
-To allow multiple selection, the `dataType` needs to be `array`, the `innerDataType` `configurable-enum` and the name of the configurable enum has to be in the `additional` field.
+To allow multiple selection, additionally `isArray` should be `true`.
 The following example creates a property `materials` where multiple values from the `materials` configurable enum can be selected.
 
 ```json
 {
   "name": "materials",
   "schema": {
-    "dataType": "array",
-    "innerDataType": "configurable-enum",
+    "dataType": "configurable-enum",
+    "isArray": true,
     "additional": "materials",
     "label": "Materials"
   }

package.json

@@ -21,14 +21,14 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^17.0.4",
-    "@angular/cdk": "^17.3.3",
+    "@angular/cdk": "^17.3.4",
     "@angular/common": "^17.0.4",
     "@angular/compiler": "^17.0.4",
     "@angular/core": "^17.0.4",
     "@angular/forms": "^17.0.4",
     "@angular/localize": "^17.0.4",
-    "@angular/material": "^17.3.3",
-    "@angular/material-moment-adapter": "^17.3.3",
+    "@angular/material": "^17.3.4",
+    "@angular/material-moment-adapter": "^17.3.4",
     "@angular/platform-browser": "^17.0.4",
     "@angular/platform-browser-dynamic": "^17.0.4",
     "@angular/router": "^17.0.4",
@@ -42,7 +42,7 @@
     "@fortawesome/free-regular-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@ngneat/until-destroy": "^10.0.0",
-    "@sentry/browser": "^7.108.0",
+    "@sentry/browser": "^7.110.0",
     "angulartics2": "^12.2.1",
     "assert": "^2.1.0",
     "crypto-es": "^2.1.0",

src/app/child-dev-project/attendance/attendance.module.ts

@@ -21,7 +21,10 @@ import { attendanceComponents } from "./attendance-components";
 import { RecurringActivity } from "./model/recurring-activity";
 import { EventNote } from "./model/event-note";
 import { DefaultDatatype } from "../../core/entity/default-datatype/default.datatype";
-import { EventAttendanceDatatype } from "./model/event-attendance.datatype";
+import {
+  EventAttendanceDatatype,
+  EventAttendanceMapDatatype,
+} from "./model/event-attendance.datatype";
 
 @NgModule({
   providers: [
@@ -30,6 +33,11 @@ import { EventAttendanceDatatype } from "./model/event-attendance.datatype";
       useClass: EventAttendanceDatatype,
       multi: true,
     },
+    {
+      provide: DefaultDatatype,
+      useClass: EventAttendanceMapDatatype,
+      multi: true,
+    },
   ],
 })
 export class AttendanceModule {

src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.html

@@ -23,10 +23,10 @@
           (click)="goToChild(rowGroup[0].childId)"
           class="pointer"
         >
-          <app-display-entity
+          <app-entity-block
             [entityId]="rowGroup[0].childId"
             entityType="Child"
-          ></app-display-entity>
+          ></app-entity-block>
         </td>
       </ng-container>
 

src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.ts

@@ -11,7 +11,7 @@ import { groupBy } from "../../../../utils/utils";
 import { MatTableModule } from "@angular/material/table";
 import { DynamicComponent } from "../../../../core/config/dynamic-components/dynamic-component.decorator";
 import { NgForOf, NgIf } from "@angular/common";
-import { DisplayEntityComponent } from "../../../../core/basic-datatypes/entity/display-entity/display-entity.component";
+import { EntityBlockComponent } from "../../../../core/basic-datatypes/entity/entity-block/entity-block.component";
 import { AttendanceDayBlockComponent } from "./attendance-day-block/attendance-day-block.component";
 import { DashboardWidget } from "../../../../core/dashboard/dashboard-widget/dashboard-widget";
 import { EventNote } from "../../model/event-note";
@@ -33,7 +33,7 @@ interface AttendanceWeekRow {
     NgIf,
     MatTableModule,
     NgForOf,
-    DisplayEntityComponent,
+    EntityBlockComponent,
     AttendanceDayBlockComponent,
     DashboardListWidgetComponent,
   ],

src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.html

@@ -24,10 +24,10 @@
           </button>
         </td>
         <td>
-          <app-display-entity
+          <app-entity-block
             [entityId]="childId"
             entityType="Child"
-          ></app-display-entity>
+          ></app-entity-block>
         </td>
         <td>
           <app-attendance-status-select
@@ -66,10 +66,10 @@
     >
       <mat-card-content>
         <div class="attendance-item--header margin-bottom-regular">
-          <app-display-entity
+          <app-entity-block
             [entityId]="childId"
             entityType="Child"
-          ></app-display-entity>
+          ></app-entity-block>
 
           <button
             mat-icon-button

src/app/child-dev-project/attendance/edit-attendance/edit-attendance.component.ts

@@ -1,13 +1,13 @@
 import { Component, Input, OnInit } from "@angular/core";
 import { EditComponent } from "../../../core/entity/default-datatype/edit-component";
-import { EditEntityComponent } from "../../../core/basic-datatypes/entity-array/edit-entity/edit-entity.component";
+import { EditEntityComponent } from "../../../core/basic-datatypes/entity/edit-entity/edit-entity.component";
 import { DynamicComponent } from "../../../core/config/dynamic-components/dynamic-component.decorator";
 import { startWith } from "rxjs/operators";
 import { FormControl } from "@angular/forms";
 import { InteractionType } from "../../notes/model/interaction-type.interface";
 import { NgForOf, NgIf } from "@angular/common";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
-import { DisplayEntityComponent } from "../../../core/basic-datatypes/entity/display-entity/display-entity.component";
+import { EntityBlockComponent } from "../../../core/basic-datatypes/entity/entity-block/entity-block.component";
 import { MatButtonModule } from "@angular/material/button";
 import { AttendanceStatusSelectComponent } from "../attendance-status-select/attendance-status-select.component";
 import { MatFormFieldModule } from "@angular/material/form-field";
@@ -28,7 +28,7 @@ import { MatCardModule } from "@angular/material/card";
     NgIf,
     NgForOf,
     FontAwesomeModule,
-    DisplayEntityComponent,
+    EntityBlockComponent,
     MatButtonModule,
     AttendanceStatusSelectComponent,
     MatFormFieldModule,