From 590c145105692f410eee3b5d1ecc4d10eaf6ce7e Mon Sep 17 00:00:00 2001 From: kirtijadhav <83791155+kirtijadhav@users.noreply.github.com> Date: Sat, 25 Sep 2021 17:10:54 +0200 Subject: [PATCH] fix: improved usability of children overview in schools section fixes #982 --- src/app/app.component.ts | 2 + .../children/model/childSchoolRelation.ts | 2 + .../children-overview.component.html | 17 +- .../children-overview.component.spec.ts | 119 +----- .../children-overview.component.ts | 66 +-- .../schools/schools.module.ts | 3 +- .../schools/schools.service.ts | 38 -- src/app/core/config/config-fix.ts | 9 - .../edit-single-entity.component.html | 3 + .../edit-single-entity.component.spec.ts | 14 +- .../edit-single-entity.component.ts | 1 + src/locale/messages.de.xlf | 389 +++++++++--------- src/locale/messages.xlf | 365 ++++++++-------- 13 files changed, 448 insertions(+), 580 deletions(-) delete mode 100644 src/app/child-dev-project/schools/schools.service.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9e88d1b031..7805c36641 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -35,6 +35,7 @@ import { Note } from "./child-dev-project/notes/model/note"; import { EventNote } from "./child-dev-project/attendance/model/event-note"; import { waitForChangeTo } from "./core/session/session-states/session-utils"; import { environment } from "../environments/environment"; +import { ChildSchoolRelation } from "./child-dev-project/children/model/childSchoolRelation"; @Component({ selector: "app-root", @@ -81,6 +82,7 @@ export class AppComponent implements OnInit { this.entityConfigService.addConfigAttributes(HistoricalEntityData); this.entityConfigService.addConfigAttributes(Note); this.entityConfigService.addConfigAttributes(EventNote); + this.entityConfigService.addConfigAttributes(ChildSchoolRelation); }); // If loading the config earlier (in a module constructor or through APP_INITIALIZER) a runtime error occurs. diff --git a/src/app/child-dev-project/children/model/childSchoolRelation.ts b/src/app/child-dev-project/children/model/childSchoolRelation.ts index ac504585b6..565e78f606 100644 --- a/src/app/child-dev-project/children/model/childSchoolRelation.ts +++ b/src/app/child-dev-project/children/model/childSchoolRelation.ts @@ -31,11 +31,13 @@ export class ChildSchoolRelation extends Entity { @DatabaseField({ dataType: "date-only", label: $localize`:Label for the start date of a relation:From`, + description: $localize`:Description of the start date of a relation:The date a child joins a school`, }) start: Date; @DatabaseField({ dataType: "date-only", label: $localize`:Label for the end date of a relation:To`, + description: $localize`:Description of the end date of a relation:The date of a child leaving the school`, }) end: Date; diff --git a/src/app/child-dev-project/schools/children-overview/children-overview.component.html b/src/app/child-dev-project/schools/children-overview/children-overview.component.html index a404d8954f..160e63f110 100644 --- a/src/app/child-dev-project/schools/children-overview/children-overview.component.html +++ b/src/app/child-dev-project/schools/children-overview/children-overview.component.html @@ -1,19 +1,6 @@ - diff --git a/src/app/child-dev-project/schools/children-overview/children-overview.component.spec.ts b/src/app/child-dev-project/schools/children-overview/children-overview.component.spec.ts index d341932c42..054cdbe0fd 100644 --- a/src/app/child-dev-project/schools/children-overview/children-overview.component.spec.ts +++ b/src/app/child-dev-project/schools/children-overview/children-overview.component.spec.ts @@ -9,27 +9,21 @@ import { ChildrenOverviewComponent } from "./children-overview.component"; import { SchoolsModule } from "../schools.module"; import { School } from "../model/school"; import { Child } from "../../children/model/child"; -import { SchoolsService } from "../schools.service"; import { RouterTestingModule } from "@angular/router/testing"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { Router } from "@angular/router"; import { MockSessionModule } from "../../../core/session/mock-session.module"; -import { MatDialog } from "@angular/material/dialog"; -import { EntityFormComponent } from "../../../core/entity-components/entity-form/entity-form/entity-form.component"; -import { EntityFormService } from "../../../core/entity-components/entity-form/entity-form.service"; -import { AlertService } from "../../../core/alerts/alert.service"; -import { EventEmitter } from "@angular/core"; -import { PanelConfig } from "../../../core/entity-components/entity-details/EntityDetailsConfig"; import { ChildSchoolRelation } from "../../children/model/childSchoolRelation"; +import { ChildrenService } from "../../children/children.service"; describe("ChildrenOverviewComponent", () => { let component: ChildrenOverviewComponent; let fixture: ComponentFixture; - let mockSchoolsService: jasmine.SpyObj; + let mockChildrenService: jasmine.SpyObj; beforeEach( waitForAsync(() => { - mockSchoolsService = jasmine.createSpyObj(["getChildrenForSchool"]); + mockChildrenService = jasmine.createSpyObj(["queryRelationsOf"]); TestBed.configureTestingModule({ declarations: [], @@ -39,7 +33,9 @@ describe("ChildrenOverviewComponent", () => { NoopAnimationsModule, MockSessionModule.withState(), ], - providers: [{ provide: SchoolsService, useValue: mockSchoolsService }], + providers: [ + { provide: ChildrenService, useValue: mockChildrenService }, + ], }).compileComponents(); }) ); @@ -47,6 +43,7 @@ describe("ChildrenOverviewComponent", () => { beforeEach(() => { fixture = TestBed.createComponent(ChildrenOverviewComponent); component = fixture.componentInstance; + component.entity = new School(); fixture.detectChanges(); }); @@ -54,20 +51,21 @@ describe("ChildrenOverviewComponent", () => { expect(component).toBeTruthy(); }); - it("should load the children for a school", fakeAsync(() => { + it("should load the relations for a school", fakeAsync(() => { const school = new School("s1"); - const child1 = new Child("c1"); - const child2 = new Child("c2"); + const relation1 = new ChildSchoolRelation("r1"); + const relation2 = new ChildSchoolRelation("r2"); const config = { entity: school }; - mockSchoolsService.getChildrenForSchool.and.resolveTo([child1, child2]); + mockChildrenService.queryRelationsOf.and.resolveTo([relation1, relation2]); component.onInitFromDynamicConfig(config); + tick(); - expect(mockSchoolsService.getChildrenForSchool).toHaveBeenCalledWith( + expect(mockChildrenService.queryRelationsOf).toHaveBeenCalledWith( + "school", school.getId() ); - tick(); - expect(component.children).toEqual([child1, child2]); + expect(component.records).toEqual([relation1, relation2]); })); it("should route to a child when clicked", () => { @@ -83,89 +81,12 @@ describe("ChildrenOverviewComponent", () => { ]); }); - it("should open a dialog when clicking add new child with correct relation", () => { - component.entity = new School(); - const dialog = TestBed.inject(MatDialog); - const entityFormService = TestBed.inject(EntityFormService); - const alertService = TestBed.inject(AlertService); - const dialogComponent = new EntityFormComponent( - entityFormService, - alertService - ); - spyOn(dialog, "open").and.returnValues({ - componentInstance: dialogComponent, - } as any); + it("should create a relation with the school ID already been set", () => { + component.entity = new School("testID"); - component.addChildClick(); + const newRelation = component.generateNewRecordFactory()(); - expect(dialog.open).toHaveBeenCalled(); - const relation = dialogComponent.entity as ChildSchoolRelation; - expect(relation.schoolId).toBe(component.entity.getId()); + expect(newRelation).toBeInstanceOf(ChildSchoolRelation); + expect(newRelation.schoolId).toBe("testID"); }); - - it("should add a newly added child to the list", fakeAsync(() => { - component.entity = new School(); - const child = new Child(); - const dialog = TestBed.inject(MatDialog); - const dialogComponent = { - onSave: new EventEmitter(), - onCancel: new EventEmitter(), - }; - spyOn(dialog, "open").and.returnValues({ - componentInstance: dialogComponent, - close: () => {}, - } as any); - mockSchoolsService.getChildrenForSchool.and.resolveTo([child]); - - component.addChildClick(); - dialogComponent.onSave.emit(undefined); - tick(); - - expect(component.children).toContain(child); - })); - - it("should close the dialog when cancel is clicked", fakeAsync(() => { - component.entity = new School(); - const dialog = TestBed.inject(MatDialog); - const dialogComponent = { - onSave: new EventEmitter(), - onCancel: new EventEmitter(), - }; - const closeSpy = jasmine.createSpy(); - spyOn(dialog, "open").and.returnValues({ - componentInstance: dialogComponent, - close: closeSpy, - } as any); - - component.addChildClick(); - dialogComponent.onCancel.emit(undefined); - tick(); - - expect(closeSpy).toHaveBeenCalled(); - })); - - it("should assign the popup columns from the config", fakeAsync(() => { - const dialog = TestBed.inject(MatDialog); - const dialogComponent = { - columns: [], - onSave: new EventEmitter(), - onCancel: new EventEmitter(), - }; - spyOn(dialog, "open").and.returnValues({ - componentInstance: dialogComponent, - close: () => {}, - } as any); - const popupColumns = ["start", "end", "class"]; - const config: PanelConfig = { - entity: new Child(), - config: { popupColumns: popupColumns }, - }; - - component.onInitFromDynamicConfig(config); - tick(); - component.addChildClick(); - tick(); - - expect(dialogComponent.columns).toEqual(popupColumns.map((col) => [col])); - })); }); diff --git a/src/app/child-dev-project/schools/children-overview/children-overview.component.ts b/src/app/child-dev-project/schools/children-overview/children-overview.component.ts index 35d60b30b8..373792e99e 100644 --- a/src/app/child-dev-project/schools/children-overview/children-overview.component.ts +++ b/src/app/child-dev-project/schools/children-overview/children-overview.component.ts @@ -1,14 +1,12 @@ import { Component } from "@angular/core"; import { OnInitDynamicComponent } from "../../../core/view/dynamic-components/on-init-dynamic-component.interface"; -import { SchoolsService } from "../schools.service"; import { Child } from "../../children/model/child"; import { PanelConfig } from "../../../core/entity-components/entity-details/EntityDetailsConfig"; import { FormFieldConfig } from "../../../core/entity-components/entity-form/entity-form/FormConfig"; import { Router } from "@angular/router"; -import { MatDialog } from "@angular/material/dialog"; -import { EntityFormComponent } from "../../../core/entity-components/entity-form/entity-form/entity-form.component"; import { ChildSchoolRelation } from "../../children/model/childSchoolRelation"; import { Entity } from "../../../core/entity/model/entity"; +import { ChildrenService } from "../../children/children.service"; /** * This component creates a table containing all children currently attending this school. @@ -19,47 +17,29 @@ import { Entity } from "../../../core/entity/model/entity"; styleUrls: ["./children-overview.component.scss"], }) export class ChildrenOverviewComponent implements OnInitDynamicComponent { - readonly addButtonLabel = ChildSchoolRelation.schema.get("childId").label; - columns: FormFieldConfig[] = [ - { id: "projectNumber" }, - { id: "name" }, - { - id: "schoolClass", - label: $localize`:The school-class of a child:Class`, - view: "DisplayText", - }, - { - id: "age", - label: $localize`:The age of a child:Age`, - view: "DisplayText", - }, - ]; - - private popupColumns: (string | FormFieldConfig)[] = [ - "childId", - "start", - "end", + { id: "childId" }, + { id: "schoolClass" }, + { id: "start" }, + { id: "end" }, + { id: "result" }, ]; - children: Child[] = []; entity: Entity; + records: ChildSchoolRelation[] = []; constructor( - private schoolsService: SchoolsService, - private router: Router, - private dialog: MatDialog + private childrenService: ChildrenService, + private router: Router ) {} async onInitFromDynamicConfig(config: PanelConfig) { if (config?.config?.columns) { this.columns = config.config.columns; } - if (config?.config?.popupColumns?.length > 0) { - this.popupColumns = config.config.popupColumns; - } this.entity = config.entity; - this.children = await this.schoolsService.getChildrenForSchool( + this.records = await this.childrenService.queryRelationsOf( + "school", this.entity.getId() ); } @@ -68,23 +48,11 @@ export class ChildrenOverviewComponent implements OnInitDynamicComponent { this.router.navigate([`/${child.getType().toLowerCase()}`, child.getId()]); } - addChildClick() { - const dialogRef = this.dialog.open(EntityFormComponent, { - width: "80%", - maxHeight: "90vh", - }); - - dialogRef.componentInstance.columns = this.popupColumns.map((col) => [col]); - const newRelation = new ChildSchoolRelation(); - newRelation.schoolId = this.entity.getId(); - dialogRef.componentInstance.entity = newRelation; - dialogRef.componentInstance.editing = true; - dialogRef.componentInstance.onSave.subscribe(async () => { - dialogRef.close(); - this.children = await this.schoolsService.getChildrenForSchool( - this.entity.getId() - ); - }); - dialogRef.componentInstance.onCancel.subscribe(() => dialogRef.close()); + generateNewRecordFactory(): () => ChildSchoolRelation { + return () => { + const newRelation = new ChildSchoolRelation(); + newRelation.schoolId = this.entity.getId(); + return newRelation; + }; } } diff --git a/src/app/child-dev-project/schools/schools.module.ts b/src/app/child-dev-project/schools/schools.module.ts index d7746cea00..f63563c95a 100644 --- a/src/app/child-dev-project/schools/schools.module.ts +++ b/src/app/child-dev-project/schools/schools.module.ts @@ -22,7 +22,6 @@ import { MatPaginatorModule } from "@angular/material/paginator"; import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; import { MatSelectModule } from "@angular/material/select"; import { RouterModule } from "@angular/router"; -import { SchoolsService } from "./schools.service"; import { MatTooltipModule } from "@angular/material/tooltip"; import { Angulartics2Module } from "angulartics2"; import { ChildrenOverviewComponent } from "./children-overview/children-overview.component"; @@ -77,7 +76,7 @@ import { EntitySubrecordModule } from "../../core/entity-components/entity-subre ChildrenOverviewComponent, ], exports: [SchoolBlockComponent], - providers: [SchoolsService, DatePipe], + providers: [DatePipe], entryComponents: [SchoolBlockComponent], }) export class SchoolsModule {} diff --git a/src/app/child-dev-project/schools/schools.service.ts b/src/app/child-dev-project/schools/schools.service.ts deleted file mode 100644 index 807bfd9769..0000000000 --- a/src/app/child-dev-project/schools/schools.service.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { Injectable } from "@angular/core"; -import { School } from "./model/school"; -import { EntityMapperService } from "../../core/entity/entity-mapper.service"; -import { from, Observable } from "rxjs"; -import { Child } from "../children/model/child"; -import { ChildrenService } from "../children/children.service"; -import { LoggingService } from "../../core/logging/logging.service"; - -@Injectable() -export class SchoolsService { - constructor( - private entityMapper: EntityMapperService, - private childrenService: ChildrenService, - private log: LoggingService - ) {} - - getSchools(): Observable { - return from(this.entityMapper.loadType(School)); - } - - async getChildrenForSchool(schoolId: string): Promise { - const relations = await this.childrenService.queryRelationsOf( - "school", - schoolId - ); - const children: Child[] = []; - for (const relation of relations) { - try { - children.push( - await this.childrenService.getChild(relation.childId).toPromise() - ); - } catch (e) { - this.log.warn("Could not find child " + relation.childId); - } - } - return children; - } -} diff --git a/src/app/core/config/config-fix.ts b/src/app/core/config/config-fix.ts index 0cc52c9003..708e74f5c3 100644 --- a/src/app/core/config/config-fix.ts +++ b/src/app/core/config/config-fix.ts @@ -355,15 +355,6 @@ export const defaultJsonConfig = { { "title": "", "component": "ChildrenOverview", - "config": { - "popupColumns": [ - "childId", - "start", - "end", - "schoolClass", - "result", - ], - } } ] } diff --git a/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html b/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html index d8bff1c611..7f2051e428 100644 --- a/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html +++ b/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html @@ -23,6 +23,9 @@ > + + This field is required +
diff --git a/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.spec.ts b/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.spec.ts index bb4134a4b5..172ea9dcaa 100644 --- a/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.spec.ts +++ b/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.spec.ts @@ -7,7 +7,7 @@ import { import { EditSingleEntityComponent } from "./edit-single-entity.component"; import { EntityMapperService } from "../../../../entity/entity-mapper.service"; -import { FormControl } from "@angular/forms"; +import { FormControl, Validators } from "@angular/forms"; import { EntitySchemaService } from "../../../../entity/schema/entity-schema.service"; import { EntityFormService } from "../../../entity-form/entity-form.service"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; @@ -111,4 +111,16 @@ describe("EditSingleEntityComponent", () => { expect(inputSpy).toHaveBeenCalled(); })); + + it("should set the validators for the 'name' form field", async () => { + component.formControl.setValidators(Validators.required); + + await component.onInitFromDynamicConfig({ + formFieldConfig: { id: "childId" }, + propertySchema: ChildSchoolRelation.schema.get("childId"), + formControl: component.formControl, + }); + + expect(component.entityNameFormControl.invalid).toBeTrue(); + }); }); diff --git a/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts b/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts index 51643e0e4e..46e4b44141 100644 --- a/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts +++ b/src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts @@ -58,6 +58,7 @@ export class EditSingleEntityComponent extends EditComponent { .then((entities) => entities.sort((e1, e2) => e1.toString().localeCompare(e2.toString())) ); + this.entityNameFormControl.setValidators(this.formControl.validator); const selectedEntity = this.entities.find( (entity) => entity.getId() === this.formControl.value ); diff --git a/src/locale/messages.de.xlf b/src/locale/messages.de.xlf index 4e3069d5cd..478bd1cbf2 100644 --- a/src/locale/messages.de.xlf +++ b/src/locale/messages.de.xlf @@ -114,13 +114,13 @@ Include events Zeige auch wiederkehrende Aktivitäten - - src/app/child-dev-project/notes/notes-manager/notes-manager.component.html - 12,13 - events are related to a child Slider that allows a user to also include events + + src/app/child-dev-project/notes/notes-manager/notes-manager.component.html + 16 + Participants @@ -167,7 +167,7 @@ Show more-button src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html - 57 + 65 @@ -177,7 +177,7 @@ Not listed src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html - 64 + 75 @@ -188,7 +188,7 @@ Record Attendance button src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html - 82 + 93 @@ -205,12 +205,12 @@ Save & Exit Speichern & Beenden + Button to finish roll call early + Save-Button src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 60,66 + 61 - Button to finish roll call early - Save-Button Back @@ -219,7 +219,7 @@ Back-button src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 71 + 73 @@ -229,7 +229,7 @@ Skip-Button src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 82 + 85 @@ -238,7 +238,7 @@ Finish entering the attendance of a child src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 88 + 94 @@ -247,7 +247,7 @@ Abort entering the attendance of a child src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 91 + 97 @@ -378,29 +378,29 @@ Show Details Button src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 78 + 79 no events on this date Keine Events + Informs the user that there are no events at a particular date + No Events src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 88,94 + 89 - Informs the user that there are no events at a particular date - No Events Add new event Neues Event hinzufügen - - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 98,102 - Allows the user to create a new event for the selected date Add New Event Button + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 100 + Attendance: src/app/core/config/config-fix.ts - 28 + 32 @@ -1594,15 +1594,6 @@ Part of a whole - - Add - hinzufügen - - src/app/child-dev-project/schools/children-overview/children-overview.component.html - 11,12 - - Add New Button - automatically deleted trivial conflict automatisch trivialen Konflikt gelöscht @@ -2060,7 +2051,7 @@ Menu item src/app/core/config/config-fix.ts - 23 + 27 @@ -2069,7 +2060,7 @@ Menu item src/app/core/config/config-fix.ts - 33 + 37 @@ -2078,22 +2069,22 @@ Menu item src/app/core/config/config-fix.ts - 38 + 42 src/app/core/config/config-fix.ts - 658 + 653 Record Attendance Anwesenheiten aufnehmen + Record attendance menu item + Menu item src/app/core/config/config-fix.ts - 43 + 47 - Record attendance menu item - Menu item Manage Attendance @@ -2101,7 +2092,7 @@ Menu item src/app/core/config/config-fix.ts - 48 + 52 @@ -2110,7 +2101,7 @@ Menu item src/app/core/config/config-fix.ts - 58 + 62 @@ -2119,7 +2110,7 @@ Menu item src/app/core/config/config-fix.ts - 63 + 67 @@ -2128,7 +2119,7 @@ Menu item src/app/core/config/config-fix.ts - 68 + 72 @@ -2137,7 +2128,7 @@ Menu item src/app/core/config/config-fix.ts - 73 + 77 @@ -2146,7 +2137,7 @@ Menu item src/app/core/config/config-fix.ts - 78 + 82 @@ -2155,7 +2146,7 @@ Document status src/app/core/config/config-fix.ts - 100 + 104 @@ -2164,7 +2155,7 @@ Document status src/app/core/config/config-fix.ts - 104 + 108 @@ -2173,7 +2164,7 @@ Document status src/app/core/config/config-fix.ts - 108 + 112 @@ -2182,7 +2173,7 @@ Document status src/app/core/config/config-fix.ts - 112 + 116 @@ -2191,7 +2182,7 @@ Document status src/app/core/config/config-fix.ts - 116 + 120 @@ -2200,18 +2191,18 @@ Document status src/app/core/config/config-fix.ts - 120 + 124 Record Attendance Anwesenheiten aufnehmen + record attendance shortcut + Dashboard shortcut widget src/app/core/config/config-fix.ts - 148 + 152 - record attendance shortcut - Dashboard shortcut widget Alipore @@ -2227,7 +2218,7 @@ src/app/core/config/config-fix.ts - 126 + 130 @@ -2240,7 +2231,7 @@ src/app/core/config/config-fix.ts - 130 + 134 @@ -2253,7 +2244,7 @@ src/app/core/config/config-fix.ts - 134 + 138 @@ -2337,7 +2328,7 @@ Attendance week dashboard widget label src/app/core/config/config-fix.ts - 172 + 176 @@ -2346,7 +2337,7 @@ Attendance week dashboard widget label src/app/core/config/config-fix.ts - 179 + 183 @@ -2355,11 +2346,11 @@ Title for notes overview src/app/core/config/config-fix.ts - 197 + 201 src/app/core/config/config-fix.ts - 577 + 572 @@ -2368,11 +2359,11 @@ Translated name of default column group src/app/core/config/config-fix.ts - 207 + 211 src/app/core/config/config-fix.ts - 211 + 215 @@ -2381,29 +2372,29 @@ Translated name of mobile column group src/app/core/config/config-fix.ts - 208 + 212 src/app/core/config/config-fix.ts - 221 + 225 src/app/core/config/config-fix.ts - 424 + 419 src/app/core/config/config-fix.ts - 477 + 472 assets/help/help.en.md assets/help/help.de.md + Filename of markdown help page (make sure the filename you enter as a translation actually exists on the server!) src/app/core/config/config-fix.ts - 287 + 291 - Filename of markdown help page (make sure the filename you enter as a translation actually exists on the server!) Schools List @@ -2411,7 +2402,7 @@ Title of schools overview src/app/core/config/config-fix.ts - 299 + 303 @@ -2420,7 +2411,7 @@ Label for private schools filter - false case src/app/core/config/config-fix.ts - 309 + 313 @@ -2429,11 +2420,11 @@ Panel title src/app/core/config/config-fix.ts - 321 + 325 src/app/core/config/config-fix.ts - 516 + 511 @@ -2442,7 +2433,7 @@ Panel title src/app/core/config/config-fix.ts - 349 + 353 @@ -2451,7 +2442,7 @@ Title children overview src/app/core/config/config-fix.ts - 373 + 368 @@ -2460,7 +2451,7 @@ Column label for school attendance of child src/app/core/config/config-fix.ts - 399 + 394 @@ -2469,7 +2460,7 @@ Column label for coaching attendance of child src/app/core/config/config-fix.ts - 408 + 403 @@ -2478,11 +2469,11 @@ Translated name of default column group src/app/core/config/config-fix.ts - 423 + 418 src/app/core/config/config-fix.ts - 440 + 435 @@ -2491,7 +2482,7 @@ Column group name src/app/core/config/config-fix.ts - 427 + 422 @@ -2500,11 +2491,11 @@ Column group name src/app/core/config/config-fix.ts - 463 + 458 src/app/core/config/config-fix.ts - 586 + 581 @@ -2513,7 +2504,7 @@ Active children filter label - true case src/app/core/config/config-fix.ts - 492 + 487 @@ -2522,7 +2513,7 @@ Active children filter label - false case src/app/core/config/config-fix.ts - 493 + 488 @@ -2531,7 +2522,7 @@ Panel title src/app/core/config/config-fix.ts - 545 + 540 @@ -2540,7 +2531,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 548 + 543 @@ -2549,7 +2540,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 562 + 557 @@ -2558,7 +2549,7 @@ Panel title src/app/core/config/config-fix.ts - 568 + 563 @@ -2567,7 +2558,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 599 + 594 @@ -2576,7 +2567,7 @@ Panel title src/app/core/config/config-fix.ts - 605 + 600 @@ -2585,7 +2576,7 @@ Panel title src/app/core/config/config-fix.ts - 614 + 609 @@ -2602,7 +2593,7 @@ src/app/core/config/config-fix.ts - 636 + 631 @@ -2611,7 +2602,7 @@ Panel title src/app/core/config/config-fix.ts - 677 + 672 @@ -2620,7 +2611,7 @@ Panel title src/app/core/config/config-fix.ts - 706 + 701 @@ -2629,7 +2620,7 @@ Name of a report src/app/core/config/config-fix.ts - 722 + 717 @@ -2638,7 +2629,7 @@ Label of report query src/app/core/config/config-fix.ts - 726 + 721 @@ -2647,7 +2638,7 @@ Label of report query src/app/core/config/config-fix.ts - 729 + 724 @@ -2656,7 +2647,7 @@ Label of report query src/app/core/config/config-fix.ts - 733 + 728 @@ -2665,7 +2656,7 @@ Label for report query src/app/core/config/config-fix.ts - 740 + 735 @@ -2674,7 +2665,7 @@ Label for report query src/app/core/config/config-fix.ts - 743 + 738 @@ -2683,7 +2674,7 @@ Label for report query src/app/core/config/config-fix.ts - 747 + 742 @@ -2692,7 +2683,7 @@ Label for report query src/app/core/config/config-fix.ts - 752 + 747 @@ -2701,7 +2692,7 @@ Label for report query src/app/core/config/config-fix.ts - 755 + 750 @@ -2710,7 +2701,7 @@ Label for report query src/app/core/config/config-fix.ts - 759 + 754 @@ -2719,7 +2710,7 @@ Label for report query src/app/core/config/config-fix.ts - 765 + 760 @@ -2728,7 +2719,7 @@ Label for report query src/app/core/config/config-fix.ts - 770 + 765 @@ -2737,7 +2728,7 @@ Label for report query src/app/core/config/config-fix.ts - 773 + 768 @@ -2746,7 +2737,7 @@ Label for report query src/app/core/config/config-fix.ts - 777 + 772 @@ -2755,17 +2746,17 @@ Name of a report src/app/core/config/config-fix.ts - 787 + 782 Overall Activity Report Anwesenheitsbericht + Name of a report src/app/core/config/config-fix.ts - 804 + 799 - Name of a report Blood Group @@ -2773,7 +2764,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 839 + 834 @@ -2782,7 +2773,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 860 + 855 @@ -2791,7 +2782,7 @@ Label for the language of a school src/app/core/config/config-fix.ts - 887 + 882 @@ -2800,7 +2791,7 @@ Label for the phone number of a school src/app/core/config/config-fix.ts - 901 + 896 @@ -2809,7 +2800,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 927 + 922 @@ -2818,7 +2809,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 928 + 923 @@ -2827,7 +2818,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 936 + 931 @@ -2836,7 +2827,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 937 + 932 @@ -2845,7 +2836,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 945 + 940 @@ -2854,7 +2845,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 946 + 941 @@ -2863,7 +2854,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 954 + 949 @@ -2872,7 +2863,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 955 + 950 @@ -2881,7 +2872,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 963 + 958 @@ -2890,7 +2881,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 964 + 959 @@ -2899,7 +2890,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 972 + 967 @@ -2908,7 +2899,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 973 + 968 @@ -2917,7 +2908,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 981 + 976 @@ -2926,7 +2917,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 982 + 977 @@ -2935,7 +2926,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 990 + 985 @@ -2944,7 +2935,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 991 + 986 @@ -2953,7 +2944,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 999 + 994 @@ -2962,7 +2953,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1000 + 995 @@ -2971,7 +2962,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1008 + 1003 @@ -2980,7 +2971,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1009 + 1004 @@ -3002,7 +2993,7 @@ src/app/core/config/config-fix.ts - 53 + 57 @@ -3094,15 +3085,15 @@ src/app/child-dev-project/schools/model/school.ts - 12 + 18 src/app/core/config/config-fix.ts - 377 + 372 src/app/core/config/config-fix.ts - 873 + 868 @@ -3131,11 +3122,11 @@ src/app/core/config/config-fix.ts - 310 + 314 src/app/core/config/config-fix.ts - 494 + 489 src/app/core/entity-components/entity-list/filter-generator.service.ts @@ -3160,7 +3151,7 @@ src/app/core/config/config-fix.ts - 915 + 910 @@ -3281,7 +3272,7 @@ Label for the mother tongue of a child src/app/core/config/config-fix.ts - 853 + 848 @@ -3299,20 +3290,16 @@ Label for the religion of a child src/app/core/config/config-fix.ts - 846 + 841 Age Alter - The age of a child - - src/app/child-dev-project/schools/children-overview/children-overview.component.ts - 34 - + Column label for age of child src/app/core/config/config-fix.ts - 382 + 377 @@ -3357,11 +3344,11 @@ Label for the address of a child src/app/core/config/config-fix.ts - 832 + 827 src/app/core/config/config-fix.ts - 894 + 889 @@ -3370,11 +3357,11 @@ Label for private schools filter - true case src/app/core/config/config-fix.ts - 308 + 312 src/app/core/config/config-fix.ts - 880 + 875 @@ -3383,7 +3370,7 @@ Label for the timing of a school src/app/core/config/config-fix.ts - 908 + 903 @@ -3456,13 +3443,9 @@ src/app/child-dev-project/children/model/childSchoolRelation.ts 29 - - src/app/child-dev-project/schools/children-overview/children-overview.component.ts - 29 - src/app/core/config/config-fix.ts - 387 + 382 @@ -3474,14 +3457,32 @@ 33 + + The date a child joins a school + Das Datum, an dem das Kind der Schule beigetreten ist + + src/app/child-dev-project/children/model/childSchoolRelation.ts + 34 + + Description of the start date of a relation + To Bis Label for the end date of a relation src/app/child-dev-project/children/model/childSchoolRelation.ts - 38 + 39 + + + + The date of a child leaving the school + Das Datum, an dem das Kind die Schule verlassen hat + + src/app/child-dev-project/children/model/childSchoolRelation.ts + 40 + Description of the end date of a relation Result @@ -3489,7 +3490,7 @@ Label for the percentage result of a relation src/app/child-dev-project/children/model/childSchoolRelation.ts - 44 + 46 @@ -3498,7 +3499,7 @@ Error assertValid failed src/app/child-dev-project/children/model/childSchoolRelation.ts - 64 + 66 @@ -3507,7 +3508,7 @@ Error assertValid failed src/app/child-dev-project/children/model/childSchoolRelation.ts - 68 + 70 @@ -3592,11 +3593,11 @@ src/app/core/config/config-fix.ts - 392 + 387 src/app/core/config/config-fix.ts - 503 + 498 @@ -3671,15 +3672,15 @@ src/app/core/config/config-fix.ts - 692 + 687 src/app/core/config/config-fix.ts - 797 + 792 src/app/core/config/config-fix.ts - 814 + 809 @@ -3756,7 +3757,7 @@ src/app/core/config/config-fix.ts - 453 + 448 @@ -3814,7 +3815,7 @@ src/app/core/config/config-fix.ts - 417 + 412 @@ -3840,11 +3841,11 @@ src/app/core/config/config-fix.ts - 792 + 787 src/app/core/config/config-fix.ts - 809 + 804 @@ -4193,7 +4194,7 @@ Bitte speichern, bevor neue Daten eingegeben werden src/app/core/entity-components/entity-details/entity-details.component.html - 58 + 59 @@ -4203,7 +4204,7 @@ Generic delete button src/app/core/entity-components/entity-details/entity-details.component.html - 82 + 86 @@ -4212,11 +4213,11 @@ Delete confirmation title src/app/core/entity-components/entity-details/entity-details.component.ts - 130 + 132 src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts - 233 + 235 @@ -4225,7 +4226,7 @@ Delete confirmation text src/app/core/entity-components/entity-details/entity-details.component.ts - 131 + 133 @@ -4234,7 +4235,7 @@ Deleted Entity information src/app/core/entity-components/entity-details/entity-details.component.ts - 143 + 145 src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.ts @@ -4301,7 +4302,7 @@ Add New Button src/app/core/entity-components/entity-list/entity-list.component.html - 58 + 56 @@ -4310,7 +4311,7 @@ Download list contents as CSV src/app/core/entity-components/entity-list/entity-list.component.html - 77 + 76 @@ -4319,7 +4320,7 @@ Delete confirmation message src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts - 234 + 236 @@ -4328,7 +4329,7 @@ Record deleted info src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts - 244 + 246 @@ -4367,10 +4368,6 @@ src/app/core/entity-components/entity-utils/dynamic-form-components/edit-entity-array/edit-entity-array.component.ts 19 - - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts - 39 - Only numbers are allowed @@ -4397,6 +4394,10 @@ src/app/core/entity-components/entity-utils/dynamic-form-components/edit-percentage/edit-percentage.component.html 21 + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html + 27 + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-text/edit-text.component.html 10 @@ -4429,6 +4430,16 @@ Tooltip for edit photo component + + Select + auswählen + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts + 49 + + context Select User + Placeholder for input to set an entity + loading... lädt... @@ -5082,7 +5093,7 @@ Calculate the results for a report src/app/features/reporting/reporting/reporting.component.html - 55 + 59 @@ -5091,7 +5102,7 @@ Button that allows to download a report src/app/features/reporting/reporting/reporting.component.html - 70 + 80 diff --git a/src/locale/messages.xlf b/src/locale/messages.xlf index 8ccb119fa3..fe050ce8ad 100644 --- a/src/locale/messages.xlf +++ b/src/locale/messages.xlf @@ -66,7 +66,7 @@ src/app/core/config/config-fix.ts - 915 + 910 Label for the remarks of a ASER result @@ -203,11 +203,11 @@ src/app/core/config/config-fix.ts - 792 + 787 src/app/core/config/config-fix.ts - 809 + 804 Events of an attendance @@ -297,7 +297,7 @@ Show more src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html - 57,62 + 65,70 Show more events to record the attendance Show more-button @@ -306,7 +306,7 @@ My event is not listed ... src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html - 64,69 + 75,80 Allows to create a new event Not listed @@ -315,7 +315,7 @@ Record Attendance src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html - 82,87 + 93,98 Start recording the attendance of a child at an event @@ -335,7 +335,7 @@ Save & Exit src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 60,66 + 61,67 Button to finish roll call early Save-Button @@ -344,7 +344,7 @@ Back src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 71,77 + 73,79 Button to go to the previous child Back-button @@ -353,7 +353,7 @@ Skip src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 82,87 + 85,90 Button to skip a step in the roll call Skip-Button @@ -362,7 +362,7 @@ Finish src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 88,91 + 94,97 Finish entering the attendance of a child @@ -370,7 +370,7 @@ Abort src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 91,95 + 97,101 Abort entering the attendance of a child @@ -486,7 +486,7 @@ Details src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 78,85 + 79,86 Allows the user to see details of an event that took place at a particular day @@ -496,7 +496,7 @@ no events on this date src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 88,94 + 89,95 Informs the user that there are no events at a particular date No Events @@ -505,7 +505,7 @@ Add new event src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 98,102 + 100,104 Allows the user to create a new event for the selected date @@ -689,11 +689,11 @@ src/app/core/config/config-fix.ts - 392 + 387 src/app/core/config/config-fix.ts - 503 + 498 @@ -759,15 +759,15 @@ src/app/core/config/config-fix.ts - 692 + 687 src/app/core/config/config-fix.ts - 797 + 792 src/app/core/config/config-fix.ts - 814 + 809 Label for the participants of a recurring activity @@ -828,11 +828,11 @@ src/app/core/config/config-fix.ts - 310 + 314 src/app/core/config/config-fix.ts - 494 + 489 src/app/core/entity-components/entity-list/filter-generator.service.ts @@ -859,7 +859,7 @@ src/app/core/config/config-fix.ts - 636 + 631 Child status @@ -875,7 +875,7 @@ src/app/core/config/config-fix.ts - 126 + 130 center @@ -887,7 +887,7 @@ src/app/core/config/config-fix.ts - 130 + 134 center @@ -899,7 +899,7 @@ src/app/core/config/config-fix.ts - 134 + 138 center @@ -979,15 +979,15 @@ src/app/child-dev-project/schools/model/school.ts - 12 + 18 src/app/core/config/config-fix.ts - 377 + 372 src/app/core/config/config-fix.ts - 873 + 868 Label for the name of a child @@ -1055,7 +1055,7 @@ src/app/core/config/config-fix.ts - 453 + 448 Label for the status of a child @@ -1105,13 +1105,9 @@ src/app/child-dev-project/children/model/childSchoolRelation.ts 29 - - src/app/child-dev-project/schools/children-overview/children-overview.component.ts - 29,27 - src/app/core/config/config-fix.ts - 387 + 382 Label for the class of a relation @@ -1123,19 +1119,35 @@ Label for the start date of a relation + + The date a child joins a school + + src/app/child-dev-project/children/model/childSchoolRelation.ts + 34 + + Description of the start date of a relation + To src/app/child-dev-project/children/model/childSchoolRelation.ts - 38 + 39 Label for the end date of a relation + + The date of a child leaving the school + + src/app/child-dev-project/children/model/childSchoolRelation.ts + 40 + + Description of the end date of a relation + Result src/app/child-dev-project/children/model/childSchoolRelation.ts - 44 + 46 Label for the percentage result of a relation @@ -1143,7 +1155,7 @@ No "" date is set src/app/child-dev-project/children/model/childSchoolRelation.ts - 64 + 66 Error assertValid failed @@ -1151,7 +1163,7 @@ The "" date is after the "" date src/app/child-dev-project/children/model/childSchoolRelation.ts - 68 + 70 Error assertValid failed @@ -1453,7 +1465,7 @@ src/app/core/config/config-fix.ts - 417 + 412 Table header, Short for Body Mass Index @@ -1885,7 +1897,7 @@ src/app/core/config/config-fix.ts - 28 + 32 Label for the children of a note @@ -1905,7 +1917,7 @@ src/app/core/config/config-fix.ts - 53 + 57 Label for the actual notes of a note @@ -2030,7 +2042,7 @@ src/app/child-dev-project/notes/notes-manager/notes-manager.component.html - 12,13 + 16,17 events are related to a child @@ -2215,26 +2227,6 @@ Part of a whole - - Add - - src/app/child-dev-project/schools/children-overview/children-overview.component.html - 11,12 - - Add New Button - - - Age - - src/app/child-dev-project/schools/children-overview/children-overview.component.ts - 34,32 - - - src/app/core/config/config-fix.ts - 382 - - The age of a child - High School @@ -2739,7 +2731,7 @@ Dashboard src/app/core/config/config-fix.ts - 23 + 27 Menu item @@ -2747,7 +2739,7 @@ Schools src/app/core/config/config-fix.ts - 33 + 37 Menu item @@ -2755,11 +2747,11 @@ Recurring Activities src/app/core/config/config-fix.ts - 38 + 42 src/app/core/config/config-fix.ts - 658 + 653 Menu item @@ -2767,7 +2759,7 @@ Record Attendance src/app/core/config/config-fix.ts - 43 + 47 Record attendance menu item Menu item @@ -2776,7 +2768,7 @@ Manage Attendance src/app/core/config/config-fix.ts - 48 + 52 Menu item @@ -2784,7 +2776,7 @@ Admin src/app/core/config/config-fix.ts - 58 + 62 Menu item @@ -2792,7 +2784,7 @@ Users src/app/core/config/config-fix.ts - 63 + 67 Menu item @@ -2800,7 +2792,7 @@ Reports src/app/core/config/config-fix.ts - 68 + 72 Menu item @@ -2808,7 +2800,7 @@ Database Conflicts src/app/core/config/config-fix.ts - 73 + 77 Menu item @@ -2816,7 +2808,7 @@ Help src/app/core/config/config-fix.ts - 78 + 82 Menu item @@ -2824,7 +2816,7 @@ OK (copy with us) src/app/core/config/config-fix.ts - 100 + 104 Document status @@ -2832,7 +2824,7 @@ OK (copy needed for us) src/app/core/config/config-fix.ts - 104 + 108 Document status @@ -2840,7 +2832,7 @@ needs correction src/app/core/config/config-fix.ts - 108 + 112 Document status @@ -2848,7 +2840,7 @@ applied src/app/core/config/config-fix.ts - 112 + 116 Document status @@ -2856,7 +2848,7 @@ doesn't have src/app/core/config/config-fix.ts - 116 + 120 Document status @@ -2864,7 +2856,7 @@ not eligible src/app/core/config/config-fix.ts - 120 + 124 Document status @@ -2872,7 +2864,7 @@ Record Attendance src/app/core/config/config-fix.ts - 148 + 152 record attendance shortcut Dashboard shortcut widget @@ -2881,7 +2873,7 @@ last week src/app/core/config/config-fix.ts - 172 + 176 Attendance week dashboard widget label @@ -2889,7 +2881,7 @@ this week src/app/core/config/config-fix.ts - 179 + 183 Attendance week dashboard widget label @@ -2897,11 +2889,11 @@ Notes & Reports src/app/core/config/config-fix.ts - 197 + 201 src/app/core/config/config-fix.ts - 577 + 572 Title for notes overview @@ -2909,11 +2901,11 @@ Standard src/app/core/config/config-fix.ts - 207 + 211 src/app/core/config/config-fix.ts - 211 + 215 Translated name of default column group @@ -2921,19 +2913,19 @@ Mobile src/app/core/config/config-fix.ts - 208 + 212 src/app/core/config/config-fix.ts - 221 + 225 src/app/core/config/config-fix.ts - 424 + 419 src/app/core/config/config-fix.ts - 477 + 472 Translated name of mobile column group @@ -2941,7 +2933,7 @@ assets/help/help.en.md src/app/core/config/config-fix.ts - 287 + 291 Filename of markdown help page (make sure the filename you enter as a translation actually exists on the server!) @@ -2949,7 +2941,7 @@ Schools List src/app/core/config/config-fix.ts - 299 + 303 Title of schools overview @@ -2957,11 +2949,11 @@ Private School src/app/core/config/config-fix.ts - 308 + 312 src/app/core/config/config-fix.ts - 880 + 875 Label for private schools filter - true case @@ -2969,7 +2961,7 @@ Government School src/app/core/config/config-fix.ts - 309 + 313 Label for private schools filter - false case @@ -2977,11 +2969,11 @@ Basic Information src/app/core/config/config-fix.ts - 321 + 325 src/app/core/config/config-fix.ts - 516 + 511 Panel title @@ -2989,7 +2981,7 @@ Students src/app/core/config/config-fix.ts - 349 + 353 Panel title @@ -2997,15 +2989,23 @@ Children List src/app/core/config/config-fix.ts - 373 + 368 Title children overview + + Age + + src/app/core/config/config-fix.ts + 377 + + Column label for age of child + Attendance (School) src/app/core/config/config-fix.ts - 399 + 394 Column label for school attendance of child @@ -3013,7 +3013,7 @@ Attendance (Coaching) src/app/core/config/config-fix.ts - 408 + 403 Column label for coaching attendance of child @@ -3021,11 +3021,11 @@ School Info src/app/core/config/config-fix.ts - 423 + 418 src/app/core/config/config-fix.ts - 440 + 435 Translated name of default column group @@ -3033,7 +3033,7 @@ Basic Info src/app/core/config/config-fix.ts - 427 + 422 Column group name @@ -3041,11 +3041,11 @@ Health src/app/core/config/config-fix.ts - 463 + 458 src/app/core/config/config-fix.ts - 586 + 581 Column group name @@ -3053,7 +3053,7 @@ Active Children src/app/core/config/config-fix.ts - 492 + 487 Active children filter label - true case @@ -3061,7 +3061,7 @@ Inactive src/app/core/config/config-fix.ts - 493 + 488 Active children filter label - false case @@ -3069,7 +3069,7 @@ Education src/app/core/config/config-fix.ts - 545 + 540 Panel title @@ -3077,7 +3077,7 @@ School History src/app/core/config/config-fix.ts - 548 + 543 Title inside a panel @@ -3085,7 +3085,7 @@ ASER Results src/app/core/config/config-fix.ts - 562 + 557 Title inside a panel @@ -3093,7 +3093,7 @@ Attendance src/app/core/config/config-fix.ts - 568 + 563 Panel title @@ -3101,7 +3101,7 @@ Height & Weight Tracking src/app/core/config/config-fix.ts - 599 + 594 Title inside a panel @@ -3109,7 +3109,7 @@ Educational Materials src/app/core/config/config-fix.ts - 605 + 600 Panel title @@ -3117,7 +3117,7 @@ Observations src/app/core/config/config-fix.ts - 614 + 609 Panel title @@ -3125,7 +3125,7 @@ Activity src/app/core/config/config-fix.ts - 677 + 672 Panel title @@ -3133,7 +3133,7 @@ Events & Attendance src/app/core/config/config-fix.ts - 706 + 701 Panel title @@ -3141,7 +3141,7 @@ Basic Report src/app/core/config/config-fix.ts - 722 + 717 Name of a report @@ -3149,7 +3149,7 @@ All children src/app/core/config/config-fix.ts - 726 + 721 Label of report query @@ -3157,7 +3157,7 @@ Male children src/app/core/config/config-fix.ts - 729 + 724 Label of report query @@ -3165,7 +3165,7 @@ Female children src/app/core/config/config-fix.ts - 733 + 728 Label of report query @@ -3173,7 +3173,7 @@ All schools src/app/core/config/config-fix.ts - 740 + 735 Label for report query @@ -3181,7 +3181,7 @@ Children attending a school src/app/core/config/config-fix.ts - 743 + 738 Label for report query @@ -3189,7 +3189,7 @@ Governmental schools src/app/core/config/config-fix.ts - 747 + 742 Label for report query @@ -3197,7 +3197,7 @@ Children attending a governmental school src/app/core/config/config-fix.ts - 752 + 747 Label for report query @@ -3205,7 +3205,7 @@ Male children attending a governmental school src/app/core/config/config-fix.ts - 755 + 750 Label for report query @@ -3213,7 +3213,7 @@ Female children attending a governmental school src/app/core/config/config-fix.ts - 759 + 754 Label for report query @@ -3221,7 +3221,7 @@ Private schools src/app/core/config/config-fix.ts - 765 + 760 Label for report query @@ -3229,7 +3229,7 @@ Children attending a private school src/app/core/config/config-fix.ts - 770 + 765 Label for report query @@ -3237,7 +3237,7 @@ Male children attending a private school src/app/core/config/config-fix.ts - 773 + 768 Label for report query @@ -3245,7 +3245,7 @@ Female children attending a private school src/app/core/config/config-fix.ts - 777 + 772 Label for report query @@ -3253,7 +3253,7 @@ Event Report src/app/core/config/config-fix.ts - 787 + 782 Name of a report @@ -3261,7 +3261,7 @@ Overall Activity Report src/app/core/config/config-fix.ts - 804 + 799 Name of a report @@ -3269,11 +3269,11 @@ Address src/app/core/config/config-fix.ts - 832 + 827 src/app/core/config/config-fix.ts - 894 + 889 Label for the address of a child @@ -3281,7 +3281,7 @@ Blood Group src/app/core/config/config-fix.ts - 839 + 834 Label for a child attribute @@ -3289,7 +3289,7 @@ Religion src/app/core/config/config-fix.ts - 846 + 841 Label for the religion of a child @@ -3297,7 +3297,7 @@ Mother Tongue src/app/core/config/config-fix.ts - 853 + 848 Label for the mother tongue of a child @@ -3305,7 +3305,7 @@ Last Dental Check-Up src/app/core/config/config-fix.ts - 860 + 855 Label for a child attribute @@ -3313,7 +3313,7 @@ Language src/app/core/config/config-fix.ts - 887 + 882 Label for the language of a school @@ -3321,7 +3321,7 @@ Phone Number src/app/core/config/config-fix.ts - 901 + 896 Label for the phone number of a school @@ -3329,7 +3329,7 @@ School Timing src/app/core/config/config-fix.ts - 908 + 903 Label for the timing of a school @@ -3337,7 +3337,7 @@ Motivated src/app/core/config/config-fix.ts - 927 + 922 Label for a child attribute @@ -3345,7 +3345,7 @@ The child is motivated during the class. src/app/core/config/config-fix.ts - 928 + 923 Description for a child attribute @@ -3353,7 +3353,7 @@ Participates src/app/core/config/config-fix.ts - 936 + 931 Label for a child attribute @@ -3361,7 +3361,7 @@ The child is actively participating in the class. src/app/core/config/config-fix.ts - 937 + 932 Description for a child attribute @@ -3369,7 +3369,7 @@ Interacts src/app/core/config/config-fix.ts - 945 + 940 Label for a child attribute @@ -3377,7 +3377,7 @@ The child interacts with other students during the class. src/app/core/config/config-fix.ts - 946 + 941 Description for a child attribute @@ -3385,7 +3385,7 @@ Homework src/app/core/config/config-fix.ts - 954 + 949 Label for a child attribute @@ -3393,7 +3393,7 @@ The child does its homework. src/app/core/config/config-fix.ts - 955 + 950 Description for a child attribute @@ -3401,7 +3401,7 @@ On time src/app/core/config/config-fix.ts - 963 + 958 Label for a child attribute @@ -3409,7 +3409,7 @@ The child is always on time for the class. src/app/core/config/config-fix.ts - 964 + 959 Description for a child attribute @@ -3417,7 +3417,7 @@ Asks src/app/core/config/config-fix.ts - 972 + 967 Label for a child attribute @@ -3425,7 +3425,7 @@ The child is asking questions during the class. src/app/core/config/config-fix.ts - 973 + 968 Description for a child attribute @@ -3433,7 +3433,7 @@ Listens src/app/core/config/config-fix.ts - 981 + 976 Label for a child attribute @@ -3441,7 +3441,7 @@ The child is listening during the class. src/app/core/config/config-fix.ts - 982 + 977 Description for a child attribute @@ -3449,7 +3449,7 @@ Solves on board src/app/core/config/config-fix.ts - 990 + 985 Label for a child attribute @@ -3457,7 +3457,7 @@ The child can solve exercises on the board. src/app/core/config/config-fix.ts - 991 + 986 Description for a child attribute @@ -3465,7 +3465,7 @@ Concentrated src/app/core/config/config-fix.ts - 999 + 994 Label for a child attribute @@ -3473,7 +3473,7 @@ The child is concentrated during the class. src/app/core/config/config-fix.ts - 1000 + 995 Description for a child attribute @@ -3481,7 +3481,7 @@ Not disturbing src/app/core/config/config-fix.ts - 1008 + 1003 Label for a child attribute @@ -3489,7 +3489,7 @@ The child does not disturb the class. src/app/core/config/config-fix.ts - 1009 + 1004 Description for a child attribute @@ -3738,7 +3738,7 @@ Please save before entering further data src/app/core/entity-components/entity-details/entity-details.component.html - 58 + 59 @@ -3746,7 +3746,7 @@ src/app/core/entity-components/entity-details/entity-details.component.html - 82,83 + 86,87 Generic delete button @@ -3754,11 +3754,11 @@ Delete? src/app/core/entity-components/entity-details/entity-details.component.ts - 130 + 132 src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts - 233,232 + 235,234 Delete confirmation title @@ -3766,7 +3766,7 @@ Are you sure you want to delete this ? src/app/core/entity-components/entity-details/entity-details.component.ts - 131 + 133 Delete confirmation text @@ -3774,7 +3774,7 @@ Deleted Entity src/app/core/entity-components/entity-details/entity-details.component.ts - 143 + 145 src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.ts @@ -3835,7 +3835,7 @@ Add New src/app/core/entity-components/entity-list/entity-list.component.html - 58,61 + 56,60 Add New Button @@ -3843,7 +3843,7 @@ Download CSV src/app/core/entity-components/entity-list/entity-list.component.html - 77,84 + 76,83 Download list contents as CSV @@ -3851,7 +3851,7 @@ Are you sure you want to delete this record? src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts - 234,232 + 236,234 Delete confirmation message @@ -3859,7 +3859,7 @@ Record deleted src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts - 244,243 + 246,245 Record deleted info @@ -3893,10 +3893,6 @@ src/app/core/entity-components/entity-utils/dynamic-form-components/edit-entity-array/edit-entity-array.component.ts 19 - - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts - 39 - context Add User(s) Placeholder for input to add entities @@ -3922,6 +3918,10 @@ src/app/core/entity-components/entity-utils/dynamic-form-components/edit-percentage/edit-percentage.component.html 21,22 + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html + 27,31 + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-text/edit-text.component.html 10,11 @@ -3952,6 +3952,15 @@ Tooltip for edit photo component + + Select + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts + 49 + + context Select User + Placeholder for input to set an entity + loading... @@ -4547,7 +4556,7 @@ Calculate src/app/features/reporting/reporting/reporting.component.html - 55,59 + 59,64 Calculate the results for a report @@ -4555,7 +4564,7 @@ Download report src/app/features/reporting/reporting/reporting.component.html - 70,75 + 80,85 Button that allows to download a report