Generalized RelatedEntitiesWithSummary (from EducationalMaterialCompo…

…nent) (#2029) * feat(core): generalize related entities with summary component to be usable with any entity type, not just EducationalMaterial closes #2004 Co-authored-by: Simon <simon@aam-digital.com>
Aam-Digital · Oct 16, 2023 · 616fc9d · 616fc9d
1 parent bbf3749
commit 616fc9d
Show file tree

Hide file tree

Showing 10 changed files with 260 additions and 201 deletions.
diff --git a/src/app/child-dev-project/children/children-components.ts b/src/app/child-dev-project/children/children-components.ts
@@ -45,11 +45,11 @@ export const childrenComponents: ComponentTuple[] = [
       ).then((c) => c.ChildrenBmiDashboardComponent),
   ],
   [
-    "EducationalMaterial",
+    "RelatedEntitiesWithSummary",
     () =>
       import(
-        "./educational-material/educational-material-component/educational-material.component"
-      ).then((c) => c.EducationalMaterialComponent),
+        "../../core/entity-details/related-entities-with-summary/related-entities-with-summary.component"
+      ).then((c) => c.RelatedEntitiesWithSummaryComponent),
   ],
   [
     "BmiBlock",

diff --git a/...n/educational-material/educational-material-component/educational-material.component.html b/...n/educational-material/educational-material-component/educational-material.component.html
diff --git a/...ren/educational-material/educational-material-component/educational-material.component.ts b/...ren/educational-material/educational-material-component/educational-material.component.ts
diff --git a/src/app/core/config/config-fix.ts b/src/app/core/config/config-fix.ts
@@ -706,14 +706,24 @@ export const defaultJsonConfig = {
           "components": [
             {
               "title": "",
-              "component": "EducationalMaterial",
+              "component": "RelatedEntitiesWithSummary",
               "config": {
-               "summaries": {
-                  total: true,
-                  average: true,
+                "entityType": EducationalMaterial.ENTITY_TYPE,
+                "property": "child",
+                "columns": [
+                  { "id": "date", "visibleFrom": "xs" },
+                  { "id": "materialType", "visibleFrom": "xs" },
+                  { "id": "materialAmount", "visibleFrom": "md" },
+                  { "id": "description", "visibleFrom": "md" },
+                ],
+                "summaries": {
+                  "countProperty": "materialAmount",
+                  "groupBy": "materialType",
+                  "total": true,
+                  "average": false
                 }
               }
-            }    
+            }
           ]
         },
         {

diff --git a/...entity-details/related-entities-with-summary/related-entities-with-summary.component.html b/...entity-details/related-entities-with-summary/related-entities-with-summary.component.html
@@ -0,0 +1,16 @@
+<app-entity-subrecord
+  [records]="data"
+  [filter]="filter"
+  [columns]="columns"
+  [newRecordFactory]="createNewRecordFactory()"
+  [isLoading]="isLoading"
+></app-entity-subrecord>
+
+<div class="margin-top-large">
+  <ng-container *ngIf="summarySum">
+    <strong i18n>Total:</strong> {{ summarySum }} <br />
+  </ng-container>
+  <ng-container *ngIf="summaryAvg">
+    <strong i18n>Average:</strong> {{ summaryAvg }} <br />
+  </ng-container>
+</div>