From db2402a4d970b3f8739360ba5c6889c1a738786c Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Sat, 28 May 2022 18:00:28 +0200 Subject: [PATCH 01/19] Implement important notes dashboard widget --- .../important-notes.component.html | 58 +++++++++++++++++++ .../important-notes.component.scss | 5 ++ .../important-notes.component.spec.ts | 24 ++++++++ .../important-notes.component.ts | 55 ++++++++++++++++++ .../child-dev-project/notes/notes.module.ts | 2 + src/app/core/config/config-fix.ts | 6 ++ .../dashboard-widget.component.ts | 3 +- 7 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html create mode 100644 src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss create mode 100644 src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts create mode 100644 src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html new file mode 100644 index 0000000000..416d4e823d --- /dev/null +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -0,0 +1,58 @@ + + +
+ + + + + + + + + + + + + + + +
+ {{note.date | date}} + + {{note.subject}} +
+
+
+ + no notes that need immediate attention + +
+ + + + diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss new file mode 100644 index 0000000000..acd348e52a --- /dev/null +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss @@ -0,0 +1,5 @@ +@use "../../../../core/dashboard/dashboard-widget-base"; + +.subject-cell { + text-align: right; +} diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts new file mode 100644 index 0000000000..4161298c8e --- /dev/null +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { ImportantNotesComponent } from "./important-notes.component"; + +describe("ImportantNotesComponent", () => { + let component: ImportantNotesComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ImportantNotesComponent], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ImportantNotesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts new file mode 100644 index 0000000000..f360c8e4e0 --- /dev/null +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -0,0 +1,55 @@ +import { AfterViewInit, Component, OnInit, ViewChild } from "@angular/core"; +import { Note } from "../../model/note"; +import { EntityMapperService } from "../../../../core/entity/entity-mapper.service"; +import { DynamicComponent } from "../../../../core/view/dynamic-components/dynamic-component.decorator"; +import { OnInitDynamicComponent } from "../../../../core/view/dynamic-components/on-init-dynamic-component.interface"; +import { MatTableDataSource } from "@angular/material/table"; +import { MatPaginator } from "@angular/material/paginator"; +import { FormDialogService } from "../../../../core/form-dialog/form-dialog.service"; +import { NoteDetailsComponent } from "../../note-details/note-details.component"; + +@DynamicComponent("ImportantNotesComponent") +@Component({ + selector: "app-important-notes", + templateUrl: "./important-notes.component.html", + styleUrls: ["./important-notes.component.scss"], +}) +export class ImportantNotesComponent + implements OnInit, OnInitDynamicComponent, AfterViewInit { + private relevantWarningLevels; + public relevantNotes: Promise; + public relevantNotesCount: Promise; + + public notesDataSource = new MatTableDataSource(); + + @ViewChild("paginator") private paginator: MatPaginator; + + constructor( + private entityMapperService: EntityMapperService, + private formDialog: FormDialogService + ) {} + + ngOnInit(): void { + this.relevantNotes = this.entityMapperService + .loadType(Note) + .then((notes) => notes.filter((note) => this.noteIsRelevant(note))) + .then((notes) => (this.notesDataSource.data = notes)); + this.relevantNotesCount = this.relevantNotes.then((notes) => notes.length); + } + + onInitFromDynamicConfig(config: any) { + this.relevantWarningLevels = config.warningLevels; + } + + ngAfterViewInit() { + this.notesDataSource.paginator = this.paginator; + } + + private noteIsRelevant(note: Note): boolean { + return this.relevantWarningLevels.includes(note.warningLevel.id); + } + + goToNote(note: Note) { + this.formDialog.openDialog(NoteDetailsComponent, note); + } +} diff --git a/src/app/child-dev-project/notes/notes.module.ts b/src/app/child-dev-project/notes/notes.module.ts index 94eb56d568..56a70e6ffe 100644 --- a/src/app/child-dev-project/notes/notes.module.ts +++ b/src/app/child-dev-project/notes/notes.module.ts @@ -47,6 +47,7 @@ import { NotesDashboardComponent } from "./dashboard-widgets/notes-dashboard/not import { NotesOfChildComponent } from "./notes-of-child/notes-of-child.component"; import { DashboardModule } from "../../core/dashboard/dashboard.module"; import { ExportModule } from "../../core/export/export.module"; +import { ImportantNotesComponent } from "./dashboard-widgets/important-notes/important-notes.component"; @NgModule({ declarations: [ @@ -56,6 +57,7 @@ import { ExportModule } from "../../core/export/export.module"; NoteAttendanceCountBlockComponent, NotesDashboardComponent, NotesOfChildComponent, + ImportantNotesComponent, ], imports: [ CommonModule, diff --git a/src/app/core/config/config-fix.ts b/src/app/core/config/config-fix.ts index ac9ae6071f..c8829867e0 100644 --- a/src/app/core/config/config-fix.ts +++ b/src/app/core/config/config-fix.ts @@ -161,6 +161,12 @@ export const defaultJsonConfig = { { "component": "ChildrenCountDashboard" }, + { + "component": "ImportantNotesComponent", + "config": { + "warningLevels": ["WARNING", "URGENT"], + } + }, { "component": "NotesDashboard", "config": { diff --git a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts index d314f48767..d2eff2a437 100644 --- a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts +++ b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts @@ -1,4 +1,5 @@ import { Component, Input } from "@angular/core"; +import { IconName } from "@fortawesome/fontawesome-svg-core"; export type DashboardTheme = | "general" @@ -15,7 +16,7 @@ export type DashboardTheme = }) export class DashboardWidgetComponent { @Input() subtitle: string; - @Input() icon: string; + @Input() icon: IconName; @Input() theme: DashboardTheme; _title: Promise; From e42c6855d7bcbf5bde992e47aaee687b420d822d Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Sat, 28 May 2022 18:14:40 +0200 Subject: [PATCH 02/19] add types and default value --- .../important-notes/important-notes.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts index f360c8e4e0..ebf991acfe 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -16,7 +16,7 @@ import { NoteDetailsComponent } from "../../note-details/note-details.component" }) export class ImportantNotesComponent implements OnInit, OnInitDynamicComponent, AfterViewInit { - private relevantWarningLevels; + private relevantWarningLevels: string[] = []; public relevantNotes: Promise; public relevantNotesCount: Promise; From d7ac41405141917e020fc04136fdb2b3d9c52c7b Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Sat, 28 May 2022 22:18:44 +0200 Subject: [PATCH 03/19] make the widget observable --- .../important-notes.component.html | 8 ++--- .../important-notes.component.ts | 33 +++++++++++++++---- .../dashboard-widget.component.ts | 10 ++++-- src/app/utils/utils.ts | 9 +++++ 4 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index 416d4e823d..289cfe00c7 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -1,12 +1,12 @@ -
+
diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts index ebf991acfe..60dc837466 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -7,8 +7,13 @@ import { MatTableDataSource } from "@angular/material/table"; import { MatPaginator } from "@angular/material/paginator"; import { FormDialogService } from "../../../../core/form-dialog/form-dialog.service"; import { NoteDetailsComponent } from "../../note-details/note-details.component"; +import { applyUpdate } from "../../../../core/entity/model/entity-update"; +import { concat, Observable } from "rxjs"; +import { first, map } from "rxjs/operators"; +import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; @DynamicComponent("ImportantNotesComponent") +@UntilDestroy() @Component({ selector: "app-important-notes", templateUrl: "./important-notes.component.html", @@ -17,8 +22,11 @@ import { NoteDetailsComponent } from "../../note-details/note-details.component" export class ImportantNotesComponent implements OnInit, OnInitDynamicComponent, AfterViewInit { private relevantWarningLevels: string[] = []; - public relevantNotes: Promise; - public relevantNotesCount: Promise; + public relevantNotes: Note[] = []; + public relevantNotesLength?: number; + + private notes: Observable; + public loading: boolean = true; public notesDataSource = new MatTableDataSource(); @@ -30,11 +38,22 @@ export class ImportantNotesComponent ) {} ngOnInit(): void { - this.relevantNotes = this.entityMapperService - .loadType(Note) - .then((notes) => notes.filter((note) => this.noteIsRelevant(note))) - .then((notes) => (this.notesDataSource.data = notes)); - this.relevantNotesCount = this.relevantNotes.then((notes) => notes.length); + // This feed always contains the latest notes plus + // the initial notes + this.notes = concat( + this.entityMapperService.loadType(Note), + this.entityMapperService + .receiveUpdates(Note) + .pipe(map((next) => applyUpdate(this.relevantNotes, next))) + ); + // set loading to `false` when the first chunk of notes (the initial notes) have arrived + this.notes.pipe(first()).subscribe(() => (this.loading = false)); + this.notes.pipe(untilDestroyed(this)).subscribe((next) => { + this.relevantNotes = next.filter((note) => this.noteIsRelevant(note)); + // this cannot simply be computed since it has to be undefined initially to display the spinner when loading + this.relevantNotesLength = this.relevantNotes.length; + this.notesDataSource.data = this.relevantNotes; + }); } onInitFromDynamicConfig(config: any) { diff --git a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts index d2eff2a437..50521eef72 100644 --- a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts +++ b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts @@ -1,5 +1,6 @@ import { Component, Input } from "@angular/core"; import { IconName } from "@fortawesome/fontawesome-svg-core"; +import { isPromise } from "../../../utils/utils"; export type DashboardTheme = | "general" @@ -19,13 +20,15 @@ export class DashboardWidgetComponent { @Input() icon: IconName; @Input() theme: DashboardTheme; - _title: Promise; + _title: string | number; titleReady: boolean; /** optional tooltip to explain detailed meaning of this widget / statistic */ @Input() explanation: string; - @Input() set title(title: PromiseLike | any) { - if (title && typeof title["then"] === "function") { + @Input() set title( + title: PromiseLike | string | number | undefined + ) { + if (isPromise(title)) { this.titleReady = true; title.then((value) => { this._title = value; @@ -33,6 +36,7 @@ export class DashboardWidgetComponent { }); } else { this._title = title; + this.titleReady = title === undefined; } } @Input() headline: string; diff --git a/src/app/utils/utils.ts b/src/app/utils/utils.ts index 999ce3fcca..7595c6f800 100644 --- a/src/app/utils/utils.ts +++ b/src/app/utils/utils.ts @@ -97,3 +97,12 @@ export function compareEnums( ): boolean { return a?.id === b?.id; } + +/** + * returns `true` when `thing` is (probably) a `PromiseLike`, i.e. can + * be awaited and has a `.then()` function, `false` otherwise + * @param thing The thing under test + */ +export function isPromise(thing: any): thing is PromiseLike { + return thing && typeof thing["then"] === "function"; +} From aeef498395aa57810b97b4e8fb4ed01ae82a4b36 Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Sat, 28 May 2022 23:04:26 +0200 Subject: [PATCH 04/19] Add test --- .../important-notes.component.spec.ts | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts index 4161298c8e..e942289063 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts @@ -1,24 +1,62 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { ImportantNotesComponent } from "./important-notes.component"; +import { MockedTestingModule } from "../../../../utils/mocked-testing.module"; +import { LoginState } from "../../../../core/session/session-states/login-state.enum"; +import { Note } from "../../model/note"; +import { FormDialogService } from "../../../../core/form-dialog/form-dialog.service"; +import { MatPaginatorModule } from "@angular/material/paginator"; describe("ImportantNotesComponent", () => { let component: ImportantNotesComponent; let fixture: ComponentFixture; + function createNote(wLevel: string) { + const note = Note.create(new Date()); + note.warningLevel = { + id: wLevel, + label: "", + }; + return note; + } + + const mockNotes = ["WARNING", "WARNING", "URGENT", "OK", ""].map(createNote); + beforeEach(async () => { await TestBed.configureTestingModule({ + imports: [ + MockedTestingModule.withState(LoginState.LOGGED_IN, mockNotes), + MatPaginatorModule, + ], declarations: [ImportantNotesComponent], + providers: [ + { + provide: FormDialogService, + useValue: { + openDialog: () => {}, + }, + }, + ], }).compileComponents(); }); beforeEach(() => { fixture = TestBed.createComponent(ImportantNotesComponent); component = fixture.componentInstance; + component.onInitFromDynamicConfig({ + warningLevels: ["WARNING", "URGENT"], + }); fixture.detectChanges(); }); it("should create", () => { expect(component).toBeTruthy(); }); + + it("shows notes that have a high warning level", () => { + const expectedNotes = mockNotes.filter( + (note) => note.warningLevel.id in ["WARNING", "URGENT"] + ); + expect(component.relevantNotes).toEqual(expectedNotes); + }); }); From aea927f3fe9f0351bdfab7d95f5db79c1b0c2211 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 16 Jun 2022 12:00:52 +0200 Subject: [PATCH 05/19] cleaned up code --- .../important-notes/important-notes.component.html | 14 +++++++------- .../important-notes/important-notes.component.ts | 10 +++------- src/app/child-dev-project/notes/notes.module.ts | 1 + .../dashboard-widget.component.html | 4 ++-- .../dashboard-widget/dashboard-widget.component.ts | 8 ++++---- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index 289cfe00c7..2a881eb692 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -1,12 +1,12 @@ -
+
@@ -27,7 +27,7 @@ matColumnDef="title" > @@ -35,15 +35,15 @@ mat-row *matRowDef="let row; columns: ['date', 'title'];" class="dashboard-table-row" - (click)="goToNote(row)" + (click)="openNote(row)" >
- {{note.date | date}} + {{ note.date | date }} - {{note.subject}} + {{ note.subject }}
- + no notes that need immediate attention
diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts index 60dc837466..824f784cc2 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -22,8 +22,7 @@ import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; export class ImportantNotesComponent implements OnInit, OnInitDynamicComponent, AfterViewInit { private relevantWarningLevels: string[] = []; - public relevantNotes: Note[] = []; - public relevantNotesLength?: number; + public relevantNotes: Note[]; private notes: Observable; public loading: boolean = true; @@ -38,8 +37,7 @@ export class ImportantNotesComponent ) {} ngOnInit(): void { - // This feed always contains the latest notes plus - // the initial notes + // This feed always contains the latest notes plus the initial notes this.notes = concat( this.entityMapperService.loadType(Note), this.entityMapperService @@ -50,8 +48,6 @@ export class ImportantNotesComponent this.notes.pipe(first()).subscribe(() => (this.loading = false)); this.notes.pipe(untilDestroyed(this)).subscribe((next) => { this.relevantNotes = next.filter((note) => this.noteIsRelevant(note)); - // this cannot simply be computed since it has to be undefined initially to display the spinner when loading - this.relevantNotesLength = this.relevantNotes.length; this.notesDataSource.data = this.relevantNotes; }); } @@ -68,7 +64,7 @@ export class ImportantNotesComponent return this.relevantWarningLevels.includes(note.warningLevel.id); } - goToNote(note: Note) { + openNote(note: Note) { this.formDialog.openDialog(NoteDetailsComponent, note); } } diff --git a/src/app/child-dev-project/notes/notes.module.ts b/src/app/child-dev-project/notes/notes.module.ts index 56a70e6ffe..88ba7e021a 100644 --- a/src/app/child-dev-project/notes/notes.module.ts +++ b/src/app/child-dev-project/notes/notes.module.ts @@ -116,5 +116,6 @@ export class NotesModule { NoteAttendanceCountBlockComponent, NotesDashboardComponent, NotesOfChildComponent, + ImportantNotesComponent, ]; } diff --git a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.html b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.html index c1ba21372b..b401c45b86 100644 --- a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.html +++ b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.html @@ -3,8 +3,8 @@
{{headline}}
- {{_title}} - + {{_title}} +
{{subtitle}}
diff --git a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts index 50521eef72..b20dedfd0b 100644 --- a/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts +++ b/src/app/core/dashboard/dashboard-widget/dashboard-widget.component.ts @@ -21,22 +21,22 @@ export class DashboardWidgetComponent { @Input() theme: DashboardTheme; _title: string | number; - titleReady: boolean; + titleReady = true; /** optional tooltip to explain detailed meaning of this widget / statistic */ @Input() explanation: string; @Input() set title( title: PromiseLike | string | number | undefined ) { + this.titleReady = false; if (isPromise(title)) { - this.titleReady = true; title.then((value) => { this._title = value; - this.titleReady = false; + this.titleReady = true; }); } else { this._title = title; - this.titleReady = title === undefined; + this.titleReady = title !== undefined && title !== null; } } @Input() headline: string; From 8dfa1f13cb3b6b4cfee3f6eb976f4e7b971ab0c7 Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Wed, 17 Aug 2022 15:50:47 +0200 Subject: [PATCH 06/19] Merge Master; color background; sort --- .../important-notes/important-notes.component.html | 5 +++-- .../important-notes/important-notes.component.scss | 13 +++++++++++++ .../important-notes/important-notes.component.ts | 7 +++++-- src/app/child-dev-project/notes/model/note.ts | 4 ++-- src/app/child-dev-project/warning-levels.ts | 8 ++++---- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index 2a881eb692..23faecc30a 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -6,7 +6,7 @@ [loading]="loading" > -
+
diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss index acd348e52a..c987222815 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss @@ -1,5 +1,18 @@ @use "../../../../core/dashboard/dashboard-widget-base"; +@use "src/styles" as *; .subject-cell { text-align: right; } + +.row-view { + cursor: pointer; + + & > td:first-child { + padding-left: $standard-margin-small; + } + + & > td:last-child { + padding-right: $standard-margin-small; + } +} diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts index 824f784cc2..56b4c76135 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -20,7 +20,8 @@ import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; styleUrls: ["./important-notes.component.scss"], }) export class ImportantNotesComponent - implements OnInit, OnInitDynamicComponent, AfterViewInit { + implements OnInit, OnInitDynamicComponent, AfterViewInit +{ private relevantWarningLevels: string[] = []; public relevantNotes: Note[]; @@ -48,7 +49,9 @@ export class ImportantNotesComponent this.notes.pipe(first()).subscribe(() => (this.loading = false)); this.notes.pipe(untilDestroyed(this)).subscribe((next) => { this.relevantNotes = next.filter((note) => this.noteIsRelevant(note)); - this.notesDataSource.data = this.relevantNotes; + this.notesDataSource.data = this.relevantNotes.sort( + (a, b) => b.warningLevel._ordinal - a.warningLevel._ordinal + ); }); } diff --git a/src/app/child-dev-project/notes/model/note.ts b/src/app/child-dev-project/notes/model/note.ts index 1b129c503a..2f4a63db9b 100644 --- a/src/app/child-dev-project/notes/model/note.ts +++ b/src/app/child-dev-project/notes/model/note.ts @@ -29,12 +29,12 @@ import { } from "../../attendance/model/attendance-status"; import { User } from "../../../core/user/user"; import { Child } from "../../children/model/child"; -import { ConfigurableEnumValue } from "../../../core/configurable-enum/configurable-enum.interface"; import { getWarningLevelColor, WarningLevel, } from "../../../core/entity/model/warning-level"; import { School } from "../../schools/model/school"; +import { Ordering } from "../../../core/configurable-enum/configurable-enum-ordering"; @DatabaseEntity("Note") export class Note extends Entity { @@ -113,7 +113,7 @@ export class Note extends Entity { dataType: "configurable-enum", innerDataType: "warning-levels", }) - warningLevel: ConfigurableEnumValue; + warningLevel: Ordering.EnumValue; getWarningLevel(): WarningLevel { if (this.warningLevel) { diff --git a/src/app/child-dev-project/warning-levels.ts b/src/app/child-dev-project/warning-levels.ts index 6adc0350c0..7d7e4d15c4 100644 --- a/src/app/child-dev-project/warning-levels.ts +++ b/src/app/child-dev-project/warning-levels.ts @@ -1,8 +1,7 @@ -import { ConfigurableEnumValue } from "../core/configurable-enum/configurable-enum.interface"; import { Ordering } from "../core/configurable-enum/configurable-enum-ordering"; -export const warningLevels: ConfigurableEnumValue[] = - Ordering.imposeTotalOrdering([ +export const warningLevels: Ordering.EnumValue[] = Ordering.imposeTotalOrdering( + [ { id: "", label: "", @@ -19,4 +18,5 @@ export const warningLevels: ConfigurableEnumValue[] = id: "URGENT", label: $localize`:Label warning level:Urgent Follow-Up`, }, - ]); + ] +); From 20fd73e107efe0c1edd2e25e2bcf3eb34963b32c Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Wed, 17 Aug 2022 16:00:15 +0200 Subject: [PATCH 07/19] SonarCloud --- .../important-notes/important-notes.component.spec.ts | 5 +++-- .../important-notes/important-notes.component.ts | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts index e942289063..923edfda05 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts @@ -16,6 +16,7 @@ describe("ImportantNotesComponent", () => { note.warningLevel = { id: wLevel, label: "", + _ordinal: 0, }; return note; } @@ -54,8 +55,8 @@ describe("ImportantNotesComponent", () => { }); it("shows notes that have a high warning level", () => { - const expectedNotes = mockNotes.filter( - (note) => note.warningLevel.id in ["WARNING", "URGENT"] + const expectedNotes = mockNotes.filter((note) => + ["WARNING", "URGENT"].includes(note.warningLevel.id) ); expect(component.relevantNotes).toEqual(expectedNotes); }); diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts index 56b4c76135..3d5ccb6543 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -49,9 +49,10 @@ export class ImportantNotesComponent this.notes.pipe(first()).subscribe(() => (this.loading = false)); this.notes.pipe(untilDestroyed(this)).subscribe((next) => { this.relevantNotes = next.filter((note) => this.noteIsRelevant(note)); - this.notesDataSource.data = this.relevantNotes.sort( + this.relevantNotes.sort( (a, b) => b.warningLevel._ordinal - a.warningLevel._ordinal ); + this.notesDataSource.data = this.relevantNotes; }); } From ed8f9438ffeecc4f88a25410893f9e2a8c28600c Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Thu, 18 Aug 2022 19:28:29 +0200 Subject: [PATCH 08/19] Implement receiveUpdates for the mock entity mapper --- .../important-notes.component.spec.ts | 26 ++++++++++--------- .../core/entity/mock-entity-mapper-service.ts | 26 ++++++++++++++++--- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts index 923edfda05..da2536c64e 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts @@ -1,4 +1,9 @@ -import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { + ComponentFixture, + fakeAsync, + TestBed, + tick, +} from "@angular/core/testing"; import { ImportantNotesComponent } from "./important-notes.component"; import { MockedTestingModule } from "../../../../utils/mocked-testing.module"; @@ -6,22 +11,17 @@ import { LoginState } from "../../../../core/session/session-states/login-state. import { Note } from "../../model/note"; import { FormDialogService } from "../../../../core/form-dialog/form-dialog.service"; import { MatPaginatorModule } from "@angular/material/paginator"; +import { warningLevels } from "../../../warning-levels"; describe("ImportantNotesComponent", () => { let component: ImportantNotesComponent; let fixture: ComponentFixture; - function createNote(wLevel: string) { + const mockNotes = warningLevels.map((wLevel) => { const note = Note.create(new Date()); - note.warningLevel = { - id: wLevel, - label: "", - _ordinal: 0, - }; + note.warningLevel = wLevel; return note; - } - - const mockNotes = ["WARNING", "WARNING", "URGENT", "OK", ""].map(createNote); + }); beforeEach(async () => { await TestBed.configureTestingModule({ @@ -54,10 +54,12 @@ describe("ImportantNotesComponent", () => { expect(component).toBeTruthy(); }); - it("shows notes that have a high warning level", () => { + it("shows notes that have a high warning level", fakeAsync(() => { const expectedNotes = mockNotes.filter((note) => ["WARNING", "URGENT"].includes(note.warningLevel.id) ); + tick(); + console.log(component.relevantNotes); expect(component.relevantNotes).toEqual(expectedNotes); - }); + })); }); diff --git a/src/app/core/entity/mock-entity-mapper-service.ts b/src/app/core/entity/mock-entity-mapper-service.ts index 3ffc534fad..ca765108e5 100644 --- a/src/app/core/entity/mock-entity-mapper-service.ts +++ b/src/app/core/entity/mock-entity-mapper-service.ts @@ -1,7 +1,7 @@ import { Entity, EntityConstructor } from "./model/entity"; import { EntityMapperService } from "./entity-mapper.service"; import { UpdatedEntity } from "./model/entity-update"; -import { NEVER, Observable } from "rxjs"; +import { Observable, Subject } from "rxjs"; import { entityRegistry } from "./database-entity.decorator"; import { HttpErrorResponse } from "@angular/common/http"; @@ -19,10 +19,18 @@ export function mockEntityMapper( */ export class MockEntityMapperService extends EntityMapperService { private data: Map> = new Map(); + private observables: Map>> = new Map(); constructor() { super(null, null, entityRegistry); } + private publishUpdates(type: string, update: UpdatedEntity) { + const subj = this.observables.get(type); + if (subj !== undefined) { + subj.next(update); + } + } + /** * like {@link save}, but synchronous * @param entity The entity to add @@ -33,10 +41,16 @@ export class MockEntityMapperService extends EntityMapperService { this.data.set(type, new Map()); } this.data.get(type).set(entity.getId(), entity); + this.publishUpdates( + entity.getType(), + this.contains(entity) + ? { type: "update", entity } + : { type: "new", entity } + ); } /** - * returns whether or not the given entity is known + * returns whether the given entity is known * @param entity */ public contains(entity: Entity): boolean { @@ -84,6 +98,7 @@ export class MockEntityMapperService extends EntityMapperService { const entities = this.data.get(entity.getType()); if (entities) { entities.delete(entity.getId()); + this.publishUpdates(entity.getType(), { type: "remove", entity }); } } @@ -128,6 +143,11 @@ export class MockEntityMapperService extends EntityMapperService { receiveUpdates( entityType: EntityConstructor | string ): Observable> { - return NEVER; + let name = + typeof entityType === "string" ? entityType : new entityType().getType(); + if (!this.observables.has(name)) { + this.observables.set(name, new Subject()); + } + return this.observables.get(name); } } From 19faf280df9f060024b84d4fcfeaf47dc634e246 Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Thu, 18 Aug 2022 20:44:20 +0200 Subject: [PATCH 09/19] fix test --- .../important-notes.component.spec.ts | 18 ++++++------------ .../important-notes.component.ts | 1 + 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts index da2536c64e..e43c9adbcb 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.spec.ts @@ -1,9 +1,4 @@ -import { - ComponentFixture, - fakeAsync, - TestBed, - tick, -} from "@angular/core/testing"; +import { ComponentFixture, fakeAsync, TestBed } from "@angular/core/testing"; import { ImportantNotesComponent } from "./important-notes.component"; import { MockedTestingModule } from "../../../../utils/mocked-testing.module"; @@ -41,13 +36,14 @@ describe("ImportantNotesComponent", () => { }).compileComponents(); }); - beforeEach(() => { + beforeEach(async () => { fixture = TestBed.createComponent(ImportantNotesComponent); component = fixture.componentInstance; component.onInitFromDynamicConfig({ warningLevels: ["WARNING", "URGENT"], }); fixture.detectChanges(); + await fixture.whenStable(); }); it("should create", () => { @@ -55,11 +51,9 @@ describe("ImportantNotesComponent", () => { }); it("shows notes that have a high warning level", fakeAsync(() => { - const expectedNotes = mockNotes.filter((note) => - ["WARNING", "URGENT"].includes(note.warningLevel.id) - ); - tick(); - console.log(component.relevantNotes); + const expectedNotes = mockNotes + .filter((note) => ["WARNING", "URGENT"].includes(note.warningLevel.id)) + .reverse(); expect(component.relevantNotes).toEqual(expectedNotes); })); }); diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts index 3d5ccb6543..30206a1769 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -48,6 +48,7 @@ export class ImportantNotesComponent // set loading to `false` when the first chunk of notes (the initial notes) have arrived this.notes.pipe(first()).subscribe(() => (this.loading = false)); this.notes.pipe(untilDestroyed(this)).subscribe((next) => { + console.log("first call of 'notes'"); this.relevantNotes = next.filter((note) => this.noteIsRelevant(note)); this.relevantNotes.sort( (a, b) => b.warningLevel._ordinal - a.warningLevel._ordinal From 17f153e13bbf581370e08e8309a3d179f3c082cc Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 23 Aug 2022 11:28:11 +0200 Subject: [PATCH 10/19] small review improvements --- .../important-notes.component.html | 1 + .../entity/mock-entity-mapper-service.spec.ts | 33 + .../core/entity/mock-entity-mapper-service.ts | 6 +- src/assets/locale/messages.de.xlf | 2704 +++++++++++------ src/assets/locale/messages.fr.xlf | 309 +- src/assets/locale/messages.xlf | 349 ++- 6 files changed, 2211 insertions(+), 1191 deletions(-) create mode 100644 src/app/core/entity/mock-entity-mapper-service.spec.ts diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index 23faecc30a..f040134769 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -2,6 +2,7 @@ icon="exclamation-triangle" [title]="relevantNotes?.length" subtitle="Notes needing follow-up" + i18n-subtitle="subtitle|dashboard showing notes that require action" theme="note" [loading]="loading" > diff --git a/src/app/core/entity/mock-entity-mapper-service.spec.ts b/src/app/core/entity/mock-entity-mapper-service.spec.ts new file mode 100644 index 0000000000..1ba84f9623 --- /dev/null +++ b/src/app/core/entity/mock-entity-mapper-service.spec.ts @@ -0,0 +1,33 @@ +import { mockEntityMapper, MockEntityMapperService } from "./mock-entity-mapper-service"; +import { Child } from "../../child-dev-project/children/model/child"; + +describe("MockEntityMapperServicer", () => { + let service: MockEntityMapperService; + beforeEach(() => { + service = mockEntityMapper(); + }); + + it("should publish a update for a newly added entity", (done) => { + const child = new Child(); + service.receiveUpdates(Child.ENTITY_TYPE).subscribe((update) => { + expect(update.entity).toEqual(child); + expect(update.type).toBe("new"); + done(); + }); + + service.add(child); + }); + + it("should publish a update for a already existing entities", (done) => { + const child = new Child(); + service.add(child); + + child.name = "Updated name"; + service.receiveUpdates(Child.ENTITY_TYPE).subscribe((update) => { + expect(update.entity).toEqual(child); + expect(update.type).toBe("update"); + done(); + }); + service.add(child); + }); +}); diff --git a/src/app/core/entity/mock-entity-mapper-service.ts b/src/app/core/entity/mock-entity-mapper-service.ts index ca765108e5..923067ea94 100644 --- a/src/app/core/entity/mock-entity-mapper-service.ts +++ b/src/app/core/entity/mock-entity-mapper-service.ts @@ -20,6 +20,7 @@ export function mockEntityMapper( export class MockEntityMapperService extends EntityMapperService { private data: Map> = new Map(); private observables: Map>> = new Map(); + constructor() { super(null, null, entityRegistry); } @@ -40,10 +41,11 @@ export class MockEntityMapperService extends EntityMapperService { if (!this.data.get(type)) { this.data.set(type, new Map()); } + const alreadyExists = this.contains(entity); this.data.get(type).set(entity.getId(), entity); this.publishUpdates( entity.getType(), - this.contains(entity) + alreadyExists ? { type: "update", entity } : { type: "new", entity } ); @@ -144,7 +146,7 @@ export class MockEntityMapperService extends EntityMapperService { entityType: EntityConstructor | string ): Observable> { let name = - typeof entityType === "string" ? entityType : new entityType().getType(); + typeof entityType === "string" ? entityType : entityType.ENTITY_TYPE; if (!this.observables.has(name)) { this.observables.set(name, new Subject()); } diff --git a/src/assets/locale/messages.de.xlf b/src/assets/locale/messages.de.xlf index 253b767edb..d29e7e22eb 100644 --- a/src/assets/locale/messages.de.xlf +++ b/src/assets/locale/messages.de.xlf @@ -3,34 +3,46 @@ - Activate to also show entries for the activity that do not have any events with actual participation of this person - Aktivieren, um auch Aktivitäten anzuzeigen, bei denen diese Person nicht anwesend war + Activate to also show entries for the activity that do not have any events with actual participation of + this person + + Aktivieren, um auch Aktivitäten anzuzeigen, bei denen diese Person nicht anwesend + war + Tooltip that will appear when hovered over the - show-unrelated button + show-unrelated button + Show unrelated tooltip - src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html + + src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html + 41 - Also show unrelated - Auch Aktivitäten ohne diese:n Schüler:in anzeigen + Also show unrelated + Auch Aktivitäten ohne diese:n Schüler:in anzeigen show unrelated attendance-entries for an activity that are not - linked to the child of interest + linked to the child of interest + slider - src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html + + src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html + 43 - Load all records + Load all records Lade alle Aufzeichnungen load all records, not only the ones from the last 6 months load-all button - src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html + + src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html + 53 @@ -39,7 +51,9 @@ Monat The month something took place - src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + + src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + 32 @@ -49,7 +63,9 @@ Title of table column How many children are present at a meeting - src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + + src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + 38 @@ -59,7 +75,9 @@ Informs the user that this is a one-time event One-time event - src/app/child-dev-project/attendance/activity-card/activity-card.component.html + + src/app/child-dev-project/attendance/activity-card/activity-card.component.html + 11 @@ -69,7 +87,9 @@ Informs the user that this is a recurring event Recurring-event - src/app/child-dev-project/attendance/activity-card/activity-card.component.html + + src/app/child-dev-project/attendance/activity-card/activity-card.component.html + 20 @@ -77,26 +97,33 @@ {VAR_PLURAL, plural, one {participant} other {participants}} {VAR_PLURAL, plural, one {Teilnehmer:in} other {Teilnehmer:innen}} - src/app/child-dev-project/attendance/activity-card/activity-card.component.html + + src/app/child-dev-project/attendance/activity-card/activity-card.component.html + 28 - Record Attendance + Record Attendance Anwesenheiten aufnehmen - src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.html + + src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.html + 10,16 Title when recording the attendance at a particular - stage (e.g. selecting the event, recording it) + stage (e.g. selecting the event, recording it) + Record Attendance Save - Speichern + Speichern - src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + + src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + 38 @@ -105,7 +132,9 @@ Verwerfen Discard changes made to a form - src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + + src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + 47 @@ -114,7 +143,8 @@ Gruppen Groups that belong to a note - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 206 @@ -123,18 +153,22 @@ Gruppe hinzufügen … Add a group to a note - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 208 - Include events + Include events Zeige auch wiederkehrende Aktivitäten events are related to a - child + child + Slider that allows a user to also include events - src/app/child-dev-project/notes/notes-manager/notes-manager.component.html + + src/app/child-dev-project/notes/notes-manager/notes-manager.component.html + 26 @@ -143,7 +177,8 @@ Teilnehmer:innen Participants of a note - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 172 @@ -152,7 +187,8 @@ Teilnehmer:innen hinzufügen … Add participants of a note - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 174 @@ -161,17 +197,21 @@ Wähle ein Event aus One of the stages while recording child-attendances - src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + + src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + 56 - My event is not listed ... - Ich kann mein Event nicht finden … + My event is not listed ... + Ich kann mein Event nicht finden … Allows to create a new event Not listed - src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + + src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + 87 @@ -180,57 +220,83 @@ Ungültiges Datum Alert when selected date is invalid - src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.ts + + src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.ts + 211 - Attendance completed. - Anwesenheits-Aufzeichnung beendet. + Attendance completed. + Anwesenheits-Aufzeichnung beendet. shows when the user has registered the attendance of - all children + all children + Attendance completed - src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html + + src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html + 83 - Review Details - Details anzeigen + Review Details + Details anzeigen Open details of recorded event for review - src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html + + src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html + 92 - Back to Overview - Zurück zur Übersicht + Back to Overview + Zurück zur Übersicht Back to overview button after finishing a roll call - src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html + + src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html + 102 - attended events - haben an events teilgenommen + attended + + events + + haben an + + events teilgenommen + - src/app/child-dev-project/attendance/attendance-block/attendance-block.component.html + + src/app/child-dev-project/attendance/attendance-block/attendance-block.component.html + 32,34 How many attendees were present / how many attendees - were absent + were absent + Attended Tooltip - (excluding events excused or unknown) - (ausgenommene Events ; entschuldigt oder unbekannt) + (excluding + + events excused or unknown) + + (ausgenommene Events; + entschuldigt oder unbekannt) + How many events were excluded Attended Tooltip - src/app/child-dev-project/attendance/attendance-block/attendance-block.component.html + + src/app/child-dev-project/attendance/attendance-block/attendance-block.component.html + 40 @@ -238,21 +304,35 @@ Remarks Bemerkungen Placeholder if no remarks for the attendance of a child are - given + given + Remarks - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 35 + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + 36 - All excused (out of ) - Alle entschuldigt (von ) + All excused (out of + + + ) + + Alle entschuldigt (von + + + ) + How many participants attended at an event (in - percent) + percent) + Event participants - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 51 @@ -260,29 +340,57 @@ {VAR_PLURAL, plural, one {participant} other {participants}} {VAR_PLURAL, plural, one {Teilnehmer:in} other {Teilnehmer:innen}} - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 53 - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 60 - attended (of ) - haben teilgenommen (von ) + + + attended (of + + ) + + + + haben teilgenommen (von + + ) + - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 57 - without recorded status - ohne aufgenommenen Status + + + + without recorded status + + + + + ohne aufgenommenen Status + How many children are without a status Unknown status - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 67 @@ -290,61 +398,78 @@ {VAR_PLURAL, plural, one {participant} other {participants}} {VAR_PLURAL, plural, one {Teilnehmer} other {Teilnehmer}} - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 68 - Details - Details + Details + Details Allows the user to see details of an event that took - place at a particular day + place at a particular day + Show Details Button - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 80 - no events on this date - Keine Events + 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 + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 90 - Add new event - Neues Event hinzufügen + Add new event + Neues Event hinzufügen Allows the user to create a new event for the - selected date + selected date + Add New Event Button - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 101 - Attendance: - Anwesenheit: + + Anwesenheit: + + }}"/> + - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + 32,40 Attendance of a child (in percent) or the average of the - event (in percent) + event (in percent) + Attendance @@ -353,7 +478,9 @@ How many days a child was present days present - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + 50 @@ -363,7 +490,9 @@ How many days a child was absent days absent - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + 63 @@ -373,7 +502,9 @@ How many days the presence or absence of a child is unknown days absent - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + 76 @@ -381,7 +512,9 @@ Total present Summe anwesend - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + 91 How many children were present @@ -391,7 +524,9 @@ Total absent Summe abwesend - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + 104 How many children were absent @@ -401,7 +536,9 @@ Total unknown Summe unklar - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.html + 117 How many children have an unknown presence or absence status @@ -411,101 +548,132 @@ Event Event - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.ts + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.ts + 26 - Managing Attendance - - Anwesenheit verwalten - + Managing Attendance + + Anwesenheit verwalten + The heading for the view showing the - Attendance Register + Attendance Register + Heading for Attendance Register - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 6 - Record Attendance + Record Attendance Anwesenheiten aufnehmen Record attendance title - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 19 - Record attendance for an activity on a certain day. Optimized for smartphones. - Nehmen Sie Anwesenheit auf für eine Aktivität an einem bestimmten Tag. Optimiert für Smartphones. + Record attendance for an activity on a certain day. Optimized for smartphones. + Nehmen Sie Anwesenheit auf für eine Aktivität an einem bestimmten Tag. Optimiert für + Smartphones. + Record attendance content - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 23 - Record - Aufzeichnen + Record + Aufzeichnen Record attendance button - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 33 - Recurring Activities + Recurring Activities Wiederkehrende Aktivitäten Manage Activities title - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 41 - Manage "recurring activities" for which you regularly record attendance. You can assign participants and users to these activities and analyze their attendance across time. - Verwalten Sie "wiederkehrende Aktivitäten", für die regelmäßig Anwesenheit aufgezeichnet wird. Sie können Teilnehmende und Nutzer zuweisen und die langfristige Anwesenheit analysieren. + Manage "recurring activities" for which you regularly record attendance. You can assign participants and + users to these activities and analyze their attendance across time. + + Verwalten Sie "wiederkehrende Aktivitäten", für die regelmäßig Anwesenheit + aufgezeichnet wird. Sie können Teilnehmende und Nutzer zuweisen und die langfristige Anwesenheit analysieren. + Manage Activities content - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 45 - Manage Activities - Aktivitäten verwalten + Manage Activities + Aktivitäten verwalten Manage activities button - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 55 - Monthly Attendance - Monatliche Anwesenheit + Monthly Attendance + Monatliche Anwesenheit Monthly attendance title - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 63 - Document attendance totals for a whole month that were collected on paper. - Dokumentieren Sie die gesammelte Anwesenheit eines ganzen Monats, die zunächst auf Papier aufgezeichnet wurde. + Document attendance totals for a whole month that were collected on paper. + Dokumentieren Sie die gesammelte Anwesenheit eines ganzen Monats, die zunächst auf + Papier aufgezeichnet wurde. + Monthly attendance content - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 67 - Document Month - Monat dokumentieren + Document Month + Monat dokumentieren Enter attendance button - src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + + src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.html + 76 @@ -513,7 +681,9 @@ Overall Attendance Anwesenheit insgesamt - src/app/child-dev-project/attendance/attendance-summary/attendance-summary.component.html + + src/app/child-dev-project/attendance/attendance-summary/attendance-summary.component.html + 2 Attendance summary title @@ -523,7 +693,9 @@ Material The material which has been borrowed - src/app/child-dev-project/children/educational-material/model/educational-material.ts + + src/app/child-dev-project/children/educational-material/model/educational-material.ts + 35 @@ -532,7 +704,9 @@ Anzahl The amount of the material which has been borrowed - src/app/child-dev-project/children/educational-material/model/educational-material.ts + + src/app/child-dev-project/children/educational-material/model/educational-material.ts + 44 @@ -541,7 +715,9 @@ Beschreibung An additional description for the borrowed material - src/app/child-dev-project/children/educational-material/model/educational-material.ts + + src/app/child-dev-project/children/educational-material/model/educational-material.ts + 51 @@ -550,7 +726,9 @@ Bleistift Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 10 @@ -559,7 +737,9 @@ Radiergummi Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 14 @@ -568,7 +748,9 @@ Bleistiftanspitzer Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 18 @@ -577,7 +759,9 @@ Stift (schwarz) Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 22 @@ -586,7 +770,9 @@ Buntstifte Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 26 @@ -595,7 +781,9 @@ Heft (Einzellinie, groß) Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 30 @@ -604,7 +792,9 @@ Heft (vier linien) Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 34 @@ -613,7 +803,9 @@ Heft (blanko) Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 38 @@ -622,7 +814,9 @@ Bastelbuch Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 42 @@ -631,7 +825,9 @@ Prüfungsbögen Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 46 @@ -640,7 +836,9 @@ Tasche Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 50 @@ -649,7 +847,9 @@ Schuluniform Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 55 @@ -658,7 +858,9 @@ Schulschuhe Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 60 @@ -667,7 +869,9 @@ Sportkleidung Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 65 @@ -676,7 +880,9 @@ Sportschuhe Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 70 @@ -685,7 +891,9 @@ Regenjacke Label school material - src/app/child-dev-project/children/educational-material/model/materials.ts + + src/app/child-dev-project/children/educational-material/model/materials.ts + 75 @@ -694,7 +902,8 @@ Größe [cm] Label for height in cm of a health check - src/app/child-dev-project/children/health-checkup/model/health-check.ts + src/app/child-dev-project/children/health-checkup/model/health-check.ts + 39 @@ -703,7 +912,8 @@ Gewicht [kg] Label for weight in kg of a health check - src/app/child-dev-project/children/health-checkup/model/health-check.ts + src/app/child-dev-project/children/health-checkup/model/health-check.ts + 47 @@ -711,7 +921,8 @@ Loading... wird geladen ... - src/app/core/dashboard/dashboard-widget/dashboard-widget.component.html + src/app/core/dashboard/dashboard-widget/dashboard-widget.component.html + 16 @@ -719,7 +930,9 @@ Child Kind - src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + 20,22 Column description for children column @@ -728,99 +941,164 @@ Last BMI result Neueste BMI Messung - src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + 21,25 Column description for BMI result column - BMI: - BMI: + BMI: + + + BMI: + + BMI: 21.02 Displaying the BMI result of a child - src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + 35 - no BMI data recorded - no BMI data recorded + no BMI data recorded + no BMI data recorded There is no BMI data available that can be displayed - src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + 52 - + + >  days - + >  + + + days + + + + + + + >  Tage + >"/> + >  + + + Tage + + + Format like 'Days passed > 5 days' Amount of days back - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html + 34 - no records without recent report - keine Einträge ohne kürzlichen Bericht - There are no participants that don't have a recent report to be shown here - - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html + no records without recent report + keine Einträge ohne kürzlichen Bericht + There are no participants that don't have a recent report to be shown + here + + + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html + 58 - no records with recent report - keine Einträge mit kürzlichem Bericht - There are no participants that have a recent report to be shown here - - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html + no records with recent report + keine Einträge mit kürzlichem Bericht + There are no participants that have a recent report to be shown here + + + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.html + 62 Having no recent reports Fälle ohne kürzlichen Bericht - Subtitle informing the user that these are the children without recent reports + Subtitle informing the user that these are the children without recent + reports + Subtitle - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + 84 Cases with recent report Fälle mit neuem Bericht - Subtitle informing the user that these are the children with recent reports + Subtitle informing the user that these are the children with recent + reports + Subtitle - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + 86 - includes cases with a note - Fälle mit einer Notiz innerhalb + includes cases with a note + + + + Fälle mit einer Notiz innerhalb + + + Spaces in front of the variables are added automatically Tooltip - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + 123 - includes cases without a note - Fälle mit keiner Notiz innerhalb + includes cases without a note + + + + Fälle mit keiner Notiz innerhalb + + + Spaces in front of the variables are added automatically Tooltip - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + 125 @@ -839,11 +1117,11 @@ - Our regular monthly meeting. Find the agenda and minutes in our meeting folder. - + Our regular monthly meeting. Find the agenda and minutes in our meeting folder. + - Monatliches Treffen. Die Agenda und das Protokoll befinden sich in unserem "Treffen"-Ordner. - + Monatliches Treffen. Die Agenda und das Protokoll befinden sich in unserem "Treffen"-Ordner. + Note demo text src/app/child-dev-project/notes/demo-data/notes_group-stories.ts @@ -886,11 +1164,11 @@ - Expert conducted a two day workshop on drug prevention. - + Expert conducted a two day workshop on drug prevention. + - Es wurde ein zweitägiges Drogenpräventionstraining durchgeführt. - + Es wurde ein zweitägiges Drogenpräventionstraining durchgeführt. + Note demo text src/app/child-dev-project/notes/demo-data/notes_group-stories.ts @@ -902,22 +1180,26 @@ Mutter krank Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 8 - Visited family after we heard that mother is seriously ill. She cannot get up. - Children are taking care of housework. Told her to see doctor. We should follow up next week. - + Visited family after we heard that mother is seriously ill. She cannot get up. + Children are taking care of housework. Told her to see doctor. We should follow up next week. + - Habe die Familie besucht, nachdem wir erfahren hatten, dass die Mutter ernsthaft erkankt ist. Sie kann nicht ausfstehen. - Die Kinder übernehmen die Hausarbeiten. Habe ihr gesagt, dass sie zu einem Arzt gehen solle. Wir sollten nächste Woche nachfragen. - + Habe die Familie besucht, nachdem wir erfahren hatten, dass die Mutter ernsthaft erkankt ist. Sie kann nicht + ausfstehen. + Die Kinder übernehmen die Hausarbeiten. Habe ihr gesagt, dass sie zu einem Arzt gehen solle. Wir sollten + nächste Woche nachfragen. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 9 @@ -926,22 +1208,25 @@ Schulwechsel diskutiert Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 17 - Discussed future of the child with the parents. They agree that changing school can be a good option. - Will discuss further together with the child. - + Discussed future of the child with the parents. They agree that changing school can be a good option. + Will discuss further together with the child. + - Mit den Eltern über die Zukunft des Kindes gesprochen. Sie stimmen zu, dass ein Schulwechsel eine gute Option sein kann. - Ich werde nun mit dem Kind alles weitere besprechen. - + Mit den Eltern über die Zukunft des Kindes gesprochen. Sie stimmen zu, dass ein Schulwechsel eine gute Option + sein kann. + Ich werde nun mit dem Kind alles weitere besprechen. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 18 @@ -950,20 +1235,23 @@ Nachfragen zur Schulabwesenheit Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 27 - Called to ask for reason about absence. Mother made excuses but promised to send the child tomorrow. - + Called to ask for reason about absence. Mother made excuses but promised to send the child tomorrow. + - Habe die Mutter angerufen und gefragt, wieso das Kind nicht in der Schule war. Die Mutter hatte nannte Gründe hierfür, versprach aber, das Kind morgen wieder in die Schule zu schicken. - + Habe die Mutter angerufen und gefragt, wieso das Kind nicht in der Schule war. Die Mutter hatte nannte Gründe + hierfür, versprach aber, das Kind morgen wieder in die Schule zu schicken. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 28 @@ -972,20 +1260,22 @@ Krankgeschrieben Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 35 - Mother has called in the morning. Child cannot come to class because of fever. - + Mother has called in the morning. Child cannot come to class because of fever. + - Die Mutter hat morgens angerufen. Das Kind hat Fieber und kann nicht in die Schule kommen. - + Die Mutter hat morgens angerufen. Das Kind hat Fieber und kann nicht in die Schule kommen. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 36 @@ -994,22 +1284,25 @@ Abwesend ohne Informationen Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 43 - Child was not in school whole last week again. When calling the mother she didn't know about it. - Need to follow up urgently to discuss with the child and the guardians. - + Child was not in school whole last week again. When calling the mother she didn't know about it. + Need to follow up urgently to discuss with the child and the guardians. + - Das Kind war letzte Woche wiederholt nicht in der Schule. Als ich mit der Mutter telefonierte, wusste sie davon nicht. - Sollte dringend nachgefragt und mit den Vormündern und dem Kind besprochen werden. - + Das Kind war letzte Woche wiederholt nicht in der Schule. Als ich mit der Mutter telefonierte, wusste sie + davon nicht. + Sollte dringend nachgefragt und mit den Vormündern und dem Kind besprochen werden. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 44 @@ -1018,22 +1311,24 @@ Schule ist zufrieden mit Fortschritt Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 52 - Visited the school and talked to the class teacher and principal. They are happy about the progress - and behaviour. - + Visited the school and talked to the class teacher and principal. They are happy about the progress + and behaviour. + - Besuchte die Schule und sprach mit Lehrer und Rektor. Sie sind beide sehr glücklich mit der Entwicklung und - dem Verhalten des Kindes. - + Besuchte die Schule und sprach mit Lehrer und Rektor. Sie sind beide sehr glücklich mit der Entwicklung und + dem Verhalten des Kindes. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 53 @@ -1042,22 +1337,25 @@ Muss sich in der Schule mehr anstrengen Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 61 - Discussed the child's progress with coaching teacher. He is still a weak student and needs more support. - We should consider arranging an extra class for him. Discuss next social worker meeting. - + Discussed the child's progress with coaching teacher. He is still a weak student and needs more support. + We should consider arranging an extra class for him. Discuss next social worker meeting. + - Ich habe mit dem Lehrer über die Entwicklung des Kindes gesprochen. Es gehört weiterhin zu den schwächeren Schüler:innen und benötigt Untersützung, - vielleicht auch Nachhilfe. Das werden wir beim nächsten Sozialarbeiter:innen-Treffen besprechen. - + Ich habe mit dem Lehrer über die Entwicklung des Kindes gesprochen. Es gehört weiterhin zu den schwächeren + Schüler:innen und benötigt Untersützung, + vielleicht auch Nachhilfe. Das werden wir beim nächsten Sozialarbeiter:innen-Treffen besprechen. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 62 @@ -1066,22 +1364,25 @@ Schlägerei in der Schule Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 70 - Principal called us today. Our student got into a fight and was suspended for a week. - Need to follow up with the child and discuss the matter. - + Principal called us today. Our student got into a fight and was suspended for a week. + Need to follow up with the child and discuss the matter. + - Der Rektor hat heute angerufen. Das Kind war in eine Schlägerei verwickelt und ist für nächste Woche von der Schule ausgeschlossen. - Darüber sollte mit dem Kind gesprochen werden. - + Der Rektor hat heute angerufen. Das Kind war in eine Schlägerei verwickelt und ist für nächste Woche von der + Schule ausgeschlossen. + Darüber sollte mit dem Kind gesprochen werden. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 71 @@ -1090,22 +1391,25 @@ Unterstützung für Familie Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 79 - Since the father has lost his job the family is struggling to survive. - After home visits and discussion in our team we decided to refer them to a special support programme. - + Since the father has lost his job the family is struggling to survive. + After home visits and discussion in our team we decided to refer them to a special support programme. + - Seitdem der Vater arbeitslos geworden ist, hat die Familie große finanzielle Schwierigkeiten. - Nach Hausbesuchen und Diskussionen mit dem Team haben wir uns dazu entschieden, die Familie an das spezielle Unterstützungsprogramm zu verweisen. - + Seitdem der Vater arbeitslos geworden ist, hat die Familie große finanzielle Schwierigkeiten. + Nach Hausbesuchen und Diskussionen mit dem Team haben wir uns dazu entschieden, die Familie an das spezielle + Unterstützungsprogramm zu verweisen. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 80 @@ -1114,24 +1418,26 @@ Versetzungsgefährdet Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 88 - Child has failed this school year as she did not go to school regularly. - After a long discussion with the child and her parents we agreed to support her to repeat the class - and she promised to attend school regularly. - + Child has failed this school year as she did not go to school regularly. + After a long discussion with the child and her parents we agreed to support her to repeat the class + and she promised to attend school regularly. + - Das Kind ist dieses Jahr in der Schule durchgefallen, da es oft fehlte. - Nach langen Diskussionen mit dem Kind und den Eltern wurde beschlossen, dass das Kind die Klasse wiederholt. - Es hat versprochen, nun regelmäßig zur Schule zu gehen. - + Das Kind ist dieses Jahr in der Schule durchgefallen, da es oft fehlte. + Nach langen Diskussionen mit dem Kind und den Eltern wurde beschlossen, dass das Kind die Klasse wiederholt. + Es hat versprochen, nun regelmäßig zur Schule zu gehen. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 89 @@ -1140,22 +1446,24 @@ Unaufmerksam im Unterricht Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 98 - Teacher has let us know that he is very unfocused during class these days. - Discussed with him - there are a lot of problems in the family currently. - + Teacher has let us know that he is very unfocused during class these days. + Discussed with him - there are a lot of problems in the family currently. + - Die Lehrerin hat uns Bescheid gegeben, dass das Kind in den letzten Tagen im Unterricht sehr unaufmerksam war. - Habe mit dem Kind darüber gesprochen: Es gibt derzeit sehr viele Probleme in der Familie. - + Die Lehrerin hat uns Bescheid gegeben, dass das Kind in den letzten Tagen im Unterricht sehr unaufmerksam war. + Habe mit dem Kind darüber gesprochen: Es gibt derzeit sehr viele Probleme in der Familie. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 99 @@ -1164,22 +1472,24 @@ Stört im Unterricht Note demo subject - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 107 - She refused to listen to the teacher was disturbing the class. - Did counselling session with her. - + She refused to listen to the teacher was disturbing the class. + Did counselling session with her. + - Das Kind hat nicht auf die Lehrerin gehört und im Unterricht gestört. - Ich habe mit dem Kind über dieses Problem gesprochen. - + Das Kind hat nicht auf die Lehrerin gehört und im Unterricht gestört. + Ich habe mit dem Kind über dieses Problem gesprochen. + Note demo text - src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + src/app/child-dev-project/notes/demo-data/notes_individual-stories.ts + 108 @@ -1224,7 +1534,7 @@ src/app/core/config/config-fix.ts - 559 + 572 @@ -1240,19 +1550,24 @@ Remarks Vermerke - src/app/child-dev-project/notes/note-details/child-meeting-attendance/child-meeting-note-attendance.component.html + + src/app/child-dev-project/notes/note-details/child-meeting-attendance/child-meeting-note-attendance.component.html + 30 - src/app/child-dev-project/notes/note-details/child-meeting-attendance/child-meeting-note-attendance.component.html + + src/app/child-dev-project/notes/note-details/child-meeting-attendance/child-meeting-note-attendance.component.html + 66 - Download details - Details herunterladen + Download details + Details herunterladen - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 51 Download note details as CSV @@ -1263,17 +1578,27 @@ 'includes cases without a note since the beginning of the week' Tooltip-part - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + 133 - without a note within the last days - ohne Notiz in den letzten Tagen + without a note within the last + + days + + ohne Notiz in den letzten + + Tagen + 'includes cases without a note within the last x days' Tooltip-part - src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + + src/app/child-dev-project/notes/dashboard-widgets/notes-dashboard/notes-dashboard.component.ts + 142 @@ -1283,15 +1608,17 @@ Placeholder for a date-input Date input - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 62 - Status - Status im Projekt + Status + Status im Projekt - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 76 Status of a note @@ -1301,16 +1628,18 @@ Art der Interkation Type of Interaction when adding event - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 95 Add Author... - Ersteller:in hinzufügen … + Ersteller:in hinzufügen … placeholder when adding multiple authors - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 120 @@ -1319,7 +1648,8 @@ Ersteller:innen Authors of a note - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 122 @@ -1327,10 +1657,12 @@ Topic / Summary Thema / Zusammenfassung Placeholder informing that this is the Topic/Summary - of the note + of the note + Placeholder - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 137 @@ -1338,10 +1670,12 @@ Notes Bemerkungen Placeholder informing that this is textarea the actual - note can be entered into + note can be entered into + Placeholder - src/app/child-dev-project/notes/note-details/note-details.component.html + src/app/child-dev-project/notes/note-details/note-details.component.html + 153 @@ -1350,7 +1684,8 @@ Dringend Filter-option for notes - src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + 52 @@ -1359,12 +1694,13 @@ Nachverfolgung nötig Filter-option for notes - src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + 57 src/app/child-dev-project/warning-levels.ts - 14 + 15 @@ -1372,7 +1708,8 @@ Diese Woche Filter-option for notes - src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + 68 @@ -1381,7 +1718,8 @@ Seit letzter Woche Filter-option for notes - src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + 73 @@ -1390,7 +1728,9 @@ Es gibt keinen aktiven Eintrag. Um einen hinzuzufügen, klicken Sie auf den Explanation for missing currently active entry - part 1 of 2 - src/app/child-dev-project/children/previous-schools/previous-schools.component.html + + src/app/child-dev-project/children/previous-schools/previous-schools.component.html + 4 @@ -1399,50 +1739,89 @@ Knopf Explanation for missing currently active entry - part 2 of 2: - src/app/child-dev-project/children/previous-schools/previous-schools.component.html + + src/app/child-dev-project/children/previous-schools/previous-schools.component.html + 14 + + Notes needing follow-up + offene Notizen + + + src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html + + 4 + + dashboard showing notes that require action + subtitle + + + no notes that need immediate attention + alle Notizen gelöst + + + src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html + + 48,50 + + Description when there are no notes that need a follow-up + Current Aktuell The Current value of a process or task Current process - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 37 - This field is required - Dieses Feld ist erforderlich + This field is required + Dieses Feld ist erforderlich - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 40 - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 65 - Must be greater than 0 - Muss größer als 0 sein + Must be greater than 0 + Muss größer als 0 sein - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 43 - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 71 - Must not be greater than target - Darf nicht größer als das Ziel sein - The number entered in this form is less than another field but should not be - - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + Must not be greater than target + Darf nicht größer als das Ziel sein + The number entered in this form is less than another field but should not + be + + + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 49 @@ -1452,32 +1831,40 @@ The target amount of a process Target process - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 60 - Add New Task - Neue Aufgabe hinzufügen + Add New Task + Neue Aufgabe hinzufügen Add a task to the progress dashboard list - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 88 Save - Speichern + Speichern - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 98 Cancel - Abbrechen + Abbrechen - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 100 @@ -1486,7 +1873,9 @@ Fortschritt von X The progress, e.g. of a certain activity - src/app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.ts + + src/app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.ts + 56 @@ -1495,7 +1884,9 @@ Teil Part of a whole - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.ts + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.ts + 68 @@ -1504,7 +1895,9 @@ Beheben Sie die Fehler um das Formular zu speichern Shown when there are errors that prevent saving - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.ts + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.ts + 78 @@ -1514,16 +1907,22 @@ e.g. Currently active Label for the currently active status - src/app/child-dev-project/schools/children-overview/children-overview.component.ts + + src/app/child-dev-project/schools/children-overview/children-overview.component.ts + 14 Only added to school/group if active.Change the start or end date to modify this status. - Nur aktive Einträge werden der Schule/Gruppe hinzugefügt. Ändere das Start- oder End-Datum um den Status zu verändern. + Nur aktive Einträge werden der Schule/Gruppe hinzugefügt. Ändere das Start- oder + End-Datum um den Status zu verändern. + Tooltip for the status of currently active or not - src/app/child-dev-project/schools/children-overview/children-overview.component.ts + + src/app/child-dev-project/schools/children-overview/children-overview.component.ts + 17 @@ -1532,7 +1931,9 @@ aktiv Indication for the currently active status of an entry - src/app/child-dev-project/schools/children-overview/children-overview.component.ts + + src/app/child-dev-project/schools/children-overview/children-overview.component.ts + 20 @@ -1541,7 +1942,9 @@ inaktiv Indication for the currently inactive status of an entry - src/app/child-dev-project/schools/children-overview/children-overview.component.ts + + src/app/child-dev-project/schools/children-overview/children-overview.component.ts + 21 @@ -1562,12 +1965,17 @@ - Are you sure you want to keep the current version and delete this conflicting version? - Sicher, dass die aktuelle Version beibehalten werden soll und die konflikbehaftete gelöscht werden soll? + + Sicher, dass die aktuelle Version beibehalten werden soll und die konflikbehaftete + gelöscht werden soll? + + )"/> + src/app/conflict-resolution/compare-rev/compare-rev.component.ts 96,94 @@ -1582,16 +1990,24 @@ - Error trying to delete conflicting version: - Ein Fehler ist aufgetreten beim löschen der konfliktbehafteten Version: + Error trying to delete conflicting version: + + + Ein Fehler ist aufgetreten beim löschen der konfliktbehafteten Version: + + src/app/conflict-resolution/compare-rev/compare-rev.component.ts 116 - Error trying to save version: - Ein Fehler ist aufgetreten beim speichern einer Version: + Error trying to save version: + + + Ein Fehler ist aufgetreten beim speichern einer Version: + + src/app/conflict-resolution/compare-rev/compare-rev.component.ts 129 @@ -1606,12 +2022,17 @@ - Are you sure you want to save the following changes and delete the conflicting version? - Sollen die konfliktbehaftete Version gespeichert und die folgenden Änderungen wirklich gesichert werden? + + Sollen die konfliktbehaftete Version gespeichert und die folgenden Änderungen + wirklich gesichert werden? + + )"/> + src/app/conflict-resolution/compare-rev/compare-rev.component.ts 153 @@ -1643,17 +2064,31 @@ Are you sure you want to import this file? - This will add or update records from the loaded file. + This will add or update + + records from the loaded file. + Sind sie sicher, dass sie diese Datei importieren wollen? - Dadurch werden Einträge aus der Datei importiert. + Dadurch werden + + Einträge aus der Datei importiert. + src/app/features/data-import/data-import.service.ts 105 - All existing records imported with the transaction id '' will be deleted! - Alle existierende Einträge mit der TransactionID: '' werden gelöscht! + + + All existing records imported with the transaction id '' + will be deleted! + + + + Alle existierende Einträge mit der TransactionID: '' + werden gelöscht! + src/app/features/data-import/data-import.service.ts 108 @@ -1663,7 +2098,8 @@ Select file Wähle Datei - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 2,4 Data import wizard label @@ -1672,7 +2108,8 @@ Selected File: Ausgewählte Datei: - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 6,10 Label for file select input @@ -1681,37 +2118,46 @@ No file selected Keine Datei ausgewählt - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 12,16 - Placeholder for file-input where the .csv file can be seleceted as part of the import process + Placeholder for file-input where the .csv file can be seleceted as part of + the import process + Next Weiter Button to proceed in import wizard - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 17 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 35 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 52 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 73 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 91 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 125 @@ -1720,16 +2166,20 @@ Lade Konfiguration Data import wizard label - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 22 No config selected Keine Konfiguration ausgewählt - Placeholder for file-input where a config file can be selected as part of the import process + Placeholder for file-input where a config file can be selected as part of + the import process + - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 29 @@ -1738,7 +2188,8 @@ Wähle Typ Data import wizard label - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 40 @@ -1747,7 +2198,8 @@ Transaction ID Data import wizard label - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 57 @@ -1756,7 +2208,8 @@ IDs sind in der CSV-Datei definiert Hint in import wizard when transaction ID is not necessary - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 59 @@ -1765,16 +2218,19 @@ Transaction ID: Unique ID for this import - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 61 Enter TransactionID TransactionID eingeben - Placeholder for input for transactionId as part of the import process + Placeholder for input for transactionId as part of the import process + - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 66 @@ -1783,7 +2239,8 @@ Generiere ID Button to generate a random ID - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 70 @@ -1792,20 +2249,24 @@ Datums Format Data import wizard label - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 78 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 81 Enter a date format Datums-Format eingeben - Placeholdr for input where date format as part of the import process + Placeholdr for input where date format as part of the import process + - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 86 @@ -1814,16 +2275,20 @@ Spaltenzuordnung Data import wizard label - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 96 Select property Attribut auswählen - Placeholder for input where a property can be selected during the import process + Placeholder for input where a property can be selected during the import + process + - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 104 @@ -1832,56 +2297,86 @@ Starte Datei-Import Data import wizard label - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 129 - Entity Type: - Entity Typ: + Entity Type: + + + + + Entity Typ: + + + + Data import Final overview - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 130 - CSV File: - CSV Datei: + CSV File: + + + + + CSV Datei: + + + + Data import Final overview - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 131 - TransactionID: + + - TransactionID: + <di"/> + + TransactionID: + + + + Data import Final overview - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 132 - Start Import - Starte Datei-Import + Start Import + Starte Datei-Import Button to start import - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 136 - Save config - Speichere Konfiguration + Save config + Speichere Konfiguration Button to save import configuration - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 139 @@ -1890,7 +2385,8 @@ Zurücksetzen Button to reset import wizard - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 144 @@ -1900,7 +2396,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 4 + 10 @@ -1909,7 +2405,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 8 + 14 @@ -1918,7 +2414,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 12 + 18 @@ -1927,7 +2423,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 16 + 22 @@ -1936,7 +2432,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 20 + 6 @@ -1949,8 +2445,13 @@ Coming Soon header - Sorry, this feature isn't quite ready yet. We are working hard to make this available for you. Let us know below if you need this functionality. - Tut uns leid, dieses Feature ist noch nicht verfügbar. Wir bemühen uns aber, es so schnell wie möglich verfügbar zu machen. Wenn Sie diese Funktionalität benötigen, lassen Sie es uns bitte wissen! + Sorry, this feature isn't quite ready yet. We are working hard to make this available for you. Let us + know below if you need this functionality. + + Tut uns leid, dieses Feature ist noch nicht verfügbar. Wir bemühen uns aber, es so + schnell wie möglich verfügbar zu machen. Wenn Sie diese Funktionalität benötigen, lassen Sie es uns bitte + wissen! + Coming Soon description src/app/core/coming-soon/coming-soon/coming-soon.component.html @@ -1958,29 +2459,38 @@ - I need this feature - + + I need this feature + + + Ich brauche dieses Feature + >"/> + + Ich brauche dieses Feature + src/app/core/coming-soon/coming-soon/coming-soon.component.html 27,34 Indicates that the user needs this feature and can send - a feature-request + a feature-request + Feature Button - I can tell you about my use case - Das ist mein Anwendungsfall + I can tell you about my use case + Das ist mein Anwendungsfall src/app/core/coming-soon/coming-soon/coming-soon.component.html 47 @@ -2023,7 +2533,7 @@ src/app/core/config/config-fix.ts - 374 + 387 @@ -2032,7 +2542,7 @@ Title of recurring activities overview src/app/core/config/config-fix.ts - 733 + 746 @@ -2063,7 +2573,7 @@ src/app/core/config/config-fix.ts - 307 + 320 @@ -2099,7 +2609,7 @@ Document status src/app/core/config/config-fix.ts - 103 + 104 @@ -2108,7 +2618,7 @@ Document status src/app/core/config/config-fix.ts - 107 + 109 @@ -2117,7 +2627,7 @@ Document status src/app/core/config/config-fix.ts - 111 + 114 @@ -2126,7 +2636,7 @@ Document status src/app/core/config/config-fix.ts - 115 + 119 @@ -2135,7 +2645,7 @@ Document status src/app/core/config/config-fix.ts - 119 + 124 @@ -2144,7 +2654,7 @@ Document status src/app/core/config/config-fix.ts - 123 + 129 @@ -2154,7 +2664,7 @@ Dashboard shortcut widget src/app/core/config/config-fix.ts - 151 + 158 @@ -2164,7 +2674,7 @@ Dashboard shortcut widget src/app/core/config/config-fix.ts - 156 + 163 @@ -2172,16 +2682,20 @@ Alipore center - src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + 5 - src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + 6 src/app/core/config/config-fix.ts - 129 + 136 @@ -2189,12 +2703,14 @@ Tollygunge center - src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + 7 src/app/core/config/config-fix.ts - 133 + 140 @@ -2202,19 +2718,23 @@ Barabazar center - src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/centers.ts + 8 src/app/core/config/config-fix.ts - 137 + 144 Finished School or Training Schule erfolgreich abgeschlossen - src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + 3 Dropout type @@ -2223,7 +2743,9 @@ Continues Education without project Besucht Schuler außerhalb des Projekts - src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + 5 Dropout type @@ -2232,7 +2754,9 @@ Moved away Umgezogen - src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + 6 Dropout type @@ -2241,15 +2765,21 @@ Hindu hinduistisch - src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + 3 - src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + 4 - src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + 5 religion @@ -2258,11 +2788,15 @@ Muslim muslimisch - src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + 6 - src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + 7 religion @@ -2271,7 +2805,9 @@ Christian christlich - src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + 8 religion @@ -2280,7 +2816,9 @@ Sikh jüdisch - src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/religions.ts + 9 religion @@ -2291,7 +2829,7 @@ Attendance week dashboard widget label src/app/core/config/config-fix.ts - 186 + 199 @@ -2300,7 +2838,7 @@ Attendance week dashboard widget label src/app/core/config/config-fix.ts - 193 + 206 @@ -2309,11 +2847,11 @@ Title for notes overview src/app/core/config/config-fix.ts - 214 + 227 src/app/core/config/config-fix.ts - 658 + 671 @@ -2322,11 +2860,11 @@ Translated name of default column group src/app/core/config/config-fix.ts - 224 + 237 src/app/core/config/config-fix.ts - 228 + 241 @@ -2335,19 +2873,19 @@ Translated name of mobile column group src/app/core/config/config-fix.ts - 225 + 238 src/app/core/config/config-fix.ts - 238 + 251 src/app/core/config/config-fix.ts - 492 + 505 src/app/core/config/config-fix.ts - 545 + 558 @@ -2356,16 +2894,18 @@ Panel title src/app/core/config/config-fix.ts - 319 + 332 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!) + 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 - 352 + 365 @@ -2374,7 +2914,7 @@ Title of schools overview src/app/core/config/config-fix.ts - 364 + 377 @@ -2383,7 +2923,7 @@ Label for private schools filter - true case src/app/core/config/config-fix.ts - 375 + 388 @@ -2392,7 +2932,7 @@ Label for private schools filter - false case src/app/core/config/config-fix.ts - 376 + 389 @@ -2402,7 +2942,7 @@ Title when adding new entity src/app/core/config/config-fix.ts - 386 + 399 @@ -2411,15 +2951,15 @@ Panel title src/app/core/config/config-fix.ts - 389 + 402 src/app/core/config/config-fix.ts - 584 + 597 src/app/core/config/config-fix.ts - 753 + 766 @@ -2428,7 +2968,7 @@ Panel title src/app/core/config/config-fix.ts - 417 + 430 @@ -2437,7 +2977,7 @@ Panel title src/app/core/config/config-fix.ts - 426 + 439 @@ -2446,7 +2986,7 @@ Title children overview src/app/core/config/config-fix.ts - 441 + 454 @@ -2455,7 +2995,7 @@ Column label for school attendance of child src/app/core/config/config-fix.ts - 467 + 480 @@ -2464,7 +3004,7 @@ Column label for coaching attendance of child src/app/core/config/config-fix.ts - 476 + 489 @@ -2473,7 +3013,7 @@ Column group name src/app/core/config/config-fix.ts - 508 + 521 @@ -2482,11 +3022,11 @@ Translated name of default column group src/app/core/config/config-fix.ts - 491 + 504 src/app/core/config/config-fix.ts - 495 + 508 @@ -2495,11 +3035,11 @@ Column group name src/app/core/config/config-fix.ts - 531 + 544 src/app/core/config/config-fix.ts - 667 + 680 @@ -2508,7 +3048,7 @@ Active children filter label - true case src/app/core/config/config-fix.ts - 560 + 573 @@ -2517,7 +3057,7 @@ Active children filter label - false case src/app/core/config/config-fix.ts - 561 + 574 @@ -2526,7 +3066,7 @@ Header for form section src/app/core/config/config-fix.ts - 611 + 624 @@ -2535,7 +3075,7 @@ Header for form section src/app/core/config/config-fix.ts - 612 + 625 @@ -2544,7 +3084,7 @@ Header for form section src/app/core/config/config-fix.ts - 613 + 626 @@ -2553,7 +3093,7 @@ Panel title src/app/core/config/config-fix.ts - 620 + 633 @@ -2562,7 +3102,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 623 + 636 @@ -2571,7 +3111,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 643 + 656 @@ -2584,16 +3124,16 @@ src/app/core/config/config-fix.ts - 649 + 662 Height & Weight Tracking - Größe & Gewicht + Größe & Gewicht Title inside a panel src/app/core/config/config-fix.ts - 680 + 693 @@ -2602,7 +3142,7 @@ Panel title src/app/core/config/config-fix.ts - 686 + 699 @@ -2611,7 +3151,7 @@ Panel title src/app/core/config/config-fix.ts - 695 + 708 @@ -2619,16 +3159,20 @@ Ausscheiden aus dem Projekt Child status - src/app/child-dev-project/children/demo-data-generators/demo-child-generator.service.ts + + src/app/child-dev-project/children/demo-data-generators/demo-child-generator.service.ts + 63 - src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + + src/app/child-dev-project/children/demo-data-generators/fixtures/dropout-types.ts + 4 src/app/core/config/config-fix.ts - 712 + 725 @@ -2637,7 +3181,7 @@ Panel title src/app/core/config/config-fix.ts - 782 + 795 @@ -2646,7 +3190,7 @@ Name of a report src/app/core/config/config-fix.ts - 798 + 811 @@ -2655,7 +3199,7 @@ Label of report query src/app/core/config/config-fix.ts - 802 + 815 @@ -2664,7 +3208,7 @@ Label for report query src/app/core/config/config-fix.ts - 807 + 820 @@ -2673,7 +3217,7 @@ Label for report query src/app/core/config/config-fix.ts - 810 + 823 @@ -2682,7 +3226,7 @@ Label for report query src/app/core/config/config-fix.ts - 814 + 827 @@ -2691,7 +3235,7 @@ Label for report query src/app/core/config/config-fix.ts - 819 + 832 @@ -2700,7 +3244,7 @@ Label for report query src/app/core/config/config-fix.ts - 823 + 836 @@ -2709,7 +3253,7 @@ Label for report query src/app/core/config/config-fix.ts - 828 + 841 @@ -2718,7 +3262,7 @@ Name of a report src/app/core/config/config-fix.ts - 836 + 849 @@ -2727,7 +3271,7 @@ Name of a report src/app/core/config/config-fix.ts - 853 + 866 @@ -2736,11 +3280,11 @@ Name of a column of a report src/app/core/config/config-fix.ts - 868 + 881 src/app/core/config/config-fix.ts - 893 + 906 @@ -2749,11 +3293,11 @@ Name of a column of a report src/app/core/config/config-fix.ts - 872 + 885 src/app/core/config/config-fix.ts - 897 + 910 @@ -2762,11 +3306,11 @@ Name of a column of a report src/app/core/config/config-fix.ts - 876 + 889 src/app/core/config/config-fix.ts - 901 + 914 @@ -2775,7 +3319,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 925 + 938 @@ -2784,7 +3328,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 946 + 959 @@ -2793,7 +3337,7 @@ Label for the language of a school src/app/core/config/config-fix.ts - 971 + 984 @@ -2806,7 +3350,7 @@ src/app/core/config/config-fix.ts - 985 + 998 @@ -2815,7 +3359,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1011 + 1024 @@ -2824,7 +3368,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1012 + 1025 @@ -2833,7 +3377,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1020 + 1033 @@ -2842,7 +3386,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1021 + 1034 @@ -2851,7 +3395,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1029 + 1042 @@ -2860,7 +3404,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1030 + 1043 @@ -2869,7 +3413,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1038 + 1051 @@ -2878,7 +3422,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1039 + 1052 @@ -2887,7 +3431,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1047 + 1060 @@ -2896,7 +3440,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1048 + 1061 @@ -2905,7 +3449,7 @@ Label of user email src/app/core/config/config-fix.ts - 1059 + 1072 @@ -2914,14 +3458,15 @@ Label of user phone src/app/core/config/config-fix.ts - 1066 + 1079 Present Anwesend - src/app/core/config/default-config/default-attendance-status-types.ts + src/app/core/config/default-config/default-attendance-status-types.ts + 10 Option in roll call @@ -2931,7 +3476,8 @@ Absent Abwesend - src/app/core/config/default-config/default-attendance-status-types.ts + src/app/core/config/default-config/default-attendance-status-types.ts + 17 Option in roll call @@ -2941,7 +3487,8 @@ Late Zu spät - src/app/core/config/default-config/default-attendance-status-types.ts + src/app/core/config/default-config/default-attendance-status-types.ts + 24 Option in roll call @@ -2953,7 +3500,8 @@ Option in roll call Child was excused - src/app/core/config/default-config/default-attendance-status-types.ts + src/app/core/config/default-config/default-attendance-status-types.ts + 31 @@ -2962,7 +3510,9 @@ Anwesenheiten aufnehmen One of the stages while recording child-attendances - src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + + src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + 57 @@ -2971,7 +3521,9 @@ Schließen Exit from the current screen - src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + + src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + 78 @@ -2979,36 +3531,45 @@ Do you want to save your progress before going back? Wollen Sie die Änderungen speichern? - src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + + src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts + 79 - Date + Date Datum Record an event for a particular date that is to be - inputted + inputted + Event-Record label - src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + + src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + 10 - Show less - Weniger anzeigen + Show less + Weniger anzeigen Show less entries of a list - src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + + src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + 73 - Show more - Mehr anzeigen + Show more + Mehr anzeigen Show more entries of a list - src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + + src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html + 76 @@ -3052,11 +3613,14 @@ 29 - src/app/child-dev-project/children/educational-material/model/educational-material.ts + + src/app/child-dev-project/children/educational-material/model/educational-material.ts + 31 - src/app/child-dev-project/children/health-checkup/model/health-check.ts + src/app/child-dev-project/children/health-checkup/model/health-check.ts + 34 @@ -3086,7 +3650,8 @@ 45 - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 38 @@ -3099,7 +3664,8 @@ 33 - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 37 @@ -3112,7 +3678,8 @@ 39 - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 39 @@ -3130,19 +3697,19 @@ src/app/core/config/config-fix.ts - 445 + 458 src/app/core/config/config-fix.ts - 864 + 877 src/app/core/config/config-fix.ts - 889 + 902 src/app/core/config/config-fix.ts - 957 + 970 @@ -3158,27 +3725,31 @@ All Alle - src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + 62 - src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts + 76 src/app/core/config/config-fix.ts - 377 + 390 src/app/core/config/config-fix.ts - 562 + 575 - src/app/core/entity-components/entity-list/filter-generator.service.ts + src/app/core/entity-components/entity-list/filter-generator.service.ts + 135 - src/app/core/entity-components/entity-list/filter-generator.service.ts + src/app/core/entity-components/entity-list/filter-generator.service.ts + 164 @@ -3190,7 +3761,9 @@ Birthdays Geburtstage - src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + 4,7 Title of the birthday widget @@ -3199,7 +3772,9 @@ Upcoming Birthdays Anstehende Geburtstage - src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + 6,9 Subtitle of the birthday widget @@ -3208,20 +3783,30 @@ Children whose birthday is soon Kinder, die bald Geburtstag haben - src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + 8,12 Tooltip for the birthday widget - yrs - + yrs + + + Jahre + <tr mat"/> + Jahre + - src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html + 29,30 @@ -3230,19 +3815,25 @@ BMI Title of the BMI dashboard component - src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + 6 Students with unhealthy BMI - Schüler:innen mit ungesundem BMI + Schüler:innen mit ungesundem BMI - src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + 7,11 - src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html + 16,18 Subtitle of the BMI dashboard component @@ -3257,7 +3848,7 @@ src/app/core/config/config-fix.ts - 999 + 1012 @@ -3266,11 +3857,11 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 13 + 14 src/app/child-dev-project/children/aser/model/skill-levels.ts - 38 + 40 @@ -3279,7 +3870,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 42 + 44 @@ -3288,7 +3879,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 46 + 48 @@ -3297,7 +3888,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 50 + 52 @@ -3306,7 +3897,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 54 + 56 @@ -3315,7 +3906,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 17 + 18 @@ -3324,7 +3915,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 21 + 22 @@ -3333,7 +3924,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 25 + 26 @@ -3342,7 +3933,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 29 + 30 @@ -3378,7 +3969,7 @@ Label for the mother tongue of a child src/app/core/config/config-fix.ts - 939 + 952 @@ -3396,7 +3987,7 @@ Label for the religion of a child src/app/core/config/config-fix.ts - 932 + 945 @@ -3405,7 +3996,7 @@ Column label for age of child src/app/core/config/config-fix.ts - 450 + 463 @@ -3413,29 +4004,46 @@ Gymnasium School demo name that is connected with a school name - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 25 - + - + + + + + )"/> + - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 41,43 e.g. Example School School demo name order for connecting the school name and (High) School - Language - Sprache + + + + Language + + + + + Sprache + - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 44 @@ -3444,7 +4052,8 @@ 6 - 11 Uhr School demo timing - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 55 @@ -3453,7 +4062,8 @@ 11 - 16 Uhr School demo timing - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 56 @@ -3462,7 +4072,8 @@ 6:30-11:00 und 11:30-16:00 School demo timing - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 57 @@ -3472,11 +4083,11 @@ Label for the address of a child src/app/core/config/config-fix.ts - 918 + 931 src/app/core/config/config-fix.ts - 978 + 991 @@ -3485,7 +4096,7 @@ Label for if a school is a private school src/app/core/config/config-fix.ts - 964 + 977 @@ -3494,68 +4105,74 @@ Label for the timing of a school src/app/core/config/config-fix.ts - 992 + 1005 Solved Gelöst + Label warning level src/app/child-dev-project/warning-levels.ts - 10 + 11 - Label warning level Urgent Follow-Up Dringend Nachverfolgen + Label warning level src/app/child-dev-project/warning-levels.ts - 18 + 19 - Label warning level - Conflicting Entity: - Konfliktierende Entitäten: + Conflicting Entity: + Konfliktierende Entitäten: Signals that there are conflicting database-entities - src/app/conflict-resolution/compare-rev/compare-rev.component.html + src/app/conflict-resolution/compare-rev/compare-rev.component.html + 16 - Choose conflicting version - Wähle konfliktierende Version aus + Choose conflicting version + Wähle konfliktierende Version aus - src/app/conflict-resolution/compare-rev/compare-rev.component.html + src/app/conflict-resolution/compare-rev/compare-rev.component.html + 32 - Save manually resolved record - Manuell aufgelösten Konflikt speichern + Save manually resolved record + Manuell aufgelösten Konflikt speichern - src/app/conflict-resolution/compare-rev/compare-rev.component.html + src/app/conflict-resolution/compare-rev/compare-rev.component.html + 51 - Current Entity: - Momentane Entität: + Current Entity: + Momentane Entität: A currently selected entity - src/app/conflict-resolution/compare-rev/compare-rev.component.html + src/app/conflict-resolution/compare-rev/compare-rev.component.html + 57 - Choose current version - Wähle aktuelle version aus + Choose current version + Wähle aktuelle version aus Choose a current version between several conflicting versions of - database entries + database entries + - src/app/conflict-resolution/compare-rev/compare-rev.component.html + src/app/conflict-resolution/compare-rev/compare-rev.component.html + 76 @@ -3569,7 +4186,7 @@ src/app/core/config/config-fix.ts - 455 + 468 @@ -3618,8 +4235,10 @@ - No "" date is set - Kein ""-Datum wurde gesetzt + No "" date is set + + Kein ""-Datum wurde gesetzt + Error assertValid failed src/app/child-dev-project/children/model/childSchoolRelation.ts @@ -3627,8 +4246,12 @@ - The "" date is after the "" date - Das ""-Datum ist nach dem ""-Datum + The "" date is after the "" date + + Das ""-Datum ist nach dem " + "-Datum + Error assertValid failed src/app/child-dev-project/children/model/childSchoolRelation.ts @@ -3663,13 +4286,18 @@ Label gender - Total: - - Insgesamt: + Total: + + + Insgesamt: + + Total amount of education material including a summary Total amount - src/app/child-dev-project/children/educational-material/educational-material-component/educational-material.component.html + + src/app/child-dev-project/children/educational-material/educational-material-component/educational-material.component.html + 12 @@ -3678,7 +4306,9 @@ Schulpartnerschaften geschlossen Example for demo task in the progress widget - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 22 @@ -3687,7 +4317,9 @@ Sponsoren geworben Example for demo task in the progress widget - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 23 @@ -3696,7 +4328,9 @@ Treffen mit Regierungsmitgliedern Example for demo task in the progress widget - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 24 @@ -3709,23 +4343,30 @@ 24 - src/app/child-dev-project/schools/demo-school-generator.service.ts + src/app/child-dev-project/schools/demo-school-generator.service.ts + 24 src/app/core/config/config-fix.ts - 460 + 473 src/app/core/config/config-fix.ts - 571 + 584 - Absences - Abwesenheiten + Absences + + + Abwesenheiten + + - src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.html + + src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.html + 5,6 Dashboard attendance component subtitle @@ -3734,16 +4375,20 @@ Cases absent multiple times in the given week Fälle, die mehrmals in der betroffenen Woche abwesend waren - src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.html + + src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.html + 7,11 Dashboard attendance component explanation tooltip - no absences recorded + no absences recorded Keine Abwesenheit dokumentiert - src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.html + + src/app/child-dev-project/attendance/dashboard-widgets/attendance-week-dashboard/attendance-week-dashboard.component.html + 52,56 Placeholder if no absences are visible in dashboar @@ -3753,7 +4398,9 @@ krank Event demo attendance remarks - src/app/child-dev-project/attendance/demo-data/demo-activity-events-generator.service.ts + + src/app/child-dev-project/attendance/demo-data/demo-activity-events-generator.service.ts + 43 @@ -3762,7 +4409,9 @@ Fieber Event demo attendance remarks - src/app/child-dev-project/attendance/demo-data/demo-activity-events-generator.service.ts + + src/app/child-dev-project/attendance/demo-data/demo-activity-events-generator.service.ts + 44 @@ -3771,7 +4420,9 @@ kein Informationen Event demo attendance remarks - src/app/child-dev-project/attendance/demo-data/demo-activity-events-generator.service.ts + + src/app/child-dev-project/attendance/demo-data/demo-activity-events-generator.service.ts + 45 @@ -3794,11 +4445,11 @@ src/app/core/config/config-fix.ts - 860 + 873 src/app/core/config/config-fix.ts - 885 + 898 @@ -3811,11 +4462,11 @@ src/app/core/config/config-fix.ts - 768 + 781 src/app/core/config/config-fix.ts - 846 + 859 @@ -3837,12 +4488,17 @@ - class - Klasse + class + + + Klasse + + e.g. 'class 8' The class a child is attending - src/app/child-dev-project/children/child-block/child-block.component.html + src/app/child-dev-project/children/child-block/child-block.component.html + 37 @@ -3851,7 +4507,9 @@ Fälle Dashboard title naming total number of beneficiaries in the system - src/app/child-dev-project/children/dashboard-widgets/children-count-dashboard/children-count-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-count-dashboard/children-count-dashboard.component.html + 6 @@ -3860,7 +4518,9 @@ Tabelle welche eine Aufteilung der Fälle anzeigt Label for children count dashboard - src/app/child-dev-project/children/dashboard-widgets/children-count-dashboard/children-count-dashboard.component.html + + src/app/child-dev-project/children/dashboard-widgets/children-count-dashboard/children-count-dashboard.component.html + 10 @@ -3884,7 +4544,7 @@ Status - Status im Projekt + Status im Projekt Label for the status of a child src/app/child-dev-project/children/model/child.ts @@ -3892,11 +4552,11 @@ src/app/core/config/config-fix.ts - 250 + 263 src/app/core/config/config-fix.ts - 521 + 534 @@ -3949,12 +4609,14 @@ BMI Table header, Short for Body Mass Index - src/app/child-dev-project/children/health-checkup/health-checkup-component/health-checkup.component.ts + + src/app/child-dev-project/children/health-checkup/health-checkup-component/health-checkup.component.ts + 32 src/app/core/config/config-fix.ts - 485 + 498 @@ -3962,7 +4624,9 @@ Dieser wert wird aus den Größen- und Gewicht-Messungen berechnet Tooltip for BMI info - src/app/child-dev-project/children/health-checkup/health-checkup-component/health-checkup.component.ts + + src/app/child-dev-project/children/health-checkup/health-checkup-component/health-checkup.component.ts + 34 @@ -3971,12 +4635,14 @@ Aktivitäten Events of an attendance - src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + + src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + 47 src/app/core/config/config-fix.ts - 841 + 854 @@ -3984,11 +4650,15 @@ Teilgenommen Percentage of people that attended an event - src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + + src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.ts + 53 - src/app/child-dev-project/attendance/attendance-details/attendance-details.component.ts + + src/app/child-dev-project/attendance/attendance-details/attendance-details.component.ts + 29 @@ -4033,7 +4703,9 @@ Fortschritt aktueller Meilensteine Widget title - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 42 @@ -4042,7 +4714,9 @@ Evaluationsziele erreicht Dashboard widget demo tile - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 57 @@ -4051,7 +4725,9 @@ Schulabschlüsse Dashboard widget demo entry - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 59 @@ -4060,7 +4736,9 @@ Schüler:innen in Nachhilfe Dashboard widget demo entry - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 60 @@ -4069,7 +4747,9 @@ Schüler:innen Job gefunden Dashboard widget demo entry - src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + + src/app/features/progress-dashboard-widget/demo-progress-dashboard-widget-generator.service.ts + 61 @@ -4078,7 +4758,9 @@ Fortschritt bearbeiten Edit the progress of one or multiple tasks - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 2 @@ -4088,7 +4770,9 @@ The label of a process or task Process Label - src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html + 13 @@ -4096,7 +4780,9 @@ Progress Widget Fortschritt Widget - src/app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard-config.ts + + src/app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard-config.ts + 24 @@ -4104,7 +4790,9 @@ Table showing organization progress Eine Tabelle welche den Fortschritt der Organisation anzeigt - src/app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.html + + src/app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.html + 8,10 Label for progress dashboard @@ -4114,7 +4802,7 @@ Coaching-Klasse src/app/core/config/config-fix.ts - 886 + 899 src/app/core/config/default-config/default-interaction-types.ts @@ -4126,7 +4814,7 @@ Schulklasse src/app/core/config/config-fix.ts - 861 + 874 src/app/core/config/default-config/default-interaction-types.ts @@ -4137,30 +4825,39 @@ Generating sample data for this demo ... Beispieldaten für diese Demo generieren … - src/app/core/demo-data/demo-data-generating-progress-dialog.component.ts + src/app/core/demo-data/demo-data-generating-progress-dialog.component.ts + 31 - Adding new - Neuer Eintrag + Adding new + + + Neuer Eintrag - src/app/core/entity-components/entity-details/entity-details.component.html + + src/app/core/entity-components/entity-details/entity-details.component.html + 29,30 An entity is a child, note, school, etc. Title when adding a new entity - Delete - Löschen + Delete + Löschen Generic delete button - src/app/core/entity-components/entity-details/entity-details.component.html + + src/app/core/entity-components/entity-details/entity-details.component.html + 60 - src/app/core/entity-components/entity-subrecord/row-details/row-details.component.html + + src/app/core/entity-components/entity-subrecord/row-details/row-details.component.html + 95 @@ -4169,7 +4866,9 @@ Speichere den neuen Eintrag bevor weitere Details angezeigt werden können Tooltip explaining disabled sections when creating new entity - src/app/core/entity-components/entity-details/entity-details.component.html + + src/app/core/entity-components/entity-details/entity-details.component.html + 73 @@ -4178,47 +4877,69 @@ Zurück Generic back button - src/app/core/entity-components/entity-utils/view-title/view-title.component.html + + src/app/core/entity-components/entity-utils/view-title/view-title.component.html + 8 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 34 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 51 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 72 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 90 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 124 - src/app/features/data-import/data-import/data-import.component.html + src/app/features/data-import/data-import/data-import.component.html + 143 - Must be greater than - Muss größer als sein + Must be greater than + + + Muss größer als + + sein + - src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + + src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + 112 - Cannot be greater than - Darf nicht größer als sein + Cannot be greater than + + + Darf nicht größer als + + sein + - src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + + src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + 114 @@ -4226,7 +4947,9 @@ Please enter a valid pattern Format inkorrekt - src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + + src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + 119 @@ -4234,7 +4957,9 @@ This field is required Dieses Feld ist erforderlich - src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + + src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + 122 @@ -4242,7 +4967,9 @@ Please enter a valid email Bitte eine korrekte E-Mail eingeben - src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + + src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + 124 @@ -4250,7 +4977,9 @@ Please enter a valid date Bitte ein korrektes Datum eingeben - src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + + src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + 126 @@ -4258,7 +4987,9 @@ Invalid input Ungültige Eingabe - src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + + src/app/core/entity-components/entity-form/dynamic-form-validators/dynamic-validators.service.ts + 133 @@ -4271,16 +5002,24 @@ - Could not save : - Speichern von fehlgeschlagen: + Could not save: + + + Speichern von + + fehlgeschlagen: + + src/app/core/entity-components/entity-form/entity-form.service.ts 120 - Fields: "" are invalid - Felder "" ungültig + Fields: "" are invalid + + Felder "" ungültig + src/app/core/entity-components/entity-form/entity-form.service.ts 132 @@ -4296,8 +5035,12 @@ - Are you sure you want to delete this ? - Wollen sie wirklich dieses/dieses löschen? + Are you sure you want to delete this? + + Wollen sie wirklich dieses/dieses + + löschen? + src/app/core/entity/entity-remove.service.ts 92,90 @@ -4305,8 +5048,13 @@ Delete confirmation text - Deleted Entity - gelöscht + Deleted Entity + + + + + gelöscht + Deleted Entity information src/app/core/entity/entity-remove.service.ts @@ -4327,24 +5075,30 @@ - Save - Speichern + Save + Speichern Save button for forms - src/app/core/entity-components/entity-subrecord/row-details/row-details.component.html + + src/app/core/entity-components/entity-subrecord/row-details/row-details.component.html + 65 - src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.html + + src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.html + 19 - Cancel - Abbrechen + Cancel + Abbrechen Generic cancel button - src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.html + + src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.html + 29 @@ -4354,7 +5108,8 @@ Allows the user to filter through entities Filter placeholder - src/app/core/entity-components/entity-list/entity-list.component.html + src/app/core/entity-components/entity-list/entity-list.component.html + 109 @@ -4363,25 +5118,28 @@ z.B. Name, Alter Examples of things to filter - src/app/core/entity-components/entity-list/entity-list.component.html + src/app/core/entity-components/entity-list/entity-list.component.html + 114 - Add New - Neu + Add New + Neu - src/app/core/entity-components/entity-list/entity-list.component.html + src/app/core/entity-components/entity-list/entity-list.component.html + 162,168 Add a new entity to a list of multiple entities - Download CSV - Download als CSV + Download CSV + Download als CSV Download list contents as CSV - src/app/core/entity-components/entity-list/entity-list.component.html + src/app/core/entity-components/entity-list/entity-list.component.html + 192 @@ -4389,15 +5147,19 @@ Filter Options Filter - src/app/core/entity-components/entity-list/filter-overlay/filter-overlay.component.html + + src/app/core/entity-components/entity-list/filter-overlay/filter-overlay.component.html + 2 - Close - Schließen + Close + Schließen - src/app/core/entity-components/entity-list/filter-overlay/filter-overlay.component.html + + src/app/core/entity-components/entity-list/filter-overlay/filter-overlay.component.html + 13 @@ -4406,7 +5168,9 @@ Wirklich löschen? Delete confirmation message - src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts + + src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts + 306 @@ -4415,25 +5179,34 @@ Eintrag wurde gelöscht Record deleted info - src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts + + src/app/core/entity-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts + 305 - Show All - Alle anzeigen + Show All + Alle anzeigen All toggle for paginator - src/app/core/entity-components/entity-subrecord/list-paginator/list-paginator.component.html + + src/app/core/entity-components/entity-subrecord/list-paginator/list-paginator.component.html + 9 - This field is read-only. Edit Date of Birth to change age. Select Jan 1st if you only know the year of birth. - Dieses Feld kann nicht verändert werden. Ändern Sie stattdessen das Geburtsdatum. + This field is read-only. Edit Date of Birth to change age. Select Jan 1st if you only know the year of + birth. + + Dieses Feld kann nicht verändert werden. Ändern Sie stattdessen das Geburtsdatum. + Tooltip for the disabled age field - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-age/edit-age.component.html + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-age/edit-age.component.html + 24 @@ -4442,17 +5215,26 @@ Alter Placeholder for the input that displays the age - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-age/edit-age.component.html + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-age/edit-age.component.html + 29 - Add - hinzufügen + Add + + + + + hinzufügen + context Add User(s) Placeholder for input to add entities - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-entity-array/edit-entity-array.component.ts + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-entity-array/edit-entity-array.component.ts + 18 @@ -4460,95 +5242,130 @@ No photo set Kein Bild gespeichert - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-photo/edit-photo.component.html + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-photo/edit-photo.component.html + 7 Placeholer if no photo is available - This field is required - Dieses Feld ist erforderlich + This field is required + Dieses Feld ist erforderlich Error message for any input - src/app/core/configurable-enum/edit-configurable-enum/edit-configurable-enum.component.html + + src/app/core/configurable-enum/edit-configurable-enum/edit-configurable-enum.component.html + 10 - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.html + 48 OK - OK + OK - src/app/core/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts + + src/app/core/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts + 52 Confirmation dialog OK Yes - Ja + Ja - src/app/core/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts + + src/app/core/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts + 63 Confirmation dialog Yes No - Nein + Nein - src/app/core/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts + + src/app/core/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts + 71 Confirmation dialog No Quick actions - Verknüpfungen + Verknüpfungen - src/app/core/dashboard-shortcut-widget/dashboard-shortcut-widget/dashboard-shortcut-widget.component.html + + src/app/core/dashboard-shortcut-widget/dashboard-shortcut-widget/dashboard-shortcut-widget.component.html + 4 - Title of dashboard widget that shows a list of certain actions a user can click on + Title of dashboard widget that shows a list of certain actions a user can + click on + filename for child photo uploaded by server administrator Dateiname für das Foto, welches vom Server-Administrator hochgeladen wurde - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-photo/edit-photo.component.html + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-photo/edit-photo.component.html + 15 Tooltip for edit photo component - Select - auswählen + Select + + + + + auswählen + context Select User Placeholder for input to set an entity - src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts + + src/app/core/entity-components/entity-utils/dynamic-form-components/edit-single-entity/edit-single-entity.component.ts + 39 loading... lädt... - A placeholder for the input element when select options are not loaded yet + A placeholder for the input element when select options are not loaded + yet + - src/app/core/entity-components/entity-utils/entity-select/entity-select.component.ts + + src/app/core/entity-components/entity-utils/entity-select/entity-select.component.ts + 29 - in total - - insgesamt - + + + in total + + + + insgesamt + - src/app/core/entity-components/entity-utils/view-components/display-entity-array/display-entity-array.component.html + + src/app/core/entity-components/entity-utils/view-components/display-entity-array/display-entity-array.component.html + 8,9 context 10 in total @@ -4558,16 +5375,19 @@ Preparing data (Indexing) Daten Vorberiten (Indizieren) - src/app/core/entity/database-indexing/database-indexing.service.ts + src/app/core/entity/database-indexing/database-indexing.service.ts + 58 - Delete - Löschen + Delete + Löschen Generic delete button - src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.html + + src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.html + 45 @@ -4590,7 +5410,7 @@ - More Information + More Information Weitere Informationen Show more information about a change that was made to the app @@ -4599,16 +5419,16 @@ - Show previous changes - Zeige vorangegangene Veränderungen + Show previous changes + Zeige vorangegangene Veränderungen src/app/core/latest-changes/changelog/changelog.component.html 57 - Close - Schließen + Close + Schließen Generic close button src/app/core/latest-changes/changelog/changelog.component.html @@ -4624,8 +5444,12 @@ - Could not load latest changes: - Neuste Änderungen konnten nicht geladen werden: + Could not load latest changes: + + + Neuste Änderungen konnten nicht geladen werden: + + src/app/core/latest-changes/latest-changes.service.ts 129 @@ -4653,13 +5477,15 @@ Ihr Account besitzt nicht die notwendigen Rechte um das zu tun. Missing permission - src/app/core/permissions/permission-directive/disable-entity-operation.directive.ts + + src/app/core/permissions/permission-directive/disable-entity-operation.directive.ts + 35 - Please Sign In - Bitte einloggen + Please Sign In + Bitte einloggen src/app/core/session/login/login.component.html 19 @@ -4689,8 +5515,8 @@ - Login - Login + Login + Login Login button src/app/core/session/login/login.component.html @@ -4699,7 +5525,9 @@ Please connect to the internet and try again - Bitte stellen Sie sicher das Sie eine Internetverbindung haben und versuchen Sie es erneut. + Bitte stellen Sie sicher das Sie eine Internetverbindung haben und versuchen Sie es + erneut. + LoginError src/app/core/session/login/login.component.ts @@ -4732,7 +5560,8 @@ Your password was changed recently. Please retry with your new password! - Ihr Passwort hat sich vor kurzem geändert. Bitte mit dem neuen Passwort versuchen! + Ihr Passwort hat sich vor kurzem geändert. Bitte mit dem neuen Passwort versuchen! + src/app/core/session/session-service/synced-session.service.ts 169 @@ -4757,18 +5586,26 @@ - The following processes are still running in the background. Until these are finished some pages may be slow or incomplete. - Die Folgenden Prozesse laufen noch im Hintergrund ab. Bis diese abgeschlossen sind könnten manche Seiten langsam oder nicht komplett sein. + The following processes are still running in the background. Until these are finished some pages may be + slow or incomplete. + + Die Folgenden Prozesse laufen noch im Hintergrund ab. Bis diese abgeschlossen sind + könnten manche Seiten langsam oder nicht komplett sein. + - src/app/core/sync-status/background-processing-indicator/background-processing-indicator.component.html + + src/app/core/sync-status/background-processing-indicator/background-processing-indicator.component.html + 19 - Continue in background - Im Hintergrund fortsetzen + Continue in background + Im Hintergrund fortsetzen - src/app/core/sync-status/background-processing-indicator/background-processing-indicator.component.html + + src/app/core/sync-status/background-processing-indicator/background-processing-indicator.component.html + 53,57 Hide sync details @@ -4799,8 +5636,14 @@ Search label - Insert at least characters - Mindestens Buchstaben eingeben + Insert at least + + characters + + Mindestens + + Buchstaben eingeben + The user has inserted too few characters to start a search src/app/core/ui/search/search.component.html @@ -4817,8 +5660,8 @@ - Please only enter numbers or letters - Bitte tragen Sie nur Zahlen oder Buchstaben in das Feld ein + Please only enter numbers or letters + Bitte tragen Sie nur Zahlen oder Buchstaben in das Feld ein src/app/core/ui/search/search.component.html 52,57 @@ -4826,8 +5669,18 @@ Invalid characters were entered into the search field - Profile - Profil + + + + Profile + + + + + Profil + Navigate to user profile page src/app/core/ui/ui/ui.component.html @@ -4835,8 +5688,18 @@ - Sign out - Abmelden + + + + Sign out + + + + + Abmelden + Sign out of the app src/app/core/ui/ui/ui.component.html @@ -4862,24 +5725,24 @@ User-Account label - Password change is not allowed in demo mode. - Passwort kann im Demo Modus nicht geändert werden. + Password change is not allowed in demo mode. + Passwort kann im Demo Modus nicht geändert werden. src/app/core/user/user-account/user-account.component.html 39 - Password change is not possible while being offline. - Passwort kann nicht offline geändert werden. + Password change is not possible while being offline. + Passwort kann nicht offline geändert werden. src/app/core/user/user-account/user-account.component.html 45 - retry - Erneut Versuchen + retry + Erneut Versuchen retry switching from offline to online src/app/core/user/user-account/user-account.component.html @@ -4887,26 +5750,31 @@ - Current Password - Aktuelles Passwort + + Aktuelles Passwort + + />"/> + src/app/core/user/user-account/user-account.component.html 58 - Please provide your correct current password for confirmation. - Bitte das korrekte Passwort zur Bestätigung eingeben + Please provide your correct current password for confirmation. + Bitte das korrekte Passwort zur Bestätigung eingeben An incorrect password was entered trying - to change the password + to change the password + Password Confirmation src/app/core/user/user-account/user-account.component.html @@ -4914,16 +5782,22 @@ - New password - Neues Passwort + New password + + + Neues Passwort + + src/app/core/user/user-account/user-account.component.html 79 - Must be at least 8 characters long. - Muss mindestend 8 Zeichen lang sein. + Must be at least 8 characters long. + Muss mindestend 8 Zeichen lang sein. Password validation src/app/core/user/user-account/user-account.component.html @@ -4931,8 +5805,10 @@ - Must contain lower case letters, upper case letters, symbols and numbers to be secure. - Muss Kleinbuchstaben, Großbuchstaben, Symbole und Nummern enthalten um sicher zu sein. + Must contain lower case letters, upper case letters, symbols and numbers to be secure. + Muss Kleinbuchstaben, Großbuchstaben, Symbole und Nummern enthalten um sicher zu + sein. + Illegal password pattern src/app/core/user/user-account/user-account.component.html @@ -4940,24 +5816,28 @@ - Confirm new password - Neues Passwort bestätigen + + Neues Passwort bestätigen + + />"/> + src/app/core/user/user-account/user-account.component.html 102 - Confirmation does not match your new password. - Bestätigtes Passwort stimmt nicht mit dem neuen überein. + Confirmation does not match your new password. + Bestätigtes Passwort stimmt nicht mit dem neuen überein. Illegal new password src/app/core/user/user-account/user-account.component.html @@ -4965,24 +5845,32 @@ - Password changed successfully. - Passwort erfolgreich geändert. + Password changed successfully. + Passwort erfolgreich geändert. src/app/core/user/user-account/user-account.component.html 123 - Failed to change password: Please try again. If the problem persists contact Aam Digital support. - Passwort konnte nicht geändert werden: Please try again. If the problem persists contact Aam Digital support. + Failed to change password: + + + Please try again. If the problem persists contact Aam Digital support. + + Passwort konnte nicht geändert werden: + + + Please try again. If the problem persists contact Aam Digital support. + src/app/core/user/user-account/user-account.component.html 126,130 - Change Password - Passwort ändern + Change Password + Passwort ändern Change password button src/app/core/user/user-account/user-account.component.html @@ -5002,17 +5890,21 @@ Building application Bereite Applikation vor - src/app/core/view/dynamic-routing/empty/application-loading.component.html + + src/app/core/view/dynamic-routing/empty/application-loading.component.html + 2 Sync notification line 1 - The application will be ready in a moment - Gleich können Sie loslegen + The application will be ready in a moment + Gleich können Sie loslegen Sync notification line 2 - src/app/core/view/dynamic-routing/empty/application-loading.component.html + + src/app/core/view/dynamic-routing/empty/application-loading.component.html + 3 @@ -5020,15 +5912,19 @@ Page Not Found Seite nicht gefunden - src/app/core/view/dynamic-routing/not-found/not-found.component.html + src/app/core/view/dynamic-routing/not-found/not-found.component.html + 2 Either the page has been removed or you don't have the required permissions to view this page. - Die Seite wurde entweder gelöscht oder Sie besitzen nicht die notwendigen Berechtigungen diese zu sehen. + Die Seite wurde entweder gelöscht oder Sie besitzen nicht die notwendigen + Berechtigungen diese zu sehen. + - src/app/core/view/dynamic-routing/not-found/not-found.component.html + src/app/core/view/dynamic-routing/not-found/not-found.component.html + 4 @@ -5036,7 +5932,8 @@ Go to Dashboard Zum Dashboard - src/app/core/view/dynamic-routing/not-found/not-found.component.html + src/app/core/view/dynamic-routing/not-found/not-found.component.html + 5 @@ -5049,44 +5946,55 @@ - Save - Speichern + Save + Speichern Save button for forms - src/app/core/entity-components/entity-form/entity-form/entity-form.component.html + + src/app/core/entity-components/entity-form/entity-form/entity-form.component.html + 10 - Cancel - Abbrechen + Cancel + Abbrechen - src/app/core/entity-components/entity-form/entity-form/entity-form.component.html + + src/app/core/entity-components/entity-form/entity-form/entity-form.component.html + 20,25 Cancel button for forms - Edit - Bearbeiten + Edit + Bearbeiten - src/app/core/entity-components/entity-form/entity-form/entity-form.component.html + + src/app/core/entity-components/entity-form/entity-form/entity-form.component.html + 34,40 Edit button for forms - Add New - Neu + Add New + Neu - src/app/core/entity-components/entity-list/entity-list.component.html + src/app/core/entity-components/entity-list/entity-list.component.html + 38,45 Add a new entity to a list of multiple entities - not - nicht + not + + + nicht + + src/app/features/reporting/report-row.ts 31 @@ -5095,8 +6003,12 @@ Not a certain property - without - Ohne + without + + + Ohne + + src/app/features/reporting/report-row.ts 33 @@ -5108,16 +6020,20 @@ Table showing the report results Eine Tabelle welche die Ergebnisse des Reports anzeigt - src/app/features/reporting/reporting/object-table/object-table.component.html + + src/app/features/reporting/reporting/object-table/object-table.component.html + 5 Label for table showing report result - Reports - + Reports + Berichte - Reports concern a group of for example children and include data about these children in a certain date range + Reports concern a group of for example children and include data about + these children in a certain date range + src/app/features/reporting/reporting/reporting.component.html 4 @@ -5125,18 +6041,22 @@ Reports have not been configured for you yet. - Die Berichte wurden noch nicht konfiguriert. + Die Berichte wurden noch nicht konfiguriert. - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 2 - Ask for a setup call + Ask for a setup call Um einen Termin zur Hilfe bei der Einrichtung bitten Button if no reports are configured yet - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 7 @@ -5144,7 +6064,9 @@ Select Report Einen Bericht auswählen - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 16 @@ -5152,7 +6074,9 @@ Enter a date range von – bis - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 25 @@ -5161,7 +6085,9 @@ Anfang Date selection for the reporting - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 31 @@ -5170,25 +6096,31 @@ Ende Date selection for the reporting - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 37 - Calculate - Berechnen + Calculate + Berechnen Calculate the results for a report - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 57 - Download - Herunterladen + Download + Herunterladen Button to download data - src/app/features/reporting/reporting/select-report/select-report.component.html + + src/app/features/reporting/reporting/select-report/select-report.component.html + 79 @@ -5202,8 +6134,8 @@ - To install the app - Um die App zu installieren, klicken Sie + To install the app + Um die App zu installieren, klicken Sie PWA iOS Install Instructions - Line 1 src/app/core/pwa-install/pwa-install.component.html @@ -5211,8 +6143,8 @@ - tap on - unten auf + tap on + unten auf PWA iOS Install Instructions - Line 2-1 src/app/core/pwa-install/pwa-install.component.html @@ -5220,7 +6152,7 @@ - at the bottom + at the bottom PWA iOS Install Instructions - Line 2-2 @@ -5229,8 +6161,8 @@ - and then tap on - und dann auf + and then tap on + und dann auf PWA iOS Install Instructions - Line 3-1 src/app/core/pwa-install/pwa-install.component.html @@ -5238,8 +6170,8 @@ - (Add to Homescreen). - (Zum Home-Bildschirm). + (Add to Homescreen). + (Zum Home-Bildschirm). PWA iOS Install Instructions - Line 3-2 src/app/core/pwa-install/pwa-install.component.html @@ -5247,16 +6179,32 @@ - 0 in - 0 von + 0 in + + + 0 von + + src/app/core/language/TranslatableMatPaginator.ts 8 - - of - - von + + + - + + of + + + + + - + + von + + src/app/core/language/TranslatableMatPaginator.ts 18 diff --git a/src/assets/locale/messages.fr.xlf b/src/assets/locale/messages.fr.xlf index 51380b0ff0..b7bea2df16 100644 --- a/src/assets/locale/messages.fr.xlf +++ b/src/assets/locale/messages.fr.xlf @@ -85,7 +85,7 @@ src/app/core/config/config-fix.ts - 999 + 1012 @@ -94,11 +94,11 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 13 + 14 src/app/child-dev-project/children/aser/model/skill-levels.ts - 38 + 40 @@ -107,7 +107,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 42 + 44 @@ -116,7 +116,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 46 + 48 @@ -125,7 +125,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 50 + 52 @@ -134,7 +134,7 @@ Label math level src/app/child-dev-project/children/aser/model/skill-levels.ts - 54 + 56 @@ -143,7 +143,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 17 + 18 @@ -152,7 +152,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 21 + 22 @@ -161,7 +161,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 25 + 26 @@ -170,7 +170,7 @@ Label reading level src/app/child-dev-project/children/aser/model/skill-levels.ts - 29 + 30 @@ -234,7 +234,7 @@ src/app/core/config/config-fix.ts - 841 + 854 @@ -442,13 +442,13 @@ Remarks Observations - - src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 35,38 - Placeholder if no remarks for the attendance of a child are given Remarks + + src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html + 36 + All excused (out of ) @@ -738,11 +738,11 @@ src/app/core/config/config-fix.ts - 460 + 473 src/app/core/config/config-fix.ts - 571 + 584 @@ -818,11 +818,11 @@ src/app/core/config/config-fix.ts - 860 + 873 src/app/core/config/config-fix.ts - 885 + 898 @@ -835,11 +835,11 @@ src/app/core/config/config-fix.ts - 768 + 781 src/app/core/config/config-fix.ts - 846 + 859 @@ -901,11 +901,11 @@ src/app/core/config/config-fix.ts - 377 + 390 src/app/core/config/config-fix.ts - 562 + 575 src/app/core/entity-components/entity-list/filter-generator.service.ts @@ -950,7 +950,7 @@ yrs + <tr mat-r"/> yrs yrs @@ -995,7 +995,7 @@ src/app/core/config/config-fix.ts - 712 + 725 @@ -1012,7 +1012,7 @@ src/app/core/config/config-fix.ts - 129 + 136 @@ -1025,7 +1025,7 @@ src/app/core/config/config-fix.ts - 133 + 140 @@ -1038,7 +1038,7 @@ src/app/core/config/config-fix.ts - 137 + 144 @@ -1130,19 +1130,19 @@ src/app/core/config/config-fix.ts - 445 + 458 src/app/core/config/config-fix.ts - 864 + 877 src/app/core/config/config-fix.ts - 889 + 902 src/app/core/config/config-fix.ts - 957 + 970 @@ -1218,11 +1218,11 @@ src/app/core/config/config-fix.ts - 250 + 263 src/app/core/config/config-fix.ts - 521 + 534 @@ -1271,7 +1271,7 @@ src/app/core/config/config-fix.ts - 985 + 998 @@ -1293,7 +1293,7 @@ src/app/core/config/config-fix.ts - 455 + 468 @@ -1579,7 +1579,7 @@ src/app/core/config/config-fix.ts - 485 + 498 @@ -2139,7 +2139,7 @@ src/app/core/config/config-fix.ts - 559 + 572 @@ -2338,7 +2338,7 @@ src/app/child-dev-project/warning-levels.ts - 14 + 15 @@ -2377,6 +2377,25 @@ 14 + + Notes needing follow-up + Notes needing follow-up + + src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html + 4 + + dashboard showing notes that require action + subtitle + + + no notes that need immediate attention + no notes that need immediate attention + + src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html + 48,50 + + Description when there are no notes that need a follow-up + Clubs visited Clubs visités @@ -2688,20 +2707,20 @@ Solved Résolu + Label warning level src/app/child-dev-project/warning-levels.ts - 10 + 11 - Label warning level Urgent Follow-Up Suivi urgent + Label warning level src/app/child-dev-project/warning-levels.ts - 18 + 19 - Label warning level Conflicting Entity: @@ -2932,7 +2951,7 @@ src/app/core/config/config-fix.ts - 374 + 387 @@ -2941,7 +2960,7 @@ Title of recurring activities overview src/app/core/config/config-fix.ts - 733 + 746 @@ -2972,7 +2991,7 @@ src/app/core/config/config-fix.ts - 307 + 320 @@ -3008,7 +3027,7 @@ Document status src/app/core/config/config-fix.ts - 103 + 104 @@ -3017,7 +3036,7 @@ Document status src/app/core/config/config-fix.ts - 107 + 109 @@ -3026,7 +3045,7 @@ Document status src/app/core/config/config-fix.ts - 111 + 114 @@ -3035,7 +3054,7 @@ Document status src/app/core/config/config-fix.ts - 115 + 119 @@ -3044,7 +3063,7 @@ Document status src/app/core/config/config-fix.ts - 119 + 124 @@ -3053,7 +3072,7 @@ Document status src/app/core/config/config-fix.ts - 123 + 129 @@ -3063,7 +3082,7 @@ Dashboard shortcut widget src/app/core/config/config-fix.ts - 151 + 158 @@ -3073,7 +3092,7 @@ Dashboard shortcut widget src/app/core/config/config-fix.ts - 156 + 163 @@ -3082,7 +3101,7 @@ Attendance week dashboard widget label src/app/core/config/config-fix.ts - 186 + 199 @@ -3091,7 +3110,7 @@ Attendance week dashboard widget label src/app/core/config/config-fix.ts - 193 + 206 @@ -3100,11 +3119,11 @@ Title for notes overview src/app/core/config/config-fix.ts - 214 + 227 src/app/core/config/config-fix.ts - 658 + 671 @@ -3113,11 +3132,11 @@ Translated name of default column group src/app/core/config/config-fix.ts - 224 + 237 src/app/core/config/config-fix.ts - 228 + 241 @@ -3126,19 +3145,19 @@ Translated name of mobile column group src/app/core/config/config-fix.ts - 225 + 238 src/app/core/config/config-fix.ts - 238 + 251 src/app/core/config/config-fix.ts - 492 + 505 src/app/core/config/config-fix.ts - 545 + 558 @@ -3147,7 +3166,7 @@ Panel title src/app/core/config/config-fix.ts - 319 + 332 @@ -3156,7 +3175,7 @@ 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 - 352 + 365 @@ -3165,7 +3184,7 @@ Title of schools overview src/app/core/config/config-fix.ts - 364 + 377 @@ -3174,7 +3193,7 @@ Label for private schools filter - true case src/app/core/config/config-fix.ts - 375 + 388 @@ -3183,7 +3202,7 @@ Label for private schools filter - false case src/app/core/config/config-fix.ts - 376 + 389 @@ -3193,7 +3212,7 @@ Title when adding new entity src/app/core/config/config-fix.ts - 386 + 399 @@ -3202,7 +3221,7 @@ Label for if a school is a private school src/app/core/config/config-fix.ts - 964 + 977 @@ -3211,15 +3230,15 @@ Panel title src/app/core/config/config-fix.ts - 389 + 402 src/app/core/config/config-fix.ts - 584 + 597 src/app/core/config/config-fix.ts - 753 + 766 @@ -3228,7 +3247,7 @@ Panel title src/app/core/config/config-fix.ts - 417 + 430 @@ -3237,7 +3256,7 @@ Panel title src/app/core/config/config-fix.ts - 426 + 439 @@ -3246,7 +3265,7 @@ Title children overview src/app/core/config/config-fix.ts - 441 + 454 @@ -3255,7 +3274,7 @@ Column label for age of child src/app/core/config/config-fix.ts - 450 + 463 @@ -3264,7 +3283,7 @@ Column label for school attendance of child src/app/core/config/config-fix.ts - 467 + 480 @@ -3273,7 +3292,7 @@ Column label for coaching attendance of child src/app/core/config/config-fix.ts - 476 + 489 @@ -3282,7 +3301,7 @@ Column group name src/app/core/config/config-fix.ts - 508 + 521 @@ -3291,11 +3310,11 @@ Translated name of default column group src/app/core/config/config-fix.ts - 491 + 504 src/app/core/config/config-fix.ts - 495 + 508 @@ -3304,11 +3323,11 @@ Column group name src/app/core/config/config-fix.ts - 531 + 544 src/app/core/config/config-fix.ts - 667 + 680 @@ -3317,7 +3336,7 @@ Active children filter label - true case src/app/core/config/config-fix.ts - 560 + 573 @@ -3326,7 +3345,7 @@ Active children filter label - false case src/app/core/config/config-fix.ts - 561 + 574 @@ -3335,7 +3354,7 @@ Header for form section src/app/core/config/config-fix.ts - 611 + 624 @@ -3344,7 +3363,7 @@ Header for form section src/app/core/config/config-fix.ts - 612 + 625 @@ -3353,7 +3372,7 @@ Header for form section src/app/core/config/config-fix.ts - 613 + 626 @@ -3362,7 +3381,7 @@ Panel title src/app/core/config/config-fix.ts - 620 + 633 @@ -3371,7 +3390,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 623 + 636 @@ -3380,7 +3399,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 643 + 656 @@ -3393,7 +3412,7 @@ src/app/core/config/config-fix.ts - 649 + 662 @@ -3402,7 +3421,7 @@ Title inside a panel src/app/core/config/config-fix.ts - 680 + 693 @@ -3411,7 +3430,7 @@ Panel title src/app/core/config/config-fix.ts - 686 + 699 @@ -3420,7 +3439,7 @@ Panel title src/app/core/config/config-fix.ts - 695 + 708 @@ -3429,7 +3448,7 @@ Panel title src/app/core/config/config-fix.ts - 782 + 795 @@ -3438,7 +3457,7 @@ Name of a report src/app/core/config/config-fix.ts - 798 + 811 @@ -3447,7 +3466,7 @@ Label of report query src/app/core/config/config-fix.ts - 802 + 815 @@ -3456,7 +3475,7 @@ Label for report query src/app/core/config/config-fix.ts - 807 + 820 @@ -3465,7 +3484,7 @@ Label for report query src/app/core/config/config-fix.ts - 810 + 823 @@ -3474,7 +3493,7 @@ Label for report query src/app/core/config/config-fix.ts - 814 + 827 @@ -3483,7 +3502,7 @@ Label for report query src/app/core/config/config-fix.ts - 819 + 832 @@ -3492,7 +3511,7 @@ Label for report query src/app/core/config/config-fix.ts - 823 + 836 @@ -3501,7 +3520,7 @@ Label for report query src/app/core/config/config-fix.ts - 828 + 841 @@ -3510,7 +3529,7 @@ Name of a report src/app/core/config/config-fix.ts - 836 + 849 @@ -3519,7 +3538,7 @@ Name of a report src/app/core/config/config-fix.ts - 853 + 866 @@ -3528,11 +3547,11 @@ Name of a column of a report src/app/core/config/config-fix.ts - 868 + 881 src/app/core/config/config-fix.ts - 893 + 906 @@ -3541,11 +3560,11 @@ Name of a column of a report src/app/core/config/config-fix.ts - 872 + 885 src/app/core/config/config-fix.ts - 897 + 910 @@ -3554,11 +3573,11 @@ Name of a column of a report src/app/core/config/config-fix.ts - 876 + 889 src/app/core/config/config-fix.ts - 901 + 914 @@ -3567,11 +3586,11 @@ Label for the address of a child src/app/core/config/config-fix.ts - 918 + 931 src/app/core/config/config-fix.ts - 978 + 991 @@ -3580,7 +3599,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 925 + 938 @@ -3589,7 +3608,7 @@ Label for the religion of a child src/app/core/config/config-fix.ts - 932 + 945 @@ -3598,7 +3617,7 @@ Label for the mother tongue of a child src/app/core/config/config-fix.ts - 939 + 952 @@ -3607,7 +3626,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 946 + 959 @@ -3616,7 +3635,7 @@ Label for the language of a school src/app/core/config/config-fix.ts - 971 + 984 @@ -3625,7 +3644,7 @@ Label for the timing of a school src/app/core/config/config-fix.ts - 992 + 1005 @@ -3634,7 +3653,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1011 + 1024 @@ -3643,7 +3662,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1012 + 1025 @@ -3652,7 +3671,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1020 + 1033 @@ -3661,7 +3680,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1021 + 1034 @@ -3670,7 +3689,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1029 + 1042 @@ -3679,7 +3698,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1030 + 1043 @@ -3688,7 +3707,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1038 + 1051 @@ -3697,7 +3716,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1039 + 1052 @@ -3706,7 +3725,7 @@ Label for a child attribute src/app/core/config/config-fix.ts - 1047 + 1060 @@ -3715,7 +3734,7 @@ Description for a child attribute src/app/core/config/config-fix.ts - 1048 + 1061 @@ -3724,7 +3743,7 @@ Label of user email src/app/core/config/config-fix.ts - 1059 + 1072 @@ -3733,7 +3752,7 @@ Label of user phone src/app/core/config/config-fix.ts - 1066 + 1079 @@ -3817,7 +3836,7 @@ Session de formation src/app/core/config/config-fix.ts - 886 + 899 src/app/core/config/default-config/default-interaction-types.ts @@ -3829,7 +3848,7 @@ Classe src/app/core/config/config-fix.ts - 861 + 874 src/app/core/config/default-config/default-interaction-types.ts @@ -5035,7 +5054,7 @@ Entity Type: + <p i"/> Entity Type: Data import Final overview @@ -5045,7 +5064,7 @@ CSV File: + <p i"/> CSV File: Data import Final overview @@ -5056,7 +5075,7 @@ TransactionID: + <di"/> TransactionID: Data import Final overview @@ -5097,7 +5116,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 4 + 10 @@ -5106,7 +5125,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 8 + 14 @@ -5115,7 +5134,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 12 + 18 @@ -5124,7 +5143,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 16 + 22 @@ -5133,7 +5152,7 @@ Rating answer src/app/features/historical-data/model/rating-answers.ts - 20 + 6 diff --git a/src/assets/locale/messages.xlf b/src/assets/locale/messages.xlf index c9245e6f51..c95ac688ac 100644 --- a/src/assets/locale/messages.xlf +++ b/src/assets/locale/messages.xlf @@ -6,7 +6,7 @@ Activate to also show entries for the activity that do not have any events with actual participation of this person src/app/child-dev-project/attendance/activity-attendance-section/activity-attendance-section.component.html - 41,49 + 41,50 Tooltip that will appear when hovered over the show-unrelated button @@ -56,7 +56,7 @@ src/app/core/config/config-fix.ts - 841 + 854 Events of an attendance @@ -157,7 +157,7 @@ Date src/app/child-dev-project/attendance/add-day-attendance/roll-call-setup/roll-call-setup.component.html - 10,16 + 10,17 Record an event for a particular date that is to be inputted @@ -210,7 +210,7 @@ Review Details src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html - 92,98 + 92,99 Open details of recorded event for review @@ -245,7 +245,7 @@ Remarks src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 35,43 + 36,43 Placeholder if no remarks for the attendance of a child are given @@ -255,7 +255,7 @@ All excused (out of ) src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 51,54 + 51,55 How many participants attended at an event (in percent) @@ -283,7 +283,7 @@ without recorded status src/app/child-dev-project/attendance/attendance-calendar/attendance-calendar.component.html - 67,69 + 67,70 How many children are without a status Unknown status @@ -555,11 +555,11 @@ src/app/core/config/config-fix.ts - 860 + 873 src/app/core/config/config-fix.ts - 885 + 898 Label for the interaction type of a recurring activity @@ -571,11 +571,11 @@ src/app/core/config/config-fix.ts - 768 + 781 src/app/core/config/config-fix.ts - 846 + 859 Label for the participants of a recurring activity @@ -671,7 +671,7 @@ src/app/core/config/config-fix.ts - 999 + 1012 Label for the remarks of a ASER result @@ -679,11 +679,11 @@ Nothing src/app/child-dev-project/children/aser/model/skill-levels.ts - 13 + 14 src/app/child-dev-project/children/aser/model/skill-levels.ts - 38 + 40 Label reading level @@ -691,7 +691,7 @@ Read Letters src/app/child-dev-project/children/aser/model/skill-levels.ts - 17 + 18 Label reading level @@ -699,7 +699,7 @@ Read Words src/app/child-dev-project/children/aser/model/skill-levels.ts - 21 + 22 Label reading level @@ -707,7 +707,7 @@ Read Sentence src/app/child-dev-project/children/aser/model/skill-levels.ts - 25 + 26 Label reading level @@ -715,7 +715,7 @@ Read Paragraph src/app/child-dev-project/children/aser/model/skill-levels.ts - 29 + 30 Label reading level @@ -723,7 +723,7 @@ Numbers 1-9 src/app/child-dev-project/children/aser/model/skill-levels.ts - 42 + 44 Label math level @@ -731,7 +731,7 @@ Numbers 10-99 src/app/child-dev-project/children/aser/model/skill-levels.ts - 46 + 48 Label math level @@ -739,7 +739,7 @@ Subtraction src/app/child-dev-project/children/aser/model/skill-levels.ts - 50 + 52 Label math level @@ -747,7 +747,7 @@ Division src/app/child-dev-project/children/aser/model/skill-levels.ts - 54 + 56 Label math level @@ -780,14 +780,14 @@ Children whose birthday is soon src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html - 8,12 + 8,13 Tooltip for the birthday widget yrs + <tr mat-r"/> yrs src/app/child-dev-project/children/dashboard-widgets/birthday-dashboard/birthday-dashboard.component.html 29,30 @@ -809,7 +809,7 @@ src/app/child-dev-project/children/dashboard-widgets/children-bmi-dashboard/children-bmi-dashboard.component.html - 16,18 + 16,19 Subtitle of the BMI dashboard component @@ -874,7 +874,7 @@ src/app/core/config/config-fix.ts - 712 + 725 Child status @@ -890,7 +890,7 @@ src/app/core/config/config-fix.ts - 129 + 136 center @@ -902,7 +902,7 @@ src/app/core/config/config-fix.ts - 133 + 140 center @@ -914,7 +914,7 @@ src/app/core/config/config-fix.ts - 137 + 144 center @@ -1156,7 +1156,7 @@ src/app/core/config/config-fix.ts - 485 + 498 Table header, Short for Body Mass Index @@ -1196,19 +1196,19 @@ src/app/core/config/config-fix.ts - 445 + 458 src/app/core/config/config-fix.ts - 864 + 877 src/app/core/config/config-fix.ts - 889 + 902 src/app/core/config/config-fix.ts - 957 + 970 Label for the name of a child @@ -1276,11 +1276,11 @@ src/app/core/config/config-fix.ts - 250 + 263 src/app/core/config/config-fix.ts - 521 + 534 Label for the status of a child @@ -1324,7 +1324,7 @@ src/app/core/config/config-fix.ts - 985 + 998 Label for the phone number of a child @@ -1348,11 +1348,11 @@ src/app/core/config/config-fix.ts - 460 + 473 src/app/core/config/config-fix.ts - 571 + 584 Label for the school of a relation @@ -1364,7 +1364,7 @@ src/app/core/config/config-fix.ts - 455 + 468 Label for the class of a relation @@ -1464,6 +1464,23 @@ Explanation for missing currently active entry - part 2 of 2: + + Notes needing follow-up + + src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html + 4 + + dashboard showing notes that require action + subtitle + + + no notes that need immediate attention + + src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html + 48,50 + + Description when there are no notes that need a follow-up + src/app/core/config/config-fix.ts - 559 + 572 Label for the children of a note @@ -2050,7 +2067,7 @@ src/app/child-dev-project/warning-levels.ts - 14 + 15 Filter-option for notes @@ -2066,11 +2083,11 @@ src/app/core/config/config-fix.ts - 377 + 390 src/app/core/config/config-fix.ts - 562 + 575 src/app/core/entity-components/entity-list/filter-generator.service.ts @@ -2188,7 +2205,7 @@ Solved src/app/child-dev-project/warning-levels.ts - 10 + 11 Label warning level @@ -2196,7 +2213,7 @@ Urgent Follow-Up src/app/child-dev-project/warning-levels.ts - 18 + 19 Label warning level @@ -2383,7 +2400,7 @@ src/app/core/config/config-fix.ts - 374 + 387 Menu item @@ -2395,7 +2412,7 @@ src/app/core/config/config-fix.ts - 649 + 662 Menu item @@ -2423,7 +2440,7 @@ src/app/core/config/config-fix.ts - 307 + 320 Menu item @@ -2455,7 +2472,7 @@ OK (copy with us) src/app/core/config/config-fix.ts - 103 + 104 Document status @@ -2463,7 +2480,7 @@ OK (copy needed for us) src/app/core/config/config-fix.ts - 107 + 109 Document status @@ -2471,7 +2488,7 @@ needs correction src/app/core/config/config-fix.ts - 111 + 114 Document status @@ -2479,7 +2496,7 @@ applied src/app/core/config/config-fix.ts - 115 + 119 Document status @@ -2487,7 +2504,7 @@ doesn't have src/app/core/config/config-fix.ts - 119 + 124 Document status @@ -2495,7 +2512,7 @@ not eligible src/app/core/config/config-fix.ts - 123 + 129 Document status @@ -2503,7 +2520,7 @@ Record Attendance src/app/core/config/config-fix.ts - 151 + 158 record attendance shortcut Dashboard shortcut widget @@ -2512,7 +2529,7 @@ Add Child src/app/core/config/config-fix.ts - 156 + 163 record attendance shortcut Dashboard shortcut widget @@ -2521,7 +2538,7 @@ last week src/app/core/config/config-fix.ts - 186 + 199 Attendance week dashboard widget label @@ -2529,7 +2546,7 @@ this week src/app/core/config/config-fix.ts - 193 + 206 Attendance week dashboard widget label @@ -2537,11 +2554,11 @@ Notes & Reports src/app/core/config/config-fix.ts - 214 + 227 src/app/core/config/config-fix.ts - 658 + 671 Title for notes overview @@ -2549,11 +2566,11 @@ Standard src/app/core/config/config-fix.ts - 224 + 237 src/app/core/config/config-fix.ts - 228 + 241 Translated name of default column group @@ -2561,19 +2578,19 @@ Mobile src/app/core/config/config-fix.ts - 225 + 238 src/app/core/config/config-fix.ts - 238 + 251 src/app/core/config/config-fix.ts - 492 + 505 src/app/core/config/config-fix.ts - 545 + 558 Translated name of mobile column group @@ -2581,7 +2598,7 @@ User Information src/app/core/config/config-fix.ts - 319 + 332 Panel title @@ -2589,7 +2606,7 @@ assets/help/help.en.md src/app/core/config/config-fix.ts - 352 + 365 Filename of markdown help page (make sure the filename you enter as a translation actually exists on the server!) @@ -2597,7 +2614,7 @@ Schools List src/app/core/config/config-fix.ts - 364 + 377 Title of schools overview @@ -2605,7 +2622,7 @@ Private src/app/core/config/config-fix.ts - 375 + 388 Label for private schools filter - true case @@ -2613,7 +2630,7 @@ Government src/app/core/config/config-fix.ts - 376 + 389 Label for private schools filter - false case @@ -2621,7 +2638,7 @@ School or Group src/app/core/config/config-fix.ts - 386 + 399 e.g. Add new School or Group Title when adding new entity @@ -2630,15 +2647,15 @@ Basic Information src/app/core/config/config-fix.ts - 389 + 402 src/app/core/config/config-fix.ts - 584 + 597 src/app/core/config/config-fix.ts - 753 + 766 Panel title @@ -2646,7 +2663,7 @@ Students src/app/core/config/config-fix.ts - 417 + 430 Panel title @@ -2654,7 +2671,7 @@ Activities src/app/core/config/config-fix.ts - 426 + 439 Panel title @@ -2662,7 +2679,7 @@ Children List src/app/core/config/config-fix.ts - 441 + 454 Title children overview @@ -2670,7 +2687,7 @@ Age src/app/core/config/config-fix.ts - 450 + 463 Column label for age of child @@ -2678,7 +2695,7 @@ Attendance (School) src/app/core/config/config-fix.ts - 467 + 480 Column label for school attendance of child @@ -2686,7 +2703,7 @@ Attendance (Coaching) src/app/core/config/config-fix.ts - 476 + 489 Column label for coaching attendance of child @@ -2694,11 +2711,11 @@ Basic Info src/app/core/config/config-fix.ts - 491 + 504 src/app/core/config/config-fix.ts - 495 + 508 Translated name of default column group @@ -2706,7 +2723,7 @@ School Info src/app/core/config/config-fix.ts - 508 + 521 Column group name @@ -2714,11 +2731,11 @@ Health src/app/core/config/config-fix.ts - 531 + 544 src/app/core/config/config-fix.ts - 667 + 680 Column group name @@ -2726,7 +2743,7 @@ Active src/app/core/config/config-fix.ts - 560 + 573 Active children filter label - true case @@ -2734,7 +2751,7 @@ Inactive src/app/core/config/config-fix.ts - 561 + 574 Active children filter label - false case @@ -2742,7 +2759,7 @@ Personal Information src/app/core/config/config-fix.ts - 611 + 624 Header for form section @@ -2750,7 +2767,7 @@ Additional src/app/core/config/config-fix.ts - 612 + 625 Header for form section @@ -2758,7 +2775,7 @@ Scholar activities src/app/core/config/config-fix.ts - 613 + 626 Header for form section @@ -2766,7 +2783,7 @@ Education src/app/core/config/config-fix.ts - 620 + 633 Panel title @@ -2774,7 +2791,7 @@ School History src/app/core/config/config-fix.ts - 623 + 636 Title inside a panel @@ -2782,7 +2799,7 @@ ASER Results src/app/core/config/config-fix.ts - 643 + 656 Title inside a panel @@ -2790,7 +2807,7 @@ Height & Weight Tracking src/app/core/config/config-fix.ts - 680 + 693 Title inside a panel @@ -2798,7 +2815,7 @@ Educational Materials src/app/core/config/config-fix.ts - 686 + 699 Panel title @@ -2806,7 +2823,7 @@ Observations src/app/core/config/config-fix.ts - 695 + 708 Panel title @@ -2814,7 +2831,7 @@ Recurring Activities src/app/core/config/config-fix.ts - 733 + 746 Title of recurring activities overview @@ -2822,7 +2839,7 @@ Events & Attendance src/app/core/config/config-fix.ts - 782 + 795 Panel title @@ -2830,7 +2847,7 @@ Basic Report src/app/core/config/config-fix.ts - 798 + 811 Name of a report @@ -2838,7 +2855,7 @@ All children src/app/core/config/config-fix.ts - 802 + 815 Label of report query @@ -2846,7 +2863,7 @@ All schools src/app/core/config/config-fix.ts - 807 + 820 Label for report query @@ -2854,7 +2871,7 @@ Children attending a school src/app/core/config/config-fix.ts - 810 + 823 Label for report query @@ -2862,7 +2879,7 @@ Governmental schools src/app/core/config/config-fix.ts - 814 + 827 Label for report query @@ -2870,7 +2887,7 @@ Children attending a governmental school src/app/core/config/config-fix.ts - 819 + 832 Label for report query @@ -2878,7 +2895,7 @@ Private schools src/app/core/config/config-fix.ts - 823 + 836 Label for report query @@ -2886,7 +2903,7 @@ Children attending a private school src/app/core/config/config-fix.ts - 828 + 841 Label for report query @@ -2894,7 +2911,7 @@ Event Report src/app/core/config/config-fix.ts - 836 + 849 Name of a report @@ -2902,7 +2919,7 @@ Attendance Report src/app/core/config/config-fix.ts - 853 + 866 Name of a report @@ -2910,7 +2927,7 @@ School Class src/app/core/config/config-fix.ts - 861 + 874 src/app/core/config/default-config/default-interaction-types.ts @@ -2921,11 +2938,11 @@ Total src/app/core/config/config-fix.ts - 868 + 881 src/app/core/config/config-fix.ts - 893 + 906 Name of a column of a report @@ -2933,11 +2950,11 @@ Present src/app/core/config/config-fix.ts - 872 + 885 src/app/core/config/config-fix.ts - 897 + 910 Name of a column of a report @@ -2945,11 +2962,11 @@ Rate src/app/core/config/config-fix.ts - 876 + 889 src/app/core/config/config-fix.ts - 901 + 914 Name of a column of a report @@ -2957,7 +2974,7 @@ Coaching Class src/app/core/config/config-fix.ts - 886 + 899 src/app/core/config/default-config/default-interaction-types.ts @@ -2968,11 +2985,11 @@ Address src/app/core/config/config-fix.ts - 918 + 931 src/app/core/config/config-fix.ts - 978 + 991 Label for the address of a child @@ -2980,7 +2997,7 @@ Blood Group src/app/core/config/config-fix.ts - 925 + 938 Label for a child attribute @@ -2988,7 +3005,7 @@ Religion src/app/core/config/config-fix.ts - 932 + 945 Label for the religion of a child @@ -2996,7 +3013,7 @@ Mother Tongue src/app/core/config/config-fix.ts - 939 + 952 Label for the mother tongue of a child @@ -3004,7 +3021,7 @@ Last Dental Check-Up src/app/core/config/config-fix.ts - 946 + 959 Label for a child attribute @@ -3012,7 +3029,7 @@ Private School src/app/core/config/config-fix.ts - 964 + 977 Label for if a school is a private school @@ -3020,7 +3037,7 @@ Language src/app/core/config/config-fix.ts - 971 + 984 Label for the language of a school @@ -3028,7 +3045,7 @@ School Timing src/app/core/config/config-fix.ts - 992 + 1005 Label for the timing of a school @@ -3036,7 +3053,7 @@ Motivated src/app/core/config/config-fix.ts - 1011 + 1024 Label for a child attribute @@ -3044,7 +3061,7 @@ The child is motivated during the class. src/app/core/config/config-fix.ts - 1012 + 1025 Description for a child attribute @@ -3052,7 +3069,7 @@ Participating src/app/core/config/config-fix.ts - 1020 + 1033 Label for a child attribute @@ -3060,7 +3077,7 @@ The child is actively participating in the class. src/app/core/config/config-fix.ts - 1021 + 1034 Description for a child attribute @@ -3068,7 +3085,7 @@ Interacting src/app/core/config/config-fix.ts - 1029 + 1042 Label for a child attribute @@ -3076,7 +3093,7 @@ The child interacts with other students during the class. src/app/core/config/config-fix.ts - 1030 + 1043 Description for a child attribute @@ -3084,7 +3101,7 @@ Homework src/app/core/config/config-fix.ts - 1038 + 1051 Label for a child attribute @@ -3092,7 +3109,7 @@ The child does its homework. src/app/core/config/config-fix.ts - 1039 + 1052 Description for a child attribute @@ -3100,7 +3117,7 @@ Asking Questions src/app/core/config/config-fix.ts - 1047 + 1060 Label for a child attribute @@ -3108,7 +3125,7 @@ The child is asking questions during the class. src/app/core/config/config-fix.ts - 1048 + 1061 Description for a child attribute @@ -3116,7 +3133,7 @@ Email src/app/core/config/config-fix.ts - 1059 + 1072 Label of user email @@ -3124,7 +3141,7 @@ Contact src/app/core/config/config-fix.ts - 1066 + 1079 Label of user phone @@ -3279,7 +3296,7 @@ Save the new record to create it before accessing other details src/app/core/entity-components/entity-details/entity-details.component.html - 73,77 + 73,78 Tooltip explaining disabled sections when creating new entity @@ -3381,7 +3398,7 @@ Add New src/app/core/entity-components/entity-list/entity-list.component.html - 38,44 + 38,45 Add a new entity to a list of multiple entities @@ -3389,7 +3406,7 @@ Filter src/app/core/entity-components/entity-list/entity-list.component.html - 109,114 + 109,115 Allows the user to filter through entities Filter placeholder @@ -3398,7 +3415,7 @@ e.g. name, age src/app/core/entity-components/entity-list/entity-list.component.html - 114,118 + 114,119 Examples of things to filter @@ -3452,7 +3469,7 @@ Show All src/app/core/entity-components/entity-subrecord/list-paginator/list-paginator.component.html - 9,13 + 9,14 All toggle for paginator @@ -3531,7 +3548,7 @@ src/app/core/entity-components/entity-utils/view-components/display-entity-array/display-entity-array.component.html - 8,9 + 8,10 context 10 in total Displaying the amount of involved entities @@ -3544,19 +3561,19 @@ src/app/features/data-import/data-import/data-import.component.html - 34,35 + 34,36 src/app/features/data-import/data-import/data-import.component.html - 51,52 + 51,53 src/app/features/data-import/data-import/data-import.component.html - 72,73 + 72,74 src/app/features/data-import/data-import/data-import.component.html - 90,91 + 90,92 src/app/features/data-import/data-import/data-import.component.html @@ -3615,7 +3632,7 @@ Cancel src/app/core/form-dialog/form-dialog-wrapper/form-dialog-wrapper.component.html - 29,34 + 29,35 Generic cancel button @@ -4208,7 +4225,7 @@ src/app/features/data-import/data-import/data-import.component.html - 125,129 + 125,130 Button to proceed in import wizard @@ -4322,7 +4339,7 @@ Entity Type: + <p i"/> src/app/features/data-import/data-import/data-import.component.html 130,131 @@ -4331,7 +4348,7 @@ CSV File: + <p i"/> src/app/features/data-import/data-import/data-import.component.html 131,132 @@ -4341,7 +4358,7 @@ TransactionID: + <di"/> src/app/features/data-import/data-import/data-import.component.html 132,134 @@ -4372,11 +4389,19 @@ Button to reset import wizard + + N/A + + src/app/features/historical-data/model/rating-answers.ts + 6 + + Rating answer + not at all src/app/features/historical-data/model/rating-answers.ts - 4 + 10 Rating answer @@ -4384,7 +4409,7 @@ rarely src/app/features/historical-data/model/rating-answers.ts - 8 + 14 Rating answer @@ -4392,7 +4417,7 @@ usually src/app/features/historical-data/model/rating-answers.ts - 12 + 18 Rating answer @@ -4400,15 +4425,7 @@ absolutely src/app/features/historical-data/model/rating-answers.ts - 16 - - Rating answer - - - N/A - - src/app/features/historical-data/model/rating-answers.ts - 20 + 22 Rating answer From c6e450f684df6971a2b8cf5fbba4df4ab4c50175 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 23 Aug 2022 11:28:34 +0200 Subject: [PATCH 11/19] Removed console.log --- .../important-notes/important-notes.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts index 30206a1769..3d5ccb6543 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.ts @@ -48,7 +48,6 @@ export class ImportantNotesComponent // set loading to `false` when the first chunk of notes (the initial notes) have arrived this.notes.pipe(first()).subscribe(() => (this.loading = false)); this.notes.pipe(untilDestroyed(this)).subscribe((next) => { - console.log("first call of 'notes'"); this.relevantNotes = next.filter((note) => this.noteIsRelevant(note)); this.relevantNotes.sort( (a, b) => b.warningLevel._ordinal - a.warningLevel._ordinal From 15ca157502b8c7c7e0b104612a23d89c5174154b Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 23 Aug 2022 11:40:42 +0200 Subject: [PATCH 12/19] using expectObservable function --- .../entity/mock-entity-mapper-service.spec.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/core/entity/mock-entity-mapper-service.spec.ts b/src/app/core/entity/mock-entity-mapper-service.spec.ts index 1ba84f9623..fff13b89b2 100644 --- a/src/app/core/entity/mock-entity-mapper-service.spec.ts +++ b/src/app/core/entity/mock-entity-mapper-service.spec.ts @@ -1,5 +1,9 @@ -import { mockEntityMapper, MockEntityMapperService } from "./mock-entity-mapper-service"; +import { + mockEntityMapper, + MockEntityMapperService, +} from "./mock-entity-mapper-service"; import { Child } from "../../child-dev-project/children/model/child"; +import { expectObservable } from "../../utils/test-utils/observable-utils"; describe("MockEntityMapperServicer", () => { let service: MockEntityMapperService; @@ -9,12 +13,10 @@ describe("MockEntityMapperServicer", () => { it("should publish a update for a newly added entity", (done) => { const child = new Child(); - service.receiveUpdates(Child.ENTITY_TYPE).subscribe((update) => { - expect(update.entity).toEqual(child); - expect(update.type).toBe("new"); - done(); - }); + expectObservable(service.receiveUpdates(Child)) + .first.toBeResolvedTo({ type: "new", entity: child }) + .then(() => done()); service.add(child); }); @@ -23,11 +25,9 @@ describe("MockEntityMapperServicer", () => { service.add(child); child.name = "Updated name"; - service.receiveUpdates(Child.ENTITY_TYPE).subscribe((update) => { - expect(update.entity).toEqual(child); - expect(update.type).toBe("update"); - done(); - }); + expectObservable(service.receiveUpdates(Child)) + .first.toBeResolvedTo({ type: "update", entity: child }) + .then(() => done()); service.add(child); }); }); From fe59e6647989720d4c5e5e89c2e389df18ac52cb Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Thu, 1 Sep 2022 13:33:02 +0200 Subject: [PATCH 13/19] Testing notes highlighting style --- .../important-notes/important-notes.component.html | 1 - .../important-notes/important-notes.component.scss | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index f040134769..c76ad642cc 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -37,7 +37,6 @@ *matRowDef="let row; columns: ['date', 'title'];" class="dashboard-table-row row-view" (click)="openNote(row)" - [style.background-color]="row.getColor?.()" >
diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss index c987222815..2ead83ee23 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss @@ -8,6 +8,18 @@ .row-view { cursor: pointer; + &::before { + content: ''; + display: block; + width: 8px; + height: 8px; + border-radius: 100vmax; + background-color: red; + position: relative; + top: 19px; + left: 4px; + } + & > td:first-child { padding-left: $standard-margin-small; } From 69d4d50c0a4d235389144310bf683c10ec983cdf Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Thu, 8 Sep 2022 19:15:39 +0200 Subject: [PATCH 14/19] Revert "Testing notes highlighting style" This reverts commit fe59e6647989720d4c5e5e89c2e389df18ac52cb. --- .../important-notes/important-notes.component.html | 1 + .../important-notes/important-notes.component.scss | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index c76ad642cc..f040134769 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -37,6 +37,7 @@ *matRowDef="let row; columns: ['date', 'title'];" class="dashboard-table-row row-view" (click)="openNote(row)" + [style.background-color]="row.getColor?.()" >
diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss index 2ead83ee23..c987222815 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss @@ -8,18 +8,6 @@ .row-view { cursor: pointer; - &::before { - content: ''; - display: block; - width: 8px; - height: 8px; - border-radius: 100vmax; - background-color: red; - position: relative; - top: 19px; - left: 4px; - } - & > td:first-child { padding-left: $standard-margin-small; } From 606517d265addd037d946c273c6edd70e475fc73 Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Thu, 8 Sep 2022 19:23:01 +0200 Subject: [PATCH 15/19] add color left --- .../important-notes/important-notes.component.html | 2 +- .../important-notes/important-notes.component.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index f040134769..95d2fef63b 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -37,7 +37,7 @@ *matRowDef="let row; columns: ['date', 'title'];" class="dashboard-table-row row-view" (click)="openNote(row)" - [style.background-color]="row.getColor?.()" + [style.border-left-color]="row.getColor?.()" >
diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss index c987222815..71c90d9173 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss @@ -8,6 +8,9 @@ .row-view { cursor: pointer; + border-left-width: 8px; + border-left-style: solid; + & > td:first-child { padding-left: $standard-margin-small; } From a298e6325e0c53d725639c5da7b31e60b782580a Mon Sep 17 00:00:00 2001 From: Schottkyc137 Date: Thu, 8 Sep 2022 20:35:04 +0200 Subject: [PATCH 16/19] Add a color hint on the left side --- .../important-notes/important-notes.component.html | 2 +- .../important-notes/important-notes.component.scss | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html index 95d2fef63b..6492824e7c 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.html @@ -37,7 +37,7 @@ *matRowDef="let row; columns: ['date', 'title'];" class="dashboard-table-row row-view" (click)="openNote(row)" - [style.border-left-color]="row.getColor?.()" + [ngStyle]="{'--important-notes-bg-color': row.getColor?.()}" > diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss index 71c90d9173..fb67f1900a 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss @@ -7,9 +7,16 @@ .row-view { cursor: pointer; + position: relative; - border-left-width: 8px; - border-left-style: solid; + &::before { + content: ''; + display: block; + width: 8px; + height: 100%; + position: absolute; + background-color: var(--important-notes-bg-color); + } & > td:first-child { padding-left: $standard-margin-small; From db502a2fd008a2fbf5678571755acd52f86bcf84 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 20 Sep 2022 15:23:52 +0200 Subject: [PATCH 17/19] added left padding --- .../important-notes/important-notes.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss index fb67f1900a..07bd586d95 100644 --- a/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss +++ b/src/app/child-dev-project/notes/dashboard-widgets/important-notes/important-notes.component.scss @@ -19,7 +19,7 @@ } & > td:first-child { - padding-left: $standard-margin-small; + padding-left: $standard-margin-small + 4; } & > td:last-child { From 364af16f2e69231a47eac7fcca8c98f7f08682ab Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 20 Sep 2022 15:40:34 +0200 Subject: [PATCH 18/19] fixed typo --- .../display-configurable-enum.component.spec.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts b/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts index d689e5ec38..2068950168 100644 --- a/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts +++ b/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing"; import { DisplayConfigurableEnumComponent } from "./display-configurable-enum.component"; import { ConfigurableEnumValue } from "../configurable-enum.interface"; import { Note } from "../../../child-dev-project/notes/model/note"; +import { Ordering } from "../configurable-enum-ordering"; describe("DisplayConfigurableEnumComponent", () => { let component: DisplayConfigurableEnumComponent; @@ -32,10 +33,11 @@ describe("DisplayConfigurableEnumComponent", () => { const elem = fixture.debugElement.nativeElement; expect(elem.style["background-color"]).toBe(""); - const value: ConfigurableEnumValue = { + const value: Ordering.EnumValue = { label: "withColor", id: "WITH_COLOR", color: "black", + _ordinal: 1, }; const entity = new Note(); entity.warningLevel = value; From 4153632d0b6ed7a958b10a6460bc68dee5166a2f Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 20 Sep 2022 15:51:46 +0200 Subject: [PATCH 19/19] removed unused import --- .../display-configurable-enum.component.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts b/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts index 2068950168..b9085a9a4a 100644 --- a/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts +++ b/src/app/core/configurable-enum/display-configurable-enum/display-configurable-enum.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing"; import { DisplayConfigurableEnumComponent } from "./display-configurable-enum.component"; -import { ConfigurableEnumValue } from "../configurable-enum.interface"; import { Note } from "../../../child-dev-project/notes/model/note"; import { Ordering } from "../configurable-enum-ordering";