Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generalized RelatedEntitiesWithSummary (from EducationalMaterialComponent) #2029

Merged
merged 7 commits into from
Oct 16, 2023
Merged

Generalized RelatedEntitiesWithSummary (from EducationalMaterialComponent) #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1efcc2e
feat(core): generalize related entities with summary component
sleidig Oct 13, 2023
c21d9e8
rename
sleidig Oct 13, 2023
b469686
fix data not being filtered for entity
sleidig Oct 13, 2023
a93671a
Merge branch 'master' into generalize-ed-mat
sleidig Oct 16, 2023
b3670a9
rename vars and add handling for case without groupBy
sleidig Oct 16, 2023
38974ea
Update src/app/core/entity-details/related-entities-with-summary/rela…
sleidig Oct 16, 2023
7f209e1
Merge branch 'master' into generalize-ed-mat
sleidig Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/child-dev-project/children/children-components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
15 changes: 0 additions & 15 deletions ...n/educational-material/educational-material-component/educational-material.component.html
View file
Open in desktop

This file was deleted.

121 changes: 0 additions & 121 deletions ...ren/educational-material/educational-material-component/educational-material.component.ts
View file
Open in desktop

This file was deleted.

20 changes: 15 additions & 5 deletions src/app/core/config/config-fix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,14 +706,24 @@ export const defaultJsonConfig = {
"components": [
{
"title": "",
"component": "EducationalMaterial",
"component": "RelatedEntitiesWithSummary",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migration required

"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
}
}
}
}
]
},
{
Expand Down
16 changes: 16 additions & 0 deletions ...entity-details/related-entities-with-summary/related-entities-with-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading
Loading