+
matIconPrefix
class="grab-icon margin-right-small"
>
+
+
+
+
+
+ Add new option
+
+
+
diff --git a/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.spec.ts b/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.spec.ts
index f1d171a757..32bd4619d7 100644
--- a/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.spec.ts
+++ b/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.spec.ts
@@ -17,6 +17,7 @@ import {
entityRegistry,
EntityRegistry,
} from "../../../entity/database-entity.decorator";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
describe("ConfigureEnumPopupComponent", () => {
let component: ConfigureEnumPopupComponent;
@@ -26,7 +27,11 @@ describe("ConfigureEnumPopupComponent", () => {
beforeEach(async () => {
entityMapper = mockEntityMapper();
await TestBed.configureTestingModule({
- imports: [ConfigureEnumPopupComponent, FontAwesomeTestingModule],
+ imports: [
+ ConfigureEnumPopupComponent,
+ FontAwesomeTestingModule,
+ NoopAnimationsModule,
+ ],
providers: [
{ provide: MAT_DIALOG_DATA, useValue: new ConfigurableEnum() },
{ provide: MatDialogRef, useValue: { afterClosed: () => EMPTY } },
diff --git a/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.ts b/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.ts
index 949bb3f46d..bffccff20a 100644
--- a/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.ts
+++ b/src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.ts
@@ -43,6 +43,8 @@ import { Entity } from "../../../entity/model/entity";
standalone: true,
})
export class ConfigureEnumPopupComponent {
+ newOptionInput: string;
+
constructor(
@Inject(MAT_DIALOG_DATA) public enumEntity: ConfigurableEnum,
private dialog: MatDialogRef,
@@ -125,4 +127,13 @@ export class ConfigureEnumPopupComponent {
),
);
}
+
+ createNewOption() {
+ this.enumEntity.values.push({
+ id: this.newOptionInput,
+ label: this.newOptionInput,
+ });
+ this.newOptionInput = "";
+ }
+ mynewFun() {}
}
diff --git a/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.spec.ts b/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.spec.ts
index c198494af8..101e1b19d0 100644
--- a/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.spec.ts
+++ b/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.spec.ts
@@ -1,7 +1,7 @@
import { DateWithAgeDatatype } from "./date-with-age.datatype";
-import { DateWithAge } from "../../../child-dev-project/children/model/dateWithAge";
import { testDatatype } from "../../entity/schema/entity-schema.service.spec";
import moment from "moment";
+import { DateWithAge } from "./dateWithAge";
describe("Schema data type: date-with-age", () => {
testDatatype(
diff --git a/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.ts b/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.ts
index 49d6ab46fe..50ab219e90 100644
--- a/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.ts
+++ b/src/app/core/basic-datatypes/date-with-age/date-with-age.datatype.ts
@@ -1,6 +1,6 @@
import { DateOnlyDatatype } from "../date-only/date-only.datatype";
-import { DateWithAge } from "../../../child-dev-project/children/model/dateWithAge";
import { Injectable } from "@angular/core";
+import { DateWithAge } from "./dateWithAge";
/**
* Similar to the 'date-only' datatype but it uses the `DateWithAge` class which provides the `age` function.
diff --git a/src/app/child-dev-project/children/model/dateWithAge.ts b/src/app/core/basic-datatypes/date-with-age/dateWithAge.ts
similarity index 100%
rename from src/app/child-dev-project/children/model/dateWithAge.ts
rename to src/app/core/basic-datatypes/date-with-age/dateWithAge.ts
diff --git a/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.spec.ts b/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.spec.ts
index ad4ad52c92..f8cd943f29 100644
--- a/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.spec.ts
+++ b/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.spec.ts
@@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
import { DisplayAgeComponent } from "./display-age.component";
import { Child } from "../../../../child-dev-project/children/model/child";
-import { DateWithAge } from "../../../../child-dev-project/children/model/dateWithAge";
import moment from "moment";
+import { DateWithAge } from "../dateWithAge";
describe("DisplayAgeComponent", () => {
let component: DisplayAgeComponent;
diff --git a/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.ts b/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.ts
index abe9f9a770..377224d8d0 100644
--- a/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.ts
+++ b/src/app/core/basic-datatypes/date-with-age/display-age/display-age.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit } from "@angular/core";
import { ViewDirective } from "../../../entity/default-datatype/view.directive";
-import { DateWithAge } from "../../../../child-dev-project/children/model/dateWithAge";
import { DynamicComponent } from "../../../config/dynamic-components/dynamic-component.decorator";
+import { DateWithAge } from "../dateWithAge";
/**
* A component which displays the age of an entity with a DateOfBirth property.
diff --git a/src/app/core/basic-datatypes/date-with-age/display-age/display-age.stories.ts b/src/app/core/basic-datatypes/date-with-age/display-age/display-age.stories.ts
index 247756345a..33e9af6d93 100644
--- a/src/app/core/basic-datatypes/date-with-age/display-age/display-age.stories.ts
+++ b/src/app/core/basic-datatypes/date-with-age/display-age/display-age.stories.ts
@@ -1,8 +1,8 @@
import { applicationConfig, Meta, StoryFn } from "@storybook/angular";
import { StorybookBaseModule } from "../../../../utils/storybook-base.module";
import { DisplayAgeComponent } from "./display-age.component";
-import { DateWithAge } from "../../../../child-dev-project/children/model/dateWithAge";
import { importProvidersFrom } from "@angular/core";
+import { DateWithAge } from "../dateWithAge";
export default {
title: "Core/Entities/Properties/date/DisplayAge",
diff --git a/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.html b/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.html
index f9cd7c35e8..9ef10c03a9 100644
--- a/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.html
+++ b/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.html
@@ -1,5 +1,10 @@
-
+ {{ label }}
+
Age {
let component: EditAgeComponent;
diff --git a/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.ts b/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.ts
index 4d692054e0..77241695bd 100644
--- a/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.ts
+++ b/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.ts
@@ -5,7 +5,6 @@ import {
MatDatepickerInputEvent,
MatDatepickerModule,
} from "@angular/material/datepicker";
-import { DateWithAge } from "../../../../child-dev-project/children/model/dateWithAge";
import { ReactiveFormsModule } from "@angular/forms";
import { MatFormFieldModule } from "@angular/material/form-field";
import { MatInputModule } from "@angular/material/input";
@@ -13,6 +12,7 @@ import { ErrorHintComponent } from "../../../common-components/error-hint/error-
import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
import { NgIf } from "@angular/common";
import { MatTooltipModule } from "@angular/material/tooltip";
+import { DateWithAge } from "../dateWithAge";
@DynamicComponent("EditAge")
@Component({
diff --git a/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.stories.ts b/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.stories.ts
index c70dd08798..0bbdce871f 100644
--- a/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.stories.ts
+++ b/src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.stories.ts
@@ -1,6 +1,6 @@
import { generateFormFieldStory } from "../../../entity/default-datatype/edit-component-story-utils";
-import { DateWithAge } from "../../../../child-dev-project/children/model/dateWithAge";
import { StoryFn } from "@storybook/angular";
+import { DateWithAge } from "../dateWithAge";
const formFieldStory = generateFormFieldStory(
"EditAge",
diff --git a/src/app/core/basic-datatypes/date/date.datatype.spec.ts b/src/app/core/basic-datatypes/date/date.datatype.spec.ts
index c3f8214c62..a630ffc912 100644
--- a/src/app/core/basic-datatypes/date/date.datatype.spec.ts
+++ b/src/app/core/basic-datatypes/date/date.datatype.spec.ts
@@ -7,4 +7,12 @@ describe("Schema data type: date", () => {
new Date(2023, 10, 25),
new Date(2023, 10, 25),
);
+
+ it("should anonymize dates and only retain year", async () => {
+ const datatype = new DateDatatype();
+ const testDate = new Date(2023, 10, 25);
+
+ const actualAnonymized = await datatype.anonymize(testDate);
+ expect(actualAnonymized).toEqual(new Date(2023, 6, 1));
+ });
});
diff --git a/src/app/core/basic-datatypes/date/date.datatype.ts b/src/app/core/basic-datatypes/date/date.datatype.ts
index a176ffc55c..d18777f913 100644
--- a/src/app/core/basic-datatypes/date/date.datatype.ts
+++ b/src/app/core/basic-datatypes/date/date.datatype.ts
@@ -71,4 +71,10 @@ export class DateDatatype extends DefaultDatatype<
return undefined;
}
}
+
+ async anonymize(value: Date): Promise {
+ // normalize to 01.06. of the year, which has less statistical distortion than 01.01.
+ // (roughly half the dates before anonymization will be earlier and half will be later)
+ return new Date(value.getFullYear(), 6, 1);
+ }
}
diff --git a/src/app/core/basic-datatypes/date/display-date/display-date.component.html b/src/app/core/basic-datatypes/date/display-date/display-date.component.html
new file mode 100644
index 0000000000..78fd5b6411
--- /dev/null
+++ b/src/app/core/basic-datatypes/date/display-date/display-date.component.html
@@ -0,0 +1,14 @@
+
+ {{ value | date: config }}
+
+
+
+ {{ value | date: "YYYY" }}
+
+
diff --git a/src/app/core/basic-datatypes/date/display-date/display-date.component.ts b/src/app/core/basic-datatypes/date/display-date/display-date.component.ts
index 76001a89f0..7db5675d5e 100644
--- a/src/app/core/basic-datatypes/date/display-date/display-date.component.ts
+++ b/src/app/core/basic-datatypes/date/display-date/display-date.component.ts
@@ -1,7 +1,9 @@
-import { Component } from "@angular/core";
+import { Component, Input } from "@angular/core";
import { ViewDirective } from "../../../entity/default-datatype/view.directive";
import { DynamicComponent } from "../../../config/dynamic-components/dynamic-component.decorator";
-import { DatePipe } from "@angular/common";
+import { DatePipe, NgIf } from "@angular/common";
+import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
+import { MatTooltipModule } from "@angular/material/tooltip";
/**
* This component displays a date attribute using the shortDate format.
@@ -12,8 +14,13 @@ import { DatePipe } from "@angular/common";
@DynamicComponent("DisplayDate")
@Component({
selector: "app-display-date",
- template: `{{ value | date: config }}`,
+ templateUrl: "./display-date.component.html",
standalone: true,
- imports: [DatePipe],
+ imports: [DatePipe, NgIf, FontAwesomeModule, MatTooltipModule],
})
-export class DisplayDateComponent extends ViewDirective {}
+export class DisplayDateComponent extends ViewDirective {
+ @Input() displayAsAnonymized: boolean;
+
+ /** formatting string for date pipe */
+ @Input() config: string;
+}
diff --git a/src/app/core/basic-datatypes/date/edit-date/edit-date.component.html b/src/app/core/basic-datatypes/date/edit-date/edit-date.component.html
index caf141aebe..31f53b3378 100644
--- a/src/app/core/basic-datatypes/date/edit-date/edit-date.component.html
+++ b/src/app/core/basic-datatypes/date/edit-date/edit-date.component.html
@@ -5,6 +5,15 @@
[formControlName]="formControlName"
[matDatepicker]="datepickerComp"
/>
+
+
+
{
- const mockEntitySchemaService: EntitySchemaService = {
- getDatatypeOrDefault: () => new EntityDatatype(undefined),
+ const mockEntityDatatype = new EntityDatatype(null, null);
+ const mockEntitySchemaService = {
+ getDatatypeOrDefault: () => mockEntityDatatype,
} as any;
- testDatatype(
- new EntityArrayDatatype(mockEntitySchemaService),
- ["1", "User:5"],
- ["1", "User:5"],
- "User",
- );
+ const datatype = new EntityArrayDatatype(mockEntitySchemaService);
+
+ testDatatype(datatype, ["1", "User:5"], ["1", "User:5"], "User");
testDatatype(
- new EntityArrayDatatype(mockEntitySchemaService),
+ datatype,
["User:1", "Child:1"],
["User:1", "Child:1"],
["User", "Child", "School"],
);
+ it("should anonymize entities recursively", async () => {
+ const testValue = ["Entity:ref-1", "Entity:ref-2"];
+ spyOn(mockEntityDatatype, "anonymize").and.callFake(async (x) => x);
+
+ const anonymizedValue = await datatype.anonymize(testValue, null, null);
+
+ expect(anonymizedValue).toEqual(testValue);
+ expect(mockEntityDatatype.anonymize).toHaveBeenCalledTimes(2);
+ expect(mockEntityDatatype.anonymize).toHaveBeenCalledWith(
+ "Entity:ref-1",
+ jasmine.objectContaining({ dataType: "entity" }),
+ null,
+ );
+ });
+
xit("adds prefix to ids when a definite entity type is given in schema", () => {
// TODO discuss whether we want to switch to prefixed ids always (also see #1526)
const data = {
diff --git a/src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts b/src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts
index 0840a37baa..543873e13e 100644
--- a/src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts
+++ b/src/app/core/basic-datatypes/entity-array/entity-array.datatype.ts
@@ -63,4 +63,12 @@ export class EntityArrayDatatype extends ArrayDatatype {
return value;
}*/
}
+
+ async anonymize(value, schema: EntitySchemaField, parent) {
+ return super.anonymize(
+ value,
+ { ...schema, innerDataType: EntityDatatype.dataType },
+ parent,
+ );
+ }
}
diff --git a/src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html b/src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
index 0f80445fcf..d7a6e0cc7b 100644
--- a/src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
+++ b/src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
@@ -1,19 +1,25 @@
-
Select matching {{ entity.label }} property
-
-
- {{ property.label }}
-
-
-
+
+ Select matching {{ entity.label }} property
+
+
+
+ {{ property.label }}
+
+
+
-
-
+
+
diff --git a/src/app/core/basic-datatypes/entity/entity-reference-role.ts b/src/app/core/basic-datatypes/entity/entity-reference-role.ts
new file mode 100644
index 0000000000..e629dda389
--- /dev/null
+++ b/src/app/core/basic-datatypes/entity/entity-reference-role.ts
@@ -0,0 +1,10 @@
+/**
+ * Specifies the role of an entity reference where
+ * "aggregate" = "has a" relationship where both entities have meaning independent of each other;
+ * "composite" = "part of" relationship where the referenced entity should not exist without the referenced entity.
+ *
+ * Default is treated as "aggregate".
+ *
+ * (role names following the UML association types)
+ */
+export type EntityReferenceRole = "aggregate" | "composite";
diff --git a/src/app/core/basic-datatypes/entity/entity.datatype.spec.ts b/src/app/core/basic-datatypes/entity/entity.datatype.spec.ts
index 133f37454e..99b11747c0 100644
--- a/src/app/core/basic-datatypes/entity/entity.datatype.spec.ts
+++ b/src/app/core/basic-datatypes/entity/entity.datatype.spec.ts
@@ -20,16 +20,17 @@ import { EntityDatatype } from "./entity.datatype";
import { mockEntityMapper } from "../../entity/entity-mapper/mock-entity-mapper-service";
import { Child } from "../../../child-dev-project/children/model/child";
import { ChildSchoolRelation } from "../../../child-dev-project/children/model/childSchoolRelation";
+import { EntityActionsService } from "../../entity/entity-actions/entity-actions.service";
describe("Schema data type: entity", () => {
- testDatatype(new EntityDatatype(undefined), "1", "1", "User");
+ testDatatype(new EntityDatatype(null, null), "1", "1", "User");
it("should map to the referenced entity", async () => {
const c1 = Child.create("first");
const c2 = new Child();
c2.projectNumber = "123";
const entityMapper = mockEntityMapper([c1, c2]);
- const dataType = new EntityDatatype(entityMapper);
+ const dataType = new EntityDatatype(entityMapper, null);
const schema = ChildSchoolRelation.schema.get("childId");
await expectAsync(
@@ -42,4 +43,27 @@ describe("Schema data type: entity", () => {
dataType.importMapFunction("345", schema, "projectNumber"),
).toBeResolvedTo(undefined);
});
+
+ it("should anonymize entity recursively", async () => {
+ const referencedEntity = new Child("ref-1");
+ referencedEntity.name = "test";
+
+ const entityMapper = mockEntityMapper([referencedEntity]);
+ spyOn(entityMapper, "save");
+ const mockRemoveService: jasmine.SpyObj =
+ jasmine.createSpyObj("EntityRemoveService", ["anonymize"]);
+ const dataType = new EntityDatatype(entityMapper, mockRemoveService);
+
+ const testValue = referencedEntity.getId();
+ const testSchemaField = { additional: "Child", dataType: "entity" };
+
+ const anonymizedValue = await dataType.anonymize(
+ testValue,
+ testSchemaField,
+ null,
+ );
+
+ expect(anonymizedValue).toEqual(testValue);
+ expect(mockRemoveService.anonymize).toHaveBeenCalledWith(referencedEntity);
+ });
});
diff --git a/src/app/core/basic-datatypes/entity/entity.datatype.ts b/src/app/core/basic-datatypes/entity/entity.datatype.ts
index 1e9c81a7a2..eb1281c586 100644
--- a/src/app/core/basic-datatypes/entity/entity.datatype.ts
+++ b/src/app/core/basic-datatypes/entity/entity.datatype.ts
@@ -20,6 +20,7 @@ import { StringDatatype } from "../string/string.datatype";
import { EntitySchemaField } from "../../entity/schema/entity-schema-field";
import { EntityMapperService } from "../../entity/entity-mapper/entity-mapper.service";
import { ColumnMapping } from "../../import/column-mapping";
+import { EntityActionsService } from "../../entity/entity-actions/entity-actions.service";
/**
* Datatype for the EntitySchemaService to handle a single reference to another entity
@@ -37,7 +38,10 @@ export class EntityDatatype extends StringDatatype {
viewComponent = "DisplayEntity";
importConfigComponent = "EntityImportConfig";
- constructor(private entityMapper: EntityMapperService) {
+ constructor(
+ private entityMapper: EntityMapperService,
+ private removeService: EntityActionsService,
+ ) {
super();
}
@@ -57,4 +61,29 @@ export class EntityDatatype extends StringDatatype {
importIncompleteAdditionalConfigBadge(col: ColumnMapping): string {
return col.additional ? undefined : "?";
}
+
+ /**
+ * Recursively calls anonymize on the referenced entity and saves it.
+ * @param value
+ * @param schemaField
+ * @param parent
+ */
+ async anonymize(
+ value,
+ schemaField: EntitySchemaField,
+ parent,
+ ): Promise {
+ const referencedEntity = await this.entityMapper.load(
+ schemaField.additional,
+ value,
+ );
+
+ if (!referencedEntity) {
+ // TODO: remove broken references?
+ return value;
+ }
+
+ await this.removeService.anonymize(referencedEntity);
+ return value;
+ }
}
diff --git a/src/app/core/basic-datatypes/month/display-month/display-month.component.ts b/src/app/core/basic-datatypes/month/display-month/display-month.component.ts
index ecdf6591e5..8eddf4dd3a 100644
--- a/src/app/core/basic-datatypes/month/display-month/display-month.component.ts
+++ b/src/app/core/basic-datatypes/month/display-month/display-month.component.ts
@@ -1,11 +1,16 @@
import { Component } from "@angular/core";
-import { DatePipe } from "@angular/common";
+import { DatePipe, NgIf } from "@angular/common";
import { ViewDirective } from "../../../entity/default-datatype/view.directive";
+import { DisplayDateComponent } from "../../date/display-date/display-date.component";
@Component({
selector: "app-display-month",
standalone: true,
- template: `{{ value | date: "YYYY-MM" }}`,
- imports: [DatePipe],
+ template: ``,
+ imports: [DatePipe, NgIf, DisplayDateComponent],
})
export class DisplayMonthComponent extends ViewDirective {}
diff --git a/src/app/core/basic-datatypes/month/edit-month/edit-month.component.html b/src/app/core/basic-datatypes/month/edit-month/edit-month.component.html
index 56239701c7..ab01510f80 100644
--- a/src/app/core/basic-datatypes/month/edit-month/edit-month.component.html
+++ b/src/app/core/basic-datatypes/month/edit-month/edit-month.component.html
@@ -5,6 +5,15 @@
[formControl]="formControl"
[matDatepicker]="datepickerComp"
/>
+
+
+
{
setMonthAndYear(date: Moment, datepicker: MatDatepicker) {
- this.formControl.setValue(date.toDate());
this.formControl.markAsDirty();
+ this.formControl.setValue(date.toDate());
datepicker.close();
}
}
diff --git a/src/app/core/common-components/basic-autocomplete/custom-form-control.directive.ts b/src/app/core/common-components/basic-autocomplete/custom-form-control.directive.ts
index 48263da39b..00fc6d0a23 100644
--- a/src/app/core/common-components/basic-autocomplete/custom-form-control.directive.ts
+++ b/src/app/core/common-components/basic-autocomplete/custom-form-control.directive.ts
@@ -4,6 +4,7 @@ import {
FormGroupDirective,
NgControl,
NgForm,
+ Validators,
} from "@angular/forms";
import { MatFormFieldControl } from "@angular/material/form-field";
import {
@@ -28,7 +29,16 @@ export abstract class CustomFormControlDirective
// eslint-disable-next-line @angular-eslint/no-input-rename
@Input("aria-describedby") userAriaDescribedBy: string;
@Input() placeholder: string;
- @Input() required = false;
+
+ @Input()
+ get required() {
+ return this._required;
+ }
+ set required(req: boolean) {
+ this._required = coerceBooleanProperty(req);
+ this.stateChanges.next();
+ }
+ private _required = false;
abstract inputElement: { _elementRef: ElementRef };
stateChanges = new Subject();
@@ -123,16 +133,22 @@ export abstract class CustomFormControlDirective
this.disabled = isDisabled;
}
+ ngDoCheck() {
+ const control = this.ngControl
+ ? (this.ngControl.control as AbstractControl)
+ : null;
+
+ this.checkUpdateErrorState(control);
+ this.checkUpdateRequired(control);
+ }
+
/**
* Updates the error state based on the form control
* Taken from {@link https://github.com/angular/components/blob/a1d5614f18066c0c2dc2580c7b5099e8f68a8e74/src/material/core/common-behaviors/error-state.ts#L59}
*/
- ngDoCheck() {
+ private checkUpdateErrorState(control: AbstractControl | null) {
const oldState = this.errorState;
const parent = this.parentFormGroup || this.parentForm;
- const control = this.ngControl
- ? (this.ngControl.control as AbstractControl)
- : null;
const newState = this.errorStateMatcher.isErrorState(control, parent);
if (newState !== oldState) {
@@ -140,4 +156,17 @@ export abstract class CustomFormControlDirective
this.stateChanges.next();
}
}
+
+ private checkUpdateRequired(control: AbstractControl | null) {
+ if (!control) {
+ return;
+ }
+
+ if (
+ this.required !==
+ coerceBooleanProperty(control.hasValidator(Validators.required))
+ ) {
+ this.required = control.hasValidator(Validators.required);
+ }
+ }
}
diff --git a/src/app/core/common-components/confirmation-dialog/confirmation-dialog.service.ts b/src/app/core/common-components/confirmation-dialog/confirmation-dialog.service.ts
index f7fd6c9cb5..b4352403db 100644
--- a/src/app/core/common-components/confirmation-dialog/confirmation-dialog.service.ts
+++ b/src/app/core/common-components/confirmation-dialog/confirmation-dialog.service.ts
@@ -6,6 +6,7 @@ import {
YesNoButtons,
} from "./confirmation-dialog/confirmation-dialog.component";
import { firstValueFrom } from "rxjs";
+import { ProgressDialogComponent } from "./progress-dialog/progress-dialog.component";
/**
* Inject this service instead of MatDialog if you need a simple, configurable confirmation dialog box
@@ -63,4 +64,17 @@ export class ConfirmationDialogService {
$localize`:Discard changes message:You have unsaved changes. Do you really want to leave this page? All unsaved changes will be lost.`,
);
}
+
+ /**
+ * Show an (indeterminate) progress bar modal that cannot be closed by the user.
+ * Use the returned dialogRef to close the dialog once your processing is completed.
+ * @param message
+ */
+ showProgressDialog(message: string) {
+ return this.dialog.open(ProgressDialogComponent, {
+ data: { message },
+ minWidth: "50vh",
+ disableClose: true,
+ });
+ }
}
diff --git a/src/app/core/common-components/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.html b/src/app/core/common-components/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.html
index f1a2a1861e..4b31f2b57c 100644
--- a/src/app/core/common-components/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.html
+++ b/src/app/core/common-components/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.html
@@ -6,7 +6,7 @@
>
-
{{ data.text }}
+
{{ para }}
diff --git a/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.html b/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.html
new file mode 100644
index 0000000000..8481907b58
--- /dev/null
+++ b/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.html
@@ -0,0 +1,7 @@
+
+ {{ data.message }}
+
+
+
+
+
diff --git a/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.spec.ts b/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.spec.ts
new file mode 100644
index 0000000000..8926eec000
--- /dev/null
+++ b/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.spec.ts
@@ -0,0 +1,32 @@
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+
+import { ProgressDialogComponent } from "./progress-dialog.component";
+import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
+
+describe("ProgressDialogComponent", () => {
+ let component: ProgressDialogComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ imports: [ProgressDialogComponent],
+ providers: [
+ { provide: MatDialogRef, useValue: {} },
+ {
+ provide: MAT_DIALOG_DATA,
+ useValue: { message: "test title" },
+ },
+ ],
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ProgressDialogComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it("should create", () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.ts b/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.ts
new file mode 100644
index 0000000000..3c213d838c
--- /dev/null
+++ b/src/app/core/common-components/confirmation-dialog/progress-dialog/progress-dialog.component.ts
@@ -0,0 +1,16 @@
+import { Component, Inject } from "@angular/core";
+import { MAT_DIALOG_DATA, MatDialogModule } from "@angular/material/dialog";
+import { MatProgressBarModule } from "@angular/material/progress-bar";
+
+/**
+ * A simple progress indicator dialog
+ * used via the {@link ConfirmationDialogService}.
+ */
+@Component({
+ templateUrl: "./progress-dialog.component.html",
+ imports: [MatProgressBarModule, MatDialogModule],
+ standalone: true,
+})
+export class ProgressDialogComponent {
+ constructor(@Inject(MAT_DIALOG_DATA) public data: { message: string }) {}
+}
diff --git a/src/app/core/common-components/entity-form/entity-form.service.spec.ts b/src/app/core/common-components/entity-form/entity-form.service.spec.ts
index c0ca1e9bda..d945c641d4 100644
--- a/src/app/core/common-components/entity-form/entity-form.service.spec.ts
+++ b/src/app/core/common-components/entity-form/entity-form.service.spec.ts
@@ -173,7 +173,7 @@ describe("EntityFormService", () => {
schema.defaultValue = PLACEHOLDERS.NOW;
form = service.createFormGroup([{ id: "test" }], new Entity());
- expect(form.get("test")).toHaveValue(new Date());
+ expect(form.get("test").value).toEqual(new Date());
schema.defaultValue = PLACEHOLDERS.CURRENT_USER;
form = service.createFormGroup([{ id: "test" }], new Entity());
diff --git a/src/app/core/common-components/entity-form/entity-form/entity-form.component.spec.ts b/src/app/core/common-components/entity-form/entity-form/entity-form.component.spec.ts
index e57589da85..5d81b59e78 100644
--- a/src/app/core/common-components/entity-form/entity-form/entity-form.component.spec.ts
+++ b/src/app/core/common-components/entity-form/entity-form/entity-form.component.spec.ts
@@ -6,7 +6,7 @@ import { MockedTestingModule } from "../../../../utils/mocked-testing.module";
import { EntityMapperService } from "../../../entity/entity-mapper/entity-mapper.service";
import { ConfirmationDialogService } from "../../confirmation-dialog/confirmation-dialog.service";
import { EntityFormService } from "../entity-form.service";
-import { DateWithAge } from "../../../../child-dev-project/children/model/dateWithAge";
+import { DateWithAge } from "../../../basic-datatypes/date-with-age/dateWithAge";
describe("EntityFormComponent", () => {
let component: EntityFormComponent;
diff --git a/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts b/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
index fd806f216b..7cdc2713ae 100644
--- a/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
+++ b/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
@@ -85,6 +85,7 @@ export class EntityFormComponent
}
if (changes.form && this.form) {
this.initialFormValues = this.form.getRawValue();
+ this.disableForLockedEntity();
}
}
@@ -142,4 +143,14 @@ export class EntityFormComponent
JSON.stringify(entityValue) === JSON.stringify(formValue)
);
}
+
+ /**
+ * Disable the form for certain states of the entity, like it being already anonymized.
+ * @private
+ */
+ private disableForLockedEntity() {
+ if (this.entity?.anonymized) {
+ this.form.disable();
+ }
+ }
}
diff --git a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html
index 487abc8be4..a2908b24f1 100644
--- a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html
+++ b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html
@@ -1,8 +1,24 @@
+
-
+
+
+
+
+
+
+
+
-
+
+
+
diff --git a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.scss b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.scss
index 81846c3786..a79b44d627 100644
--- a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.scss
+++ b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.scss
@@ -24,7 +24,17 @@
justify-content: center;
}
-:host {
+.table {
+ @include mat-elevation.elevation(2);
+}
+
+.table-footer {
@include mat-elevation.elevation(1);
- display: block;
+ border-top: colors.$grey-darker solid 2px;
+}
+
+.filter-inactive-toggle {
+ padding: sizes.$regular;
+ background-color: white;
+ border-top: none;
}
diff --git a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.spec.ts b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.spec.ts
index 806079e239..827eab3465 100644
--- a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.spec.ts
+++ b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.spec.ts
@@ -27,8 +27,8 @@ import { UpdatedEntity } from "../../../entity/model/entity-update";
import { EntityAbility } from "../../../permissions/ability/entity-ability";
import { ScreenWidthObserver } from "../../../../utils/media/screen-size-observer.service";
import { WINDOW_TOKEN } from "../../../../utils/di-tokens";
-import { DateWithAge } from "../../../../child-dev-project/children/model/dateWithAge";
import { FormDialogService } from "../../../form-dialog/form-dialog.service";
+import { DateWithAge } from "../../../basic-datatypes/date-with-age/dateWithAge";
describe("EntitySubrecordComponent", () => {
let component: EntitySubrecordComponent;
@@ -410,4 +410,17 @@ describe("EntitySubrecordComponent", () => {
expect(component.recordsDataSource.data).toEqual([]);
}));
+
+ it("should only show active relations by default", async () => {
+ const active1 = new Entity();
+ active1.inactive = false;
+ const inactive = new Entity();
+ inactive.inactive = true;
+
+ component.records = [active1, inactive];
+
+ component.ngOnChanges({ records: undefined, filter: undefined });
+
+ expect(component.recordsDataSource.data).toEqual([{ record: active1 }]);
+ });
});
diff --git a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts
index e63338eb51..b76a780380 100644
--- a/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts
+++ b/src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.ts
@@ -24,7 +24,7 @@ import {
} from "../../entity-form/entity-form.service";
import { LoggingService } from "../../../logging/logging.service";
import { AnalyticsService } from "../../../analytics/analytics.service";
-import { EntityRemoveService } from "../../../entity/entity-remove.service";
+import { EntityActionsService } from "../../../entity/entity-actions/entity-actions.service";
import { EntityMapperService } from "../../../entity/entity-mapper/entity-mapper.service";
import { tableSort } from "./table-sort";
import {
@@ -50,6 +50,12 @@ import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
import { DisableEntityOperationDirective } from "../../../permissions/permission-directive/disable-entity-operation.directive";
import { Angulartics2Module } from "angulartics2";
import { ListPaginatorComponent } from "../list-paginator/list-paginator.component";
+import {
+ MatCheckboxChange,
+ MatCheckboxModule,
+} from "@angular/material/checkbox";
+import { MatSlideToggleModule } from "@angular/material/slide-toggle";
+import { applyUpdate } from "../../../entity/model/entity-update";
export interface TableRow {
record: T;
@@ -87,14 +93,28 @@ export interface TableRow {
DisableEntityOperationDirective,
Angulartics2Module,
ListPaginatorComponent,
+ MatCheckboxModule,
+ MatSlideToggleModule,
],
standalone: true,
})
export class EntitySubrecordComponent implements OnChanges {
@Input() isLoading: boolean;
-
@Input() clickMode: "popup" | "navigate" | "none" = "popup";
+ /**
+ * outputs an event containing an array of currently selected records (checkmarked by the user)
+ *
+ * Checkboxes to select rows are only displayed if you set "selectable" also.
+ */
+ @Output() selectedRecordsChange: EventEmitter = new EventEmitter();
+ @Input() selectedRecords: T[] = [];
+ readonly COLUMN_ROW_SELECT = "_selectRows";
+ @Input() selectable: boolean = false;
+
+ @Input() showInactive = false;
+ @Output() showInactiveChange = new EventEmitter();
+
/** configuration what kind of columns to be generated for the table */
@Input() set columns(columns: ColumnConfig[]) {
if (columns) {
@@ -110,6 +130,9 @@ export class EntitySubrecordComponent implements OnChanges {
/** data to be displayed, can also be used as two-way-binding */
@Input() records: T[] = [];
+ /** output the currently displayed records, whenever filters for the user change */
+ @Output() filteredRecordsChange = new EventEmitter(true);
+
/**
* factory method to create a new instance of the displayed Entity type
* used when the user adds a new entity to the list.
@@ -163,7 +186,7 @@ export class EntitySubrecordComponent implements OnChanges {
private router: Router,
private analyticsService: AnalyticsService,
private loggingService: LoggingService,
- public entityRemoveService: EntityRemoveService,
+ public entityRemoveService: EntityActionsService,
private entityMapper: EntityMapperService,
private filterService: FilterService,
) {
@@ -180,6 +203,10 @@ export class EntitySubrecordComponent implements OnChanges {
@Input() getBackgroundColor?: (rec: T) => string = (rec: T) => rec.getColor();
private initDataSource() {
+ this.filter = this.filter ?? ({} as DataFilter);
+ this.filterActiveInactive();
+ this.predicate = this.filterService.getFilterPredicate(this.filter);
+
this.recordsDataSource.data = this.records
.filter(this.predicate)
.map((record) => ({ record }));
@@ -228,8 +255,10 @@ export class EntitySubrecordComponent implements OnChanges {
}
}
}
- if (changes.hasOwnProperty("filter") && this.filter) {
- this.predicate = this.filterService.getFilterPredicate(this.filter);
+ if (
+ (changes.hasOwnProperty("filter") && this.filter) ||
+ changes.hasOwnProperty("showInactive")
+ ) {
reinitDataSource = true;
}
if (changes.hasOwnProperty("columns")) {
@@ -240,6 +269,13 @@ export class EntitySubrecordComponent implements OnChanges {
}
if (changes.hasOwnProperty("columnsToDisplay")) {
this.mediaSubscription.unsubscribe();
+ resetupTable = true;
+ }
+ if (
+ changes.hasOwnProperty("editable") ||
+ changes.hasOwnProperty("selectable")
+ ) {
+ resetupTable = true;
}
if (reinitDataSource) {
@@ -255,6 +291,9 @@ export class EntitySubrecordComponent implements OnChanges {
this.sortDefault();
}
+ this.filteredRecordsChange.emit(
+ this.recordsDataSource.filteredData.map((item) => item.record),
+ );
this.listenToEntityUpdates();
}
@@ -262,7 +301,7 @@ export class EntitySubrecordComponent implements OnChanges {
if (this.entityConstructorIsAvailable()) {
try {
this.entityFormService.extendFormFieldConfig(
- this._columns,
+ this.filteredColumns,
this.getEntityConstructor(),
true,
);
@@ -275,7 +314,7 @@ export class EntitySubrecordComponent implements OnChanges {
private sortDefault() {
if (
this.records.length === 0 ||
- this._columns.length === 0 ||
+ this.filteredColumns.length === 0 ||
this.sort.active
) {
// do not overwrite existing sort
@@ -301,11 +340,10 @@ export class EntitySubrecordComponent implements OnChanges {
private inferDefaultSort(): Sort {
// initial sorting by first column, ensure that not the 'action' column is used
- const sortBy =
- this.columnsToDisplay[0] === "actions"
- ? this.columnsToDisplay[1]
- : this.columnsToDisplay[0];
- const sortByColumn = this._columns.find((c) => c.id === sortBy);
+ const sortBy = this.columnsToDisplay.filter(
+ (c) => c !== "actions" && c !== this.COLUMN_ROW_SELECT,
+ )[0];
+ const sortByColumn = this.filteredColumns.find((c) => c.id === sortBy);
let sortDirection: SortDirection = "asc";
if (
@@ -324,19 +362,12 @@ export class EntitySubrecordComponent implements OnChanges {
this.updateSubscription = this.entityMapper
.receiveUpdates(this.getEntityConstructor())
.pipe(untilDestroyed(this))
- .subscribe(({ entity, type }) => {
- if (type === "new") {
- this.addToTable(entity);
- } else if (type === "remove") {
- this.removeFromDataTable(entity);
- } else if (
- type === "update" &&
- !this.records.find((rec) => rec.getId() === entity.getId())
- ) {
- this.addToTable(entity);
- }
+ .subscribe((next) => {
+ this.records = applyUpdate(this.records, next, true);
- if (!this.predicate(entity)) {
+ if (this.predicate(next.entity)) {
+ this.initDataSource();
+ } else {
// hide after a short delay to give a signal in the UI why records disappear by showing the changed values first
setTimeout(() => this.initDataSource(), 5000);
}
@@ -348,7 +379,7 @@ export class EntitySubrecordComponent implements OnChanges {
if (this.screenWidthObserver.isDesktop()) {
if (!row.formGroup) {
row.formGroup = this.entityFormService.createFormGroup(
- this._columns,
+ this.filteredColumns,
row.record,
true,
);
@@ -385,20 +416,6 @@ export class EntitySubrecordComponent implements OnChanges {
row.formGroup = null;
}
- private removeFromDataTable(deleted: T) {
- // use setter so datasource is also updated
- this.records = this.records.filter(
- (rec) => rec.getId() !== deleted.getId(),
- );
- this.initDataSource();
- }
-
- private addToTable(record: T) {
- // use setter so datasource is also updated
- this.records = [record].concat(this.records);
- this.initDataSource();
- }
-
/**
* Create a new entity.
* The entity is only written to the database when the user saves this record which is newly added in edit mode.
@@ -443,12 +460,32 @@ export class EntitySubrecordComponent implements OnChanges {
* resets columnsToDisplay depending on current screensize
*/
private setupTable() {
- if (this._columns !== undefined && this.screenWidth !== undefined) {
- this.columnsToDisplay = this._columns
- .filter((col) => this.isVisible(col))
- .map((col) => col.id);
- this.columnsToDisplay.unshift("actions");
+ let columns =
+ this.columnsToDisplay?.filter((c) =>
+ this.filteredColumns.some((column) => column.id === c),
+ ) ?? [];
+
+ if (
+ !(columns.length > 0) &&
+ this.filteredColumns !== undefined &&
+ this.screenWidth !== undefined
+ ) {
+ columns = [
+ ...this._columns
+ .filter((col) => this.isVisible(col))
+ .map((col) => col.id),
+ ];
+ }
+
+ if (this.editable) {
+ columns.unshift("actions");
+ }
+ if (this.selectable) {
+ // only show selection checkboxes if Output is used in parent
+ columns.unshift(this.COLUMN_ROW_SELECT);
}
+
+ this.columnsToDisplay = [...columns];
}
/**
@@ -468,4 +505,34 @@ export class EntitySubrecordComponent implements OnChanges {
}
return this.screenWidthObserver.currentScreenSize() >= numericValue;
}
+
+ selectRow(row: TableRow, event: MatCheckboxChange) {
+ if (event.checked) {
+ this.selectedRecords.push(row.record);
+ } else {
+ const index = this.selectedRecords.indexOf(row.record);
+ if (index > -1) {
+ this.selectedRecords.splice(index, 1);
+ }
+ }
+
+ this.selectedRecordsChange.emit(this.selectedRecords);
+ }
+
+ filterActiveInactive() {
+ if (this.showInactive) {
+ // @ts-ignore type has issues with getters
+ delete this.filter.isActive;
+ } else {
+ this.filter["isActive"] = true;
+ }
+ }
+
+ setActiveInactiveFilter(newValue: boolean) {
+ if (newValue !== this.showInactive) {
+ this.showInactive = newValue;
+ this.showInactiveChange.emit(newValue);
+ }
+ this.initDataSource();
+ }
}
diff --git a/src/app/core/common-components/entity-subrecord/row-details/row-details.component.html b/src/app/core/common-components/entity-subrecord/row-details/row-details.component.html
index 1a414fccfa..9f55fc6fac 100644
--- a/src/app/core/common-components/entity-subrecord/row-details/row-details.component.html
+++ b/src/app/core/common-components/entity-subrecord/row-details/row-details.component.html
@@ -1,28 +1,34 @@
+
-
-
+
+
+
+
+
-
-
- {{ col.label }}:
-
-
+
+
+ {{ col.label }}:
+
+
+
+
diff --git a/src/app/core/common-components/entity-subrecord/row-details/row-details.component.ts b/src/app/core/common-components/entity-subrecord/row-details/row-details.component.ts
index 9046cf1cd9..4f84211622 100644
--- a/src/app/core/common-components/entity-subrecord/row-details/row-details.component.ts
+++ b/src/app/core/common-components/entity-subrecord/row-details/row-details.component.ts
@@ -14,6 +14,7 @@ import { DynamicComponentDirective } from "../../../config/dynamic-components/dy
import { MatTooltipModule } from "@angular/material/tooltip";
import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
import { DialogButtonsComponent } from "../../../form-dialog/dialog-buttons/dialog-buttons.component";
+import { EntityArchivedInfoComponent } from "../../../entity-details/entity-archived-info/entity-archived-info.component";
/**
* Data interface that must be given when opening the dialog
@@ -44,6 +45,7 @@ export interface DetailsComponentData {
NgIf,
DynamicComponentDirective,
DialogButtonsComponent,
+ EntityArchivedInfoComponent,
],
standalone: true,
})
diff --git a/src/app/core/config/config-fix.ts b/src/app/core/config/config-fix.ts
index 0c160bf969..a7db8c1390 100644
--- a/src/app/core/config/config-fix.ts
+++ b/src/app/core/config/config-fix.ts
@@ -258,20 +258,6 @@ export const defaultJsonConfig = {
]
}
},
- "appConfig:note-details": {
- "topForm": ["date", "warningLevel", "category", "authors", "attachment"]
- },
- "entity:Note": {
- "attributes": [
- {
- "name": "attachment",
- "schema": {
- "label": $localize`Attachment`,
- "dataType": "file"
- }
- }
- ]
- },
"view:site-settings/:id": {
"component": "EntityDetails",
"config": {
@@ -556,15 +542,6 @@ export const defaultJsonConfig = {
]
},
"filters": [
- {
- "id": "isActive",
- "type": "boolean",
- "default": "true",
- "label": $localize`Children`,
- "true": $localize`:Active children filter label - true case:Active`,
- "false": $localize`:Active children filter label - false case:Inactive`,
- "all": $localize`:Active children unselect option:All`
- },
{
"id": "center"
},
@@ -573,6 +550,13 @@ export const defaultJsonConfig = {
"type": "School",
"label": $localize`:Label of schools filter:School`
}
+ ],
+ "exportConfig": [
+ { "label": "Name", "query": "name" },
+ { "label": "Gender", "query": "gender" },
+ { "label": "Date of Birth", "query": "dateOfBirth" },
+ { "label": "School", "query": ".schoolId:toEntities(School).name" },
+ { "label": "more fields can be configured - or all data exported", "query": "projectNumber" }
]
}
},
@@ -771,17 +755,6 @@ export const defaultJsonConfig = {
"type",
"assignedTo"
],
- "filters": [
- {
- "id": "isActive",
- "type": "boolean",
- "default": "true",
- "label": $localize`Status`,
- "true": $localize`:Active records filter label - true case:Active`,
- "false": $localize`:Active records filter label - false case:Inactive`,
- "all": $localize`:Active records unselect option:All`
- },
- ],
"exportConfig": [
{ "label": "Title", "query": "title" },
{ "label": "Type", "query": "type" },
@@ -909,6 +882,19 @@ export const defaultJsonConfig = {
"label": $localize`:Name of a column of a report:Name`,
"query": `.participant:toEntities(Child).name`
},
+ {
+ "query": ".participant:toEntities(Child):getRelated(ChildSchoolRelation, childId)[*isActive=true]",
+ "subQueries": [
+ {
+ "label": "Class",
+ "query": ".schoolClass"
+ },
+ {
+ "label": "School",
+ "query": ".schoolId:toEntities(School).name"
+ },
+ ]
+ },
{
"label": $localize`:Name of a column of a report:Total`,
"query": `total`
diff --git a/src/app/core/config/dynamic-routing/router.service.spec.ts b/src/app/core/config/dynamic-routing/router.service.spec.ts
index e78ab00c14..d4b4dcca37 100644
--- a/src/app/core/config/dynamic-routing/router.service.spec.ts
+++ b/src/app/core/config/dynamic-routing/router.service.spec.ts
@@ -10,9 +10,9 @@ import { ViewConfig } from "./view-config.interface";
import { UserRoleGuard } from "../../permissions/permission-guard/user-role.guard";
import { ApplicationLoadingComponent } from "./empty/application-loading.component";
import { NotFoundComponent } from "./not-found/not-found.component";
-import { componentRegistry } from "../../../dynamic-components";
import { MockedTestingModule } from "../../../utils/mocked-testing.module";
import { AuthGuard } from "../../session/auth.guard";
+import { RoutedViewComponent } from "../../ui/routed-view/routed-view.component";
class TestComponent extends Component {}
@@ -63,24 +63,24 @@ describe("RouterService", () => {
const expectedRoutes = [
{
path: "child",
- loadComponent: componentRegistry.get("ChildrenList"),
- data: {},
+ component: RoutedViewComponent,
+ data: { component: "ChildrenList" },
canDeactivate: [jasmine.any(Function)],
canActivate: [AuthGuard],
},
{
path: "child/:id",
- loadComponent: componentRegistry.get("EntityDetails"),
- data: { config: testViewConfig },
+ component: RoutedViewComponent,
+ data: { component: "EntityDetails", config: testViewConfig },
canDeactivate: [jasmine.any(Function)],
canActivate: [AuthGuard],
},
{
path: "list",
- loadComponent: componentRegistry.get("EntityList"),
+ component: RoutedViewComponent,
+ data: { component: "EntityList", permittedUserRoles: ["user_app"] },
canActivate: [AuthGuard, UserRoleGuard],
canDeactivate: [jasmine.any(Function)],
- data: { permittedUserRoles: ["user_app"] },
},
];
@@ -144,9 +144,11 @@ describe("RouterService", () => {
const router = TestBed.inject(Router);
expect(router.config.find((r) => r.path === "child").data).toEqual({
+ component: "ChildrenList",
config: { foo: 1 },
});
expect(router.config.find((r) => r.path === "child2").data).toEqual({
+ component: "ChildrenList",
config: { foo: 2 },
});
});
@@ -162,10 +164,10 @@ describe("RouterService", () => {
const expectedRoutes = [
{
path: "list",
- loadComponent: componentRegistry.get("EntityList"),
+ component: RoutedViewComponent,
+ data: { component: "EntityList", permittedUserRoles: ["admin"] },
canActivate: [AuthGuard, UserRoleGuard],
canDeactivate: [jasmine.any(Function)],
- data: { permittedUserRoles: ["admin"] },
},
];
const router = TestBed.inject(Router);
@@ -186,14 +188,4 @@ describe("RouterService", () => {
expect(wildcardRoute).toEqual({ path: "**", component: NotFoundComponent });
});
-
- it("should log a warning if a view config has a component which is not registered", () => {
- const testViewConfigs: ViewConfig[] = [
- { _id: "view:child", component: "Support" },
- ];
-
- service.reloadRouting(testViewConfigs);
-
- expect(mockLoggingService.warn).toHaveBeenCalled();
- });
});
diff --git a/src/app/core/config/dynamic-routing/router.service.ts b/src/app/core/config/dynamic-routing/router.service.ts
index d279b85737..f087dfd363 100644
--- a/src/app/core/config/dynamic-routing/router.service.ts
+++ b/src/app/core/config/dynamic-routing/router.service.ts
@@ -2,16 +2,12 @@ import { inject, Injectable } from "@angular/core";
import { Route, Router } from "@angular/router";
import { ConfigService } from "../config.service";
import { LoggingService } from "../../logging/logging.service";
-import {
- PREFIX_VIEW_CONFIG,
- RouteData,
- ViewConfig,
-} from "./view-config.interface";
+import { PREFIX_VIEW_CONFIG, ViewConfig } from "./view-config.interface";
import { UserRoleGuard } from "../../permissions/permission-guard/user-role.guard";
import { NotFoundComponent } from "./not-found/not-found.component";
-import { ComponentRegistry } from "../../../dynamic-components";
import { AuthGuard } from "../../session/auth.guard";
import { UnsavedChangesService } from "../../entity-details/form/unsaved-changes.service";
+import { RoutedViewComponent } from "../../ui/routed-view/routed-view.component";
/**
* The RouterService dynamically sets up Angular routing from config loaded through the {@link ConfigService}.
@@ -27,7 +23,6 @@ export class RouterService {
private configService: ConfigService,
private router: Router,
private loggingService: LoggingService,
- private components: ComponentRegistry,
) {}
/**
@@ -82,14 +77,15 @@ export class RouterService {
return this.generateRouteFromConfig(view, route);
} else {
return this.generateRouteFromConfig(view, {
- loadComponent: this.components.get(view.component),
path,
+ component: RoutedViewComponent,
+ data: { component: view.component },
});
}
}
private generateRouteFromConfig(view: ViewConfig, route: Route): Route {
- const routeData: RouteData = {};
+ route.data = route.data ?? {};
route.canActivate = [AuthGuard];
route.canDeactivate = [
() => inject(UnsavedChangesService).checkUnsavedChanges(),
@@ -97,14 +93,13 @@ export class RouterService {
if (view.permittedUserRoles) {
route.canActivate.push(UserRoleGuard);
- routeData.permittedUserRoles = view.permittedUserRoles;
+ route.data.permittedUserRoles = view.permittedUserRoles;
}
if (view.config) {
- routeData.config = view.config;
+ route.data.config = view.config;
}
- route.data = routeData;
return route;
}
}
diff --git a/src/app/core/config/dynamic-routing/view-config.interface.ts b/src/app/core/config/dynamic-routing/view-config.interface.ts
index 6f6f4dd94f..c2d311ba55 100644
--- a/src/app/core/config/dynamic-routing/view-config.interface.ts
+++ b/src/app/core/config/dynamic-routing/view-config.interface.ts
@@ -44,10 +44,13 @@ export const PREFIX_VIEW_CONFIG = "view:";
* It contains static data which are used to build components and manage permissions.
* The generic type defines the interface for the component specific configuration.
*
- * It can be accessed through the activated route:
- * ```
- * constructor(private route: ActivatedRoute) {
- * this.route.data.subscribe(routeData: RouteData => { ...what to do with the data })'
+ * The properties given in the `config` object here are automatically assigned to the component as `@Input()` properties.
+ * e.g. for an RouteData `{ config: { "entityType: "Child", "filtered": true } }`
+ * your component `MyViewComponent` will receive the values mapped to its properties:
+ * ```javascript
+ * class MyViewComponent {
+ * @Input() entityType: string;
+ * @Input() filtered: boolean;
* }
* ```
*/
diff --git a/src/app/core/core-components.ts b/src/app/core/core-components.ts
index eb43460952..093bf0b140 100644
--- a/src/app/core/core-components.ts
+++ b/src/app/core/core-components.ts
@@ -225,4 +225,11 @@ export const coreComponents: ComponentTuple[] = [
"./entity-details/related-time-period-entities/related-time-period-entities.component"
).then((c) => c.RelatedTimePeriodEntitiesComponent),
],
+ [
+ "RelatedEntitiesWithSummary",
+ () =>
+ import(
+ "./entity-details/related-entities-with-summary/related-entities-with-summary.component"
+ ).then((c) => c.RelatedEntitiesWithSummaryComponent),
+ ],
];
diff --git a/src/app/core/dashboard/dashboard/dashboard.component.spec.ts b/src/app/core/dashboard/dashboard/dashboard.component.spec.ts
index 4c5692beb7..27b11bd14b 100644
--- a/src/app/core/dashboard/dashboard/dashboard.component.spec.ts
+++ b/src/app/core/dashboard/dashboard/dashboard.component.spec.ts
@@ -1,26 +1,13 @@
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { DashboardComponent } from "./dashboard.component";
-import { ActivatedRoute } from "@angular/router";
-import { BehaviorSubject } from "rxjs";
-import { RouteData } from "../../config/dynamic-routing/view-config.interface";
-import { DynamicComponentConfig } from "../../config/dynamic-components/dynamic-component-config.interface";
describe("DashboardComponent", () => {
let component: DashboardComponent;
let fixture: ComponentFixture;
- let mockRouteData: BehaviorSubject<
- RouteData<{ widgets: DynamicComponentConfig[] }>
- >;
-
beforeEach(() => {
- mockRouteData = new BehaviorSubject({ config: { widgets: [] } });
-
TestBed.configureTestingModule({
imports: [DashboardComponent],
- providers: [
- { provide: ActivatedRoute, useValue: { data: mockRouteData } },
- ],
}).compileComponents();
});
@@ -33,21 +20,4 @@ describe("DashboardComponent", () => {
it("should create", () => {
expect(component).toBeTruthy();
});
-
- it("should init with widget config from activated route", () => {
- const testDashboardConfig = {
- widgets: [
- {
- component: "ProgressDashboard",
- },
- {
- component: "ProgressDashboard",
- },
- ],
- };
-
- mockRouteData.next({ config: testDashboardConfig });
-
- expect(component.widgets).toEqual(testDashboardConfig.widgets);
- });
});
diff --git a/src/app/core/dashboard/dashboard/dashboard.component.ts b/src/app/core/dashboard/dashboard/dashboard.component.ts
index 0ea0fd0444..e0ca13a494 100644
--- a/src/app/core/dashboard/dashboard/dashboard.component.ts
+++ b/src/app/core/dashboard/dashboard/dashboard.component.ts
@@ -15,10 +15,8 @@
* along with ndb-core. If not, see .
*/
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { Component, Input } from "@angular/core";
import { DynamicComponentConfig } from "../../config/dynamic-components/dynamic-component-config.interface";
-import { RouteData } from "../../config/dynamic-routing/view-config.interface";
import { RouteTarget } from "../../../app.routing";
import { NgFor } from "@angular/common";
import { DynamicComponentDirective } from "../../config/dynamic-components/dynamic-component.directive";
@@ -34,16 +32,10 @@ import { DynamicComponentDirective } from "../../config/dynamic-components/dynam
imports: [NgFor, DynamicComponentDirective],
standalone: true,
})
-export class DashboardComponent implements OnInit {
- widgets: DynamicComponentConfig[] = [];
-
- constructor(private activatedRoute: ActivatedRoute) {}
+export class DashboardComponent implements DashboardConfig {
+ @Input() widgets: DynamicComponentConfig[] = [];
+}
- ngOnInit() {
- this.activatedRoute.data.subscribe(
- (data: RouteData<{ widgets: DynamicComponentConfig[] }>) => {
- this.widgets = data.config.widgets;
- },
- );
- }
+export interface DashboardConfig {
+ widgets: DynamicComponentConfig[];
}
diff --git a/src/app/core/database/pouch-database.spec.ts b/src/app/core/database/pouch-database.spec.ts
index 49f9774b61..7d455c9049 100644
--- a/src/app/core/database/pouch-database.spec.ts
+++ b/src/app/core/database/pouch-database.spec.ts
@@ -259,7 +259,11 @@ describe("PouchDatabase tests", () => {
},
];
- const results = await database.putAll(dataWithConflicts);
+ await expectAsync(database.putAll(dataWithConflicts)).toBeRejectedWith([
+ conflictError,
+ jasmine.objectContaining({ id: "4", ok: true }),
+ jasmine.objectContaining({ id: "5", ok: true }),
+ ]);
expect(resolveConflictSpy.calls.allArgs()).toEqual([
[
{
@@ -271,11 +275,6 @@ describe("PouchDatabase tests", () => {
jasmine.objectContaining({ status: 409 }),
],
]);
- expect(results).toEqual([
- conflictError,
- jasmine.objectContaining({ id: "4", ok: true }),
- jasmine.objectContaining({ id: "5", ok: true }),
- ]);
});
it("should correctly determine if database is empty", async () => {
diff --git a/src/app/core/database/pouch-database.ts b/src/app/core/database/pouch-database.ts
index 8a3ae8e649..90fc67fdd8 100644
--- a/src/app/core/database/pouch-database.ts
+++ b/src/app/core/database/pouch-database.ts
@@ -211,7 +211,8 @@ export class PouchDatabase extends Database {
* Save an array of documents to the database
* @param objects the documents to be saved
* @param forceOverwrite whether conflicting versions should be overwritten
- * @returns array holding `{ ok: true, ... }` or `{ error: true, ... }` depending on whether the document could be saved
+ * @returns array with the result for each object to be saved, if any item fails to be saved, this returns a rejected Promise.
+ * The save can partially fail and return a mix of success and error states in the array (e.g. `[{ ok: true, ... }, { error: true, ... }]`)
*/
async putAll(objects: any[], forceOverwrite = false): Promise {
if (forceOverwrite) {
@@ -227,11 +228,17 @@ export class PouchDatabase extends Database {
if (result.status === 409) {
results[i] = await this.resolveConflict(
objects.find((obj) => obj._id === result.id),
- false,
+ forceOverwrite,
result,
- ).catch((e) => e);
+ ).catch((e) => {
+ return new DatabaseException(e);
+ });
}
}
+
+ if (results.some((r) => r instanceof Error)) {
+ return Promise.reject(results);
+ }
return results;
}
diff --git a/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.html b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.html
new file mode 100644
index 0000000000..dc0ba188be
--- /dev/null
+++ b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.html
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/child-dev-project/attendance/activities-overview/activities-overview.component.scss b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.scss
similarity index 100%
rename from src/app/child-dev-project/attendance/activities-overview/activities-overview.component.scss
rename to src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.scss
diff --git a/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.spec.ts b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.spec.ts
new file mode 100644
index 0000000000..9854810c04
--- /dev/null
+++ b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.spec.ts
@@ -0,0 +1,48 @@
+import {
+ ComponentFixture,
+ fakeAsync,
+ TestBed,
+ tick,
+} from "@angular/core/testing";
+
+import { EntityActionsMenuComponent } from "./entity-actions-menu.component";
+import { EntityActionsService } from "../../entity/entity-actions/entity-actions.service";
+import { MockedTestingModule } from "../../../utils/mocked-testing.module";
+
+describe("EntityActionsMenuComponent", () => {
+ let component: EntityActionsMenuComponent;
+ let fixture: ComponentFixture;
+
+ let mockEntityRemoveService: jasmine.SpyObj;
+
+ beforeEach(() => {
+ mockEntityRemoveService = jasmine.createSpyObj(["delete"]);
+ TestBed.configureTestingModule({
+ imports: [EntityActionsMenuComponent, MockedTestingModule],
+ providers: [
+ { provide: EntityActionsService, useValue: mockEntityRemoveService },
+ ],
+ });
+ fixture = TestBed.createComponent(EntityActionsMenuComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it("should create", () => {
+ expect(component).toBeTruthy();
+ });
+
+ it("should emit actionTriggered Output upon action", fakeAsync(() => {
+ mockEntityRemoveService.delete.and.resolveTo(true);
+
+ let actionEvent;
+ component.actionTriggered.subscribe((x) => (actionEvent = x));
+
+ component.executeAction(
+ component.defaultActions.find((x) => x.action === "delete"),
+ );
+ tick();
+
+ expect(actionEvent).toBe("delete");
+ }));
+});
diff --git a/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
new file mode 100644
index 0000000000..625821d4af
--- /dev/null
+++ b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
@@ -0,0 +1,119 @@
+import {
+ Component,
+ EventEmitter,
+ Input,
+ OnChanges,
+ Output,
+ SimpleChanges,
+} from "@angular/core";
+import { EntityActionsService } from "../../entity/entity-actions/entity-actions.service";
+import { Entity } from "../../entity/model/entity";
+import { NgForOf, NgIf } from "@angular/common";
+import { MatButtonModule } from "@angular/material/button";
+import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
+import { MatMenuModule } from "@angular/material/menu";
+import { Angulartics2Module } from "angulartics2";
+import { DisableEntityOperationDirective } from "../../permissions/permission-directive/disable-entity-operation.directive";
+import { IconProp } from "@fortawesome/fontawesome-svg-core";
+import { EntityAction } from "../../permissions/permission-types";
+import { MatTooltipModule } from "@angular/material/tooltip";
+
+export type EntityMenuAction = "archive" | "anonymize" | "delete";
+type EntityMenuActionItem = {
+ action: EntityMenuAction;
+ execute: (entity: Entity, navigateOnDelete?: boolean) => Promise;
+ permission?: EntityAction;
+ icon: IconProp;
+ label: string;
+ tooltip?: string;
+};
+
+@Component({
+ selector: "app-entity-actions-menu",
+ templateUrl: "./entity-actions-menu.component.html",
+ styleUrls: ["./entity-actions-menu.component.scss"],
+ standalone: true,
+ imports: [
+ NgIf,
+ MatButtonModule,
+ FontAwesomeModule,
+ MatMenuModule,
+ Angulartics2Module,
+ DisableEntityOperationDirective,
+ NgForOf,
+ MatTooltipModule,
+ ],
+})
+export class EntityActionsMenuComponent implements OnChanges {
+ @Input() entity: Entity;
+
+ /**
+ * whether the "delete" action will trigger a navigation back to the parent list.
+ * This is useful when the entity is deleted from a fullscreen detail view but not for an overlay.
+ */
+ @Input() navigateOnDelete: boolean = false;
+
+ @Output() actionTriggered = new EventEmitter();
+
+ /**
+ * The actions being displayed as menu items.
+ */
+ actions: EntityMenuActionItem[];
+
+ readonly defaultActions: EntityMenuActionItem[] = [
+ {
+ action: "archive",
+ execute: (e) => this.entityRemoveService.archive(e),
+ permission: "update",
+ icon: "box-archive",
+ label: $localize`:entity context menu:Archive`,
+ tooltip: $localize`:entity context menu tooltip:Mark the record as inactive, hiding it from lists by default while keeping the data.`,
+ },
+ {
+ action: "anonymize",
+ execute: (e) => this.entityRemoveService.anonymize(e),
+ permission: "update",
+ icon: "user-secret",
+ label: $localize`:entity context menu:Anonymize`,
+ tooltip: $localize`:entity context menu tooltip:Remove all personal data and keep an archived basic record for statistical reporting.`,
+ },
+ {
+ action: "delete",
+ execute: (e, nav) => this.entityRemoveService.delete(e, nav),
+ permission: "delete",
+ icon: "trash",
+ label: $localize`:entity context menu:Delete`,
+ tooltip: $localize`:entity context menu tooltip:Remove the record completely from the database.`,
+ },
+ ];
+
+ constructor(private entityRemoveService: EntityActionsService) {}
+
+ ngOnChanges(changes: SimpleChanges): void {
+ if (changes.entity) {
+ this.filterAvailableActions();
+ }
+ }
+
+ private filterAvailableActions() {
+ this.actions = this.defaultActions.filter((action) => {
+ switch (action.action) {
+ case "archive":
+ return this.entity?.isActive && !this.entity?.anonymized;
+ case "anonymize":
+ return (
+ !this.entity?.anonymized && this.entity?.getConstructor().hasPII
+ );
+ default:
+ return true;
+ }
+ });
+ }
+
+ async executeAction(action: EntityMenuActionItem) {
+ const result = await action.execute(this.entity, this.navigateOnDelete);
+ if (result) {
+ this.actionTriggered.emit(action.action);
+ }
+ }
+}
diff --git a/src/app/core/entity-details/entity-archived-info/entity-archived-info.component.html b/src/app/core/entity-details/entity-archived-info/entity-archived-info.component.html
new file mode 100644
index 0000000000..a86f54544a
--- /dev/null
+++ b/src/app/core/entity-details/entity-archived-info/entity-archived-info.component.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+ Archived
+ Anonymized & Archived
+
+
+
+
+ This record has been anonymized. Details containing personal information
+ have been deleted and cannot be restored. For statistical reporting, this
+ basic record has been kept.
+
+
+
+ This record is archived and will be be hidden from lists and select
+ options by default.
+
diff --git a/src/assets/locale/messages.xlf b/src/assets/locale/messages.xlf
index 6af5b1aef6..c90fd19047 100644
--- a/src/assets/locale/messages.xlf
+++ b/src/assets/locale/messages.xlf
@@ -56,7 +56,7 @@
src/app/core/config/config-fix.ts
- 886
+ 859Events of an attendance
@@ -105,14 +105,14 @@
Savesrc/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts
- 54
+ 45Discardsrc/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts
- 63
+ 54Discard changes made to a form
@@ -120,7 +120,7 @@
Select Eventsrc/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts
- 72
+ 63One of the stages while recording child-attendances
@@ -128,7 +128,7 @@
Record Attendancesrc/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts
- 73
+ 64One of the stages while recording child-attendances
@@ -136,7 +136,7 @@
Exitsrc/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts
- 94
+ 80Exit from the current screen
@@ -144,7 +144,7 @@
Do you want to save your progress before going back?src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.ts
- 95
+ 81
@@ -190,11 +190,18 @@
Alert when selected date is invalid
+
+ Excluded some archived participants. Click to include.
+
+ src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html
+ 58
+
+ Attendance completed. src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html
- 107,109
+ 120,122shows when the user has registered the attendance
of all children
@@ -204,7 +211,7 @@
Review Details src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html
- 117,119
+ 130,132Open details of recorded event for review
@@ -212,10 +219,24 @@
Back to Overview src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html
- 127,129
+ 140,142Back to overview button after finishing a roll call
+
+ Also include archived participants?
+
+ src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.ts
+ 271
+
+
+
+ This event has some participants who are "archived". We automatically remove them from the attendance list for you. Do you want to also include archived participants for this event?
+
+ src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.ts
+ 272
+
+ attended events
@@ -623,11 +644,11 @@
src/app/core/config/config-fix.ts
- 813
+ 786src/app/core/config/config-fix.ts
- 891
+ 864Label for the participants of a recurring activity
@@ -639,7 +660,7 @@
src/app/child-dev-project/notes/model/note.ts
- 144
+ 167Label for the linked schools of a recurring activity
@@ -663,7 +684,7 @@
Datesrc/app/child-dev-project/children/aser/model/aser.ts
- 30
+ 39src/app/child-dev-project/children/educational-material/model/educational-material.ts
@@ -671,15 +692,15 @@
src/app/child-dev-project/children/health-checkup/model/health-check.ts
- 34
+ 45src/app/child-dev-project/notes/model/note.ts
- 92
+ 99src/app/features/historical-data/model/historical-entity-data.ts
- 13
+ 16Label for date of the ASER results
@@ -687,7 +708,7 @@
Hindisrc/app/child-dev-project/children/aser/model/aser.ts
- 35
+ 46src/app/child-dev-project/schools/demo-school-generator.service.ts
@@ -699,7 +720,7 @@
Bengalisrc/app/child-dev-project/children/aser/model/aser.ts
- 41
+ 52src/app/child-dev-project/schools/demo-school-generator.service.ts
@@ -711,7 +732,7 @@
Englishsrc/app/child-dev-project/children/aser/model/aser.ts
- 47
+ 58src/app/child-dev-project/schools/demo-school-generator.service.ts
@@ -723,7 +744,7 @@
Mathsrc/app/child-dev-project/children/aser/model/aser.ts
- 53
+ 64Label of the Math ASER result
@@ -731,11 +752,11 @@
Remarkssrc/app/child-dev-project/children/aser/model/aser.ts
- 59
+ 71src/app/core/config/config-fix.ts
- 1055
+ 1041Label for the remarks of a ASER result
@@ -836,7 +857,7 @@
src/app/core/config/config-fix.ts
- 747
+ 731Child status
@@ -956,7 +977,7 @@
src/app/features/todos/model/todo.ts
- 61
+ 64An additional description for the borrowed material
@@ -1149,7 +1170,7 @@
src/app/core/config/config-fix.ts
- 488
+ 474Table header, Short for Body Mass Index
@@ -1165,7 +1186,7 @@
Height [cm]src/app/child-dev-project/children/health-checkup/model/health-check.ts
- 39
+ 52Label for height in cm of a health check
@@ -1173,7 +1194,7 @@
Weight [kg]src/app/child-dev-project/children/health-checkup/model/health-check.ts
- 47
+ 60Label for weight in kg of a health check
@@ -1189,7 +1210,7 @@
Namesrc/app/child-dev-project/children/model/child.ts
- 46
+ 47src/app/child-dev-project/schools/model/school.ts
@@ -1197,15 +1218,15 @@
src/app/core/config/config-fix.ts
- 447
+ 433src/app/core/config/config-fix.ts
- 909
+ 882src/app/core/config/config-fix.ts
- 1013
+ 999Label for the name of a child
@@ -1213,7 +1234,7 @@
Project Numbersrc/app/child-dev-project/children/model/child.ts
- 54
+ 55Label for the project number of a child
@@ -1221,7 +1242,7 @@
PNsrc/app/child-dev-project/children/model/child.ts
- 55
+ 56Short label for the project number
@@ -1229,7 +1250,7 @@
Date of birthsrc/app/child-dev-project/children/model/child.ts
- 61
+ 63Label for the date of birth of a child
@@ -1237,7 +1258,7 @@
DoBsrc/app/child-dev-project/children/model/child.ts
- 62
+ 64Short label for the date of birth
@@ -1245,7 +1266,7 @@
Gendersrc/app/child-dev-project/children/model/child.ts
- 68
+ 71Label for the gender of a child
@@ -1253,7 +1274,7 @@
Centersrc/app/child-dev-project/children/model/child.ts
- 76
+ 80Label for the center of a child
@@ -1261,7 +1282,7 @@
Admissionsrc/app/child-dev-project/children/model/child.ts
- 81
+ 86Label for the admission date of a child
@@ -1269,11 +1290,11 @@
Statussrc/app/child-dev-project/children/model/child.ts
- 86
+ 92src/app/child-dev-project/notes/model/note.ts
- 151
+ 176src/app/core/config/config-fix.ts
@@ -1281,11 +1302,7 @@
src/app/core/config/config-fix.ts
- 524
-
-
- src/app/core/config/config-fix.ts
- 779
+ 510Label for the status of a child
@@ -1293,7 +1310,7 @@
Dropout Datesrc/app/child-dev-project/children/model/child.ts
- 91
+ 97Label for the dropout date of a child
@@ -1301,7 +1318,7 @@
Dropout Typesrc/app/child-dev-project/children/model/child.ts
- 96
+ 103Label for the type of dropout of a child
@@ -1309,7 +1326,7 @@
Dropout remarkssrc/app/child-dev-project/children/model/child.ts
- 101
+ 109Label for the remarks about a dropout of a child
@@ -1317,7 +1334,7 @@
Photosrc/app/child-dev-project/children/model/child.ts
- 112
+ 120Label for the file field of a photo of a child
@@ -1325,11 +1342,11 @@
Phone Numbersrc/app/child-dev-project/children/model/child.ts
- 118
+ 126src/app/core/config/config-fix.ts
- 1041
+ 1027Label for the phone number of a child
@@ -1337,11 +1354,11 @@
Childsrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 13
+ 15src/app/core/config/config-fix.ts
- 959
+ 945Label for the child of a relation
@@ -1349,7 +1366,7 @@
Schoolsrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 23
+ 27src/app/child-dev-project/schools/demo-school-generator.service.ts
@@ -1361,11 +1378,11 @@
src/app/core/config/config-fix.ts
- 463
+ 449src/app/core/config/config-fix.ts
- 574
+ 551Label for the school of a relation
@@ -1373,11 +1390,11 @@
Classsrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 32
+ 38src/app/core/config/config-fix.ts
- 458
+ 444Label for the class of a relation
@@ -1385,7 +1402,7 @@
Start datesrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 37
+ 43src/app/core/entity-details/related-time-period-entities/time-period.ts
@@ -1393,7 +1410,7 @@
src/app/features/todos/model/todo.ts
- 54
+ 56Label for the start date of a relation
@@ -1401,7 +1418,7 @@
The date a child joins a schoolsrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 38
+ 44Description of the start date of a relation
@@ -1409,7 +1426,7 @@
End datesrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 44
+ 51src/app/core/entity-details/related-time-period-entities/time-period.ts
@@ -1421,7 +1438,7 @@
The date of a child leaving the schoolsrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 45
+ 52Description of the end date of a relation
@@ -1429,7 +1446,7 @@
Resultsrc/app/child-dev-project/children/model/childSchoolRelation.ts
- 51
+ 59Label for the percentage result of a relation
@@ -1877,7 +1894,7 @@
src/app/child-dev-project/notes/model/note.ts
- 100
+ 110src/app/core/config/config-fix.ts
@@ -1889,7 +1906,7 @@
Childrensrc/app/child-dev-project/notes/model/note.ts
- 76
+ 77src/app/core/config/config-fix.ts
@@ -1897,11 +1914,7 @@
src/app/core/config/config-fix.ts
- 563
-
-
- src/app/core/config/config-fix.ts
- 960
+ 946Label for the children of a note
@@ -1909,11 +1922,11 @@
Subjectsrc/app/child-dev-project/notes/model/note.ts
- 97
+ 106src/app/features/todos/model/todo.ts
- 42
+ 43Label for the subject of a note
@@ -1921,7 +1934,7 @@
SWsrc/app/child-dev-project/notes/model/note.ts
- 106
+ 117Label for the social worker(s) who created the note
@@ -1929,19 +1942,26 @@
Categorysrc/app/child-dev-project/notes/model/note.ts
- 114
+ 126Label for the category of a note
+
+ Attachment
+
+ src/app/child-dev-project/notes/model/note.ts
+ 134
+
+ Related Recordssrc/app/child-dev-project/notes/model/note.ts
- 132
+ 154src/app/features/todos/model/todo.ts
- 83
+ 87label for the related Entities
@@ -1949,7 +1969,7 @@
Download details src/app/child-dev-project/notes/note-details/note-details.component.html
- 90
+ 94Download note details as CSV
@@ -1970,7 +1990,7 @@
Urgentsrc/app/child-dev-project/notes/notes-manager/notes-manager.component.ts
- 66
+ 65Filter-option for notes
@@ -1978,7 +1998,7 @@
Needs Follow-Upsrc/app/child-dev-project/notes/notes-manager/notes-manager.component.ts
- 71
+ 70src/app/child-dev-project/warning-level.ts
@@ -1990,19 +2010,11 @@
Allsrc/app/child-dev-project/notes/notes-manager/notes-manager.component.ts
- 76
+ 75src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts
- 90
-
-
- src/app/core/config/config-fix.ts
- 566
-
-
- src/app/core/config/config-fix.ts
- 782
+ 89src/app/core/filter/filters/filters.ts
@@ -2025,7 +2037,7 @@
This Weeksrc/app/child-dev-project/notes/notes-manager/notes-manager.component.ts
- 82
+ 81Filter-option for notes
@@ -2033,7 +2045,7 @@
Since Last Weeksrc/app/child-dev-project/notes/notes-manager/notes-manager.component.ts
- 87
+ 86Filter-option for notes
@@ -2140,11 +2152,18 @@
title of dropdown options popup dialog
+
+ Add new option
+
+ src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.html
+ 32
+
+ Closesrc/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.html
- 29
+ 46src/app/core/filter/filter-overlay/filter-overlay.component.html
@@ -2156,7 +2175,7 @@
Are you sure that you want to delete the option ""?src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.ts
- 71
+ 73
@@ -2165,21 +2184,21 @@
)"/> records. If deleted, the records will not be lost but specially marked.
src/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.ts
- 73,75
+ 75,77Delete optionsrc/app/core/basic-datatypes/configurable-enum/configure-enum-popup/configure-enum-popup.component.ts
- 78
+ 80Agesrc/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.html
- 21
+ 27Placeholder for the input that displays the age
@@ -2187,7 +2206,7 @@
This field is read-only. Edit Date of Birth to change age. Select Jan 1st if you only know the year of birth.src/app/core/basic-datatypes/date-with-age/edit-age/edit-age.component.html
- 28
+ 34Tooltip for the disabled age field
@@ -2235,6 +2254,10 @@
src/app/core/basic-datatypes/discrete/discrete-import-config/discrete-import-config.component.html32,34
+
+ src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
+ 21,23
+ Cancel
@@ -2248,7 +2271,7 @@
src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
- 18
+ 24src/app/features/dashboard-widgets/progress-dashboard-widget/edit-progress-dashboard/edit-progress-dashboard.component.html
@@ -2361,6 +2384,21 @@
Date selection
+
+ This data has been partially anonymized.
+
+ src/app/core/basic-datatypes/date/display-date/display-date.component.html
+ 11
+
+
+ src/app/core/basic-datatypes/date/edit-date/edit-date.component.html
+ 13
+
+
+ src/app/core/basic-datatypes/month/edit-month/edit-month.component.html
+ 13
+
+ Imported values
@@ -2404,11 +2442,11 @@
context Add User(s)Placeholder for input to add entities
-
- Select matching property
+
+ Select matching property src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
- 2
+ 2,4Label for property selection
@@ -2416,17 +2454,10 @@
Select which property of the target entity is matching with the values of this column. E.g. if your column contains names of children then select 'Name'.src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
- 9
+ 15import - value mapping (entity) - help text
-
- Save & Close
-
- src/app/core/basic-datatypes/entity/entity-import-config/entity-import-config.component.html
- 15,17
-
- Ignore for import?
@@ -2468,7 +2499,7 @@
Discard Changes?src/app/core/common-components/confirmation-dialog/confirmation-dialog.service.ts
- 62
+ 63Discard changes header
@@ -2476,7 +2507,7 @@
You have unsaved changes. Do you really want to leave this page? All unsaved changes will be lost.src/app/core/common-components/confirmation-dialog/confirmation-dialog.service.ts
- 63
+ 64Discard changes message
@@ -2647,14 +2678,14 @@
Load changes?src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
- 110
+ 111Local changes are in conflict with updated values synced from the server. Do you want the local changes to be overwritten with the latest values?src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
- 111
+ 112
@@ -2673,6 +2704,15 @@
A placeholder for the input element when select options are not loaded yet
+
+ Include archived records
+
+ src/app/core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component.html
+ 160,162
+
+ also show entries that are archived
+ slider
+ Select file
@@ -2709,7 +2749,7 @@
src/app/core/config/config-fix.ts
- 661
+ 645Menu item
@@ -2872,33 +2912,26 @@
src/app/core/config/config-fix.ts
- 495
+ 481src/app/core/config/config-fix.ts
- 549
+ 535Translated name of mobile column group
-
- Attachment
-
- src/app/core/config/config-fix.ts
- 269
-
- Site Settingssrc/app/core/config/config-fix.ts
- 281
+ 267User Informationsrc/app/core/config/config-fix.ts
- 328
+ 314Panel title
@@ -2906,7 +2939,7 @@
Securitysrc/app/core/config/config-fix.ts
- 347
+ 333Panel title
@@ -2914,7 +2947,7 @@
assets/help/help.en.mdsrc/app/core/config/config-fix.ts
- 361
+ 347Filename of markdown help page (make sure the filename you enter as a translation actually exists on the server!)
@@ -2922,26 +2955,26 @@
Private Schoolsrc/app/core/config/config-fix.ts
- 382
+ 368src/app/core/config/config-fix.ts
- 1020
+ 1006Basic Informationsrc/app/core/config/config-fix.ts
- 393
+ 379src/app/core/config/config-fix.ts
- 585
+ 569src/app/core/config/config-fix.ts
- 798
+ 771Panel title
@@ -2949,7 +2982,7 @@
Studentssrc/app/core/config/config-fix.ts
- 421
+ 407Panel title
@@ -2957,7 +2990,7 @@
Activitiessrc/app/core/config/config-fix.ts
- 430
+ 416Panel title
@@ -2965,7 +2998,7 @@
Agesrc/app/core/config/config-fix.ts
- 452
+ 438Column label for age of child
@@ -2973,7 +3006,7 @@
Attendance (School)src/app/core/config/config-fix.ts
- 470
+ 456Column label for school attendance of child
@@ -2981,7 +3014,7 @@
Attendance (Coaching)src/app/core/config/config-fix.ts
- 479
+ 465Column label for coaching attendance of child
@@ -2989,11 +3022,11 @@
Basic Infosrc/app/core/config/config-fix.ts
- 494
+ 480src/app/core/config/config-fix.ts
- 498
+ 484Translated name of default column group
@@ -3001,7 +3034,7 @@
School Infosrc/app/core/config/config-fix.ts
- 511
+ 497Column group name
@@ -3009,47 +3042,19 @@
Healthsrc/app/core/config/config-fix.ts
- 534
+ 520src/app/core/config/config-fix.ts
- 683
+ 667Column group name
-
- Active
-
- src/app/core/config/config-fix.ts
- 564
-
-
- src/app/core/config/config-fix.ts
- 780
-
- Active children filter label - true case
-
-
- Inactive
-
- src/app/core/config/config-fix.ts
- 565
-
-
- src/app/core/config/config-fix.ts
- 781
-
-
- src/app/core/entity/model/entity.ts
- 194
-
- Active children filter label - false case
- Personal Informationsrc/app/core/config/config-fix.ts
- 613
+ 597Header for form section
@@ -3057,7 +3062,7 @@
Additionalsrc/app/core/config/config-fix.ts
- 614
+ 598Header for form section
@@ -3065,7 +3070,7 @@
Scholar activitiessrc/app/core/config/config-fix.ts
- 615
+ 599Header for form section
@@ -3073,7 +3078,7 @@
Educationsrc/app/core/config/config-fix.ts
- 622
+ 606Panel title
@@ -3081,7 +3086,7 @@
School Historysrc/app/core/config/config-fix.ts
- 625
+ 609Title inside a panel
@@ -3089,7 +3094,7 @@
ASER Resultssrc/app/core/config/config-fix.ts
- 645
+ 629Title inside a panel
@@ -3097,7 +3102,7 @@
Find a suitable new schoolsrc/app/core/config/config-fix.ts
- 649
+ 633Child details section title
@@ -3105,7 +3110,7 @@
Notes & Taskssrc/app/core/config/config-fix.ts
- 670
+ 654Panel title
@@ -3113,7 +3118,7 @@
Health checkups are to be done regularly, at least every 6 months according to the program guidelines.src/app/core/config/config-fix.ts
- 692
+ 676description section
@@ -3121,7 +3126,7 @@
Height & Weight Trackingsrc/app/core/config/config-fix.ts
- 699
+ 683Title inside a panel
@@ -3129,7 +3134,7 @@
Educational Materialssrc/app/core/config/config-fix.ts
- 705
+ 689Panel title
@@ -3137,7 +3142,7 @@
Observationssrc/app/core/config/config-fix.ts
- 730
+ 714Panel title
@@ -3145,7 +3150,7 @@
Events & Attendancesrc/app/core/config/config-fix.ts
- 828
+ 801Panel title
@@ -3153,7 +3158,7 @@
Basic Reportsrc/app/core/config/config-fix.ts
- 843
+ 816Name of a report
@@ -3161,7 +3166,7 @@
All childrensrc/app/core/config/config-fix.ts
- 847
+ 820Label of report query
@@ -3169,7 +3174,7 @@
All schoolssrc/app/core/config/config-fix.ts
- 852
+ 825Label for report query
@@ -3177,7 +3182,7 @@
Children attending a schoolsrc/app/core/config/config-fix.ts
- 855
+ 828Label for report query
@@ -3185,7 +3190,7 @@
Governmental schoolssrc/app/core/config/config-fix.ts
- 859
+ 832Label for report query
@@ -3193,7 +3198,7 @@
Children attending a governmental schoolsrc/app/core/config/config-fix.ts
- 864
+ 837Label for report query
@@ -3201,7 +3206,7 @@
Private schoolssrc/app/core/config/config-fix.ts
- 868
+ 841Label for report query
@@ -3209,7 +3214,7 @@
Children attending a private schoolsrc/app/core/config/config-fix.ts
- 873
+ 846Label for report query
@@ -3217,7 +3222,7 @@
Event Reportsrc/app/core/config/config-fix.ts
- 881
+ 854Name of a report
@@ -3225,7 +3230,7 @@
Attendance Reportsrc/app/core/config/config-fix.ts
- 898
+ 871Name of a report
@@ -3233,7 +3238,7 @@
Totalsrc/app/core/config/config-fix.ts
- 913
+ 899Name of a column of a report
@@ -3241,7 +3246,7 @@
Presentsrc/app/core/config/config-fix.ts
- 917
+ 903Name of a column of a report
@@ -3249,7 +3254,7 @@
Ratesrc/app/core/config/config-fix.ts
- 921
+ 907Name of a column of a report
@@ -3257,7 +3262,7 @@
Latesrc/app/core/config/config-fix.ts
- 925
+ 911Name of a column of a report
@@ -3265,7 +3270,7 @@
Materials Distributedsrc/app/core/config/config-fix.ts
- 935
+ 921Name of a report
@@ -3273,11 +3278,11 @@
Addresssrc/app/core/config/config-fix.ts
- 966
+ 952src/app/core/config/config-fix.ts
- 1034
+ 1020Label for the address of a child
@@ -3285,7 +3290,7 @@
Blood Groupsrc/app/core/config/config-fix.ts
- 973
+ 959Label for a child attribute
@@ -3293,7 +3298,7 @@
Religionsrc/app/core/config/config-fix.ts
- 980
+ 966Label for the religion of a child
@@ -3301,7 +3306,7 @@
Mother Tonguesrc/app/core/config/config-fix.ts
- 987
+ 973Label for the mother tongue of a child
@@ -3309,7 +3314,7 @@
The primary language spoken at homesrc/app/core/config/config-fix.ts
- 988
+ 974Tooltip description for the mother tongue of a child
@@ -3317,7 +3322,7 @@
Last Dental Check-Upsrc/app/core/config/config-fix.ts
- 995
+ 981Label for a child attribute
@@ -3325,7 +3330,7 @@
Birth certificatesrc/app/core/config/config-fix.ts
- 1002
+ 988Label for a child attribute
@@ -3333,7 +3338,7 @@
Languagesrc/app/core/config/config-fix.ts
- 1027
+ 1013Label for the language of a school
@@ -3341,7 +3346,7 @@
School Timingsrc/app/core/config/config-fix.ts
- 1048
+ 1034Label for the timing of a school
@@ -3349,7 +3354,7 @@
Motivatedsrc/app/core/config/config-fix.ts
- 1067
+ 1053Label for a child attribute
@@ -3357,7 +3362,7 @@
The child is motivated during the class.src/app/core/config/config-fix.ts
- 1068
+ 1054Description for a child attribute
@@ -3365,7 +3370,7 @@
Participatingsrc/app/core/config/config-fix.ts
- 1076
+ 1062Label for a child attribute
@@ -3373,7 +3378,7 @@
The child is actively participating in the class.src/app/core/config/config-fix.ts
- 1077
+ 1063Description for a child attribute
@@ -3381,7 +3386,7 @@
Interactingsrc/app/core/config/config-fix.ts
- 1085
+ 1071Label for a child attribute
@@ -3389,7 +3394,7 @@
The child interacts with other students during the class.src/app/core/config/config-fix.ts
- 1086
+ 1072Description for a child attribute
@@ -3397,7 +3402,7 @@
Homeworksrc/app/core/config/config-fix.ts
- 1094
+ 1080Label for a child attribute
@@ -3405,7 +3410,7 @@
The child does its homework.src/app/core/config/config-fix.ts
- 1095
+ 1081Description for a child attribute
@@ -3413,7 +3418,7 @@
Asking Questionssrc/app/core/config/config-fix.ts
- 1103
+ 1089Label for a child attribute
@@ -3421,7 +3426,7 @@
The child is asking questions during the class.src/app/core/config/config-fix.ts
- 1104
+ 1090Description for a child attribute
@@ -3429,7 +3434,7 @@
Contactsrc/app/core/config/config-fix.ts
- 1115
+ 1101Label of user phone
@@ -3584,6 +3589,82 @@
28
+
+ Archive
+
+ src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
+ 69
+
+ entity context menu
+
+
+ Mark the record as inactive, hiding it from lists by default while keeping the data.
+
+ src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
+ 70
+
+ entity context menu tooltip
+
+
+ Anonymize
+
+ src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
+ 77
+
+ entity context menu
+
+
+ Remove all personal data and keep an archived basic record for statistical reporting.
+
+ src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
+ 78
+
+ entity context menu tooltip
+
+
+ Delete
+
+ src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
+ 85
+
+ entity context menu
+
+
+ Remove the record completely from the database.
+
+ src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
+ 86
+
+ entity context menu tooltip
+
+
+ Archived
+
+ src/app/core/entity-details/entity-archived-info/entity-archived-info.component.html
+ 6
+
+
+
+ Anonymized & Archived
+
+ src/app/core/entity-details/entity-archived-info/entity-archived-info.component.html
+ 8
+
+
+
+ This record has been anonymized. Details containing personal information have been deleted and cannot be restored. For statistical reporting, this basic record has been kept.
+
+ src/app/core/entity-details/entity-archived-info/entity-archived-info.component.html
+ 13,17
+
+
+
+ This record is archived and will be be hidden from lists and select options by default.
+
+ src/app/core/entity-details/entity-archived-info/entity-archived-info.component.html
+ 19,22
+
+ Adding new
@@ -3593,23 +3674,11 @@
An entity is a child, note, school, etc.Title when adding a new entity
-
- Delete
-
- src/app/core/entity-details/entity-details/entity-details.component.html
- 58
-
-
- src/app/core/form-dialog/dialog-buttons/dialog-buttons.component.html
- 61
-
- Generic delete button
- Save the new record to create it before accessing other detailssrc/app/core/entity-details/entity-details/entity-details.component.html
- 74
+ 51Tooltip explaining disabled sections when creating new entity
@@ -3663,38 +3732,11 @@
14
-
- Show entries where the end date is in the past
-
- src/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.html
- 32
-
-
- src/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.html
- 32
-
- Tooltip that will appear when hovered over the
- show-ended button
- Show ended tooltip
-
-
- Include inactive past records
-
- src/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.html
- 34,36
-
-
- src/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.html
- 34,36
-
- also show entries that are inactive
- slider
- Currentlysrc/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.ts
- 105
+ 97e.g. Currently activeLabel for the currently active status
@@ -3703,7 +3745,7 @@
Only added to linked record if active. Change the start or end date to modify this status.src/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.ts
- 108
+ 100Tooltip for the status of currently active or not
@@ -3711,7 +3753,7 @@
activesrc/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.ts
- 111
+ 103Indication for the currently active status of an entry
@@ -3719,7 +3761,7 @@
not activesrc/app/core/entity-details/related-time-period-entities/related-time-period-entities.component.ts
- 112
+ 104Indication for the currently inactive status of an entry
@@ -3743,7 +3785,7 @@
No "" date is setsrc/app/core/entity-details/related-time-period-entities/time-period.ts
- 63
+ 68Error assertValid failed
@@ -3751,7 +3793,7 @@
The "" date is after the "" datesrc/app/core/entity-details/related-time-period-entities/time-period.ts
- 67
+ 72Error assertValid failed
@@ -3768,7 +3810,7 @@
Filter src/app/core/entity-list/entity-list/entity-list.component.html
- 98,99
+ 100,101Allows the user to filter through entitiesFilter placeholder
@@ -3777,7 +3819,7 @@
e.g. name, agesrc/app/core/entity-list/entity-list/entity-list.component.html
- 104
+ 106Examples of things to filter
@@ -3785,7 +3827,7 @@
Add New src/app/core/entity-list/entity-list/entity-list.component.html
- 154,156
+ 158,160Add a new entity to a list of multiple entities
@@ -3793,15 +3835,23 @@
Filter options src/app/core/entity-list/entity-list/entity-list.component.html
- 166
+ 170Show filter options popup for list
-
- Download CSV
+
+ Download all data (.csv)
+
+ src/app/core/entity-list/entity-list/entity-list.component.html
+ 189
+
+ Download list contents as CSV
+
+
+ Download current (.csv) src/app/core/entity-list/entity-list/entity-list.component.html
- 185
+ 207Download list contents as CSV
@@ -3809,7 +3859,43 @@
Import from file src/app/core/entity-list/entity-list/entity-list.component.html
- 201
+ 223
+
+
+
+ Select multiple records for bulk actions like duplicating or deleting
+
+ src/app/core/entity-list/entity-list/entity-list.component.html
+ 229
+
+
+
+ Bulk Actions
+
+ src/app/core/entity-list/entity-list/entity-list.component.html
+ 237
+
+
+
+ Select rows to clone
+
+ src/app/core/entity-list/entity-list/entity-list.component.html
+ 252
+
+
+
+ Duplicate
+
+ src/app/core/entity-list/entity-list/entity-list.component.html
+ 256,258
+
+ bulk action button
+
+
+ Cancel
+
+ src/app/core/entity-list/entity-list/entity-list.component.html
+ 260,262
@@ -3819,49 +3905,157 @@
59
+
+ ""
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 35,37
+
+ Entity action confirmation message
+
+
+ Undo
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 41
+
+
+ src/app/core/import/import-confirm-summary/import-confirm-summary.component.ts
+ 61
+
+ Undo an entity action
+
+
+ Reverting changes ...
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 50
+
+ Undo entity action progress dialog
+ Delete?
- src/app/core/entity/entity-remove.service.ts
- 78
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 76Delete confirmation title
-
- Are you sure you want to delete this record?
+
+
+ This will remove the data permanently as if it never existed. This cannot be undone. Statistical reports (also for past time periods) will change and not include this record anymore.
+
+ If you have not just created this record accidentally, deleting this is probably not what you want to do. If the record represents something that actually happened in your work, consider to use "anonymize" or just "archive" instead, so that you will not lose your documentation for reports.
+
+ Are you sure you want to delete this record?
- src/app/core/entity/entity-remove.service.ts
- 81
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 77,82
- Delete confirmation text
+ Delete confirmation dialog
-
- Deleted Entity
+
+ Processing ...
- src/app/core/entity/entity-remove.service.ts
- 93
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 89
- Deleted Entity information
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 145
+
+ Entity action progress dialog
-
- Undo
+
+ Related records may still contain personal data
- src/app/core/entity/entity-remove.service.ts
- 97
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 96
- src/app/core/import/import-confirm-summary/import-confirm-summary.component.ts
- 61
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 152
+
+ post-delete related PII warning title
+
+
+ Some related records (e.g. notes) may still contain personal data in their text. We have automatically deleted all records that are linked to ONLY this .
+ However, there are some records that are linked to multiple records. We have not deleted these, so that you will not lose relevant data. Please review them manually to ensure all sensitive information is removed, if required (e.g. by looking through the linked notes and editing a note's text).
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 97,100
+
+ post-delete related PII warning dialog
+
+
+ Deleted
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 114
+
+ Entity action confirmation message verb
+
+
+ Anonymize?
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 132
+
+ Anonymize confirmation dialog
+
+
+
+ This will remove all personal information (PII) permanently and keep only a basic record for statistical reports. Details that are removed during anonymization cannot be recovered.
+
+ If this has only become inactive and you want to keep all details about the record, consider to use "archive" instead.
+
+ Are you sure you want to anonymize this record?
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 133,138
+
+ Anonymize confirmation dialog
+
+
+ Some related records (e.g. notes) may still contain personal data in their text. We have automatically anonymized all records that are linked to ONLY this .
+ However, there are some records that are linked to multiple records. We have not anonymized these, so that you will not lose relevant data. Please review them manually to ensure all sensitive information is removed (e.g. by looking through the linked notes and editing a note's text).
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 153,156
+
+ post-anonymize related PII warning dialog
+
+
+ Anonymized
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 163
+
+ Entity action confirmation message verb
+
+
+ Archived
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 180
- Undo deleting an entity
+ Entity action confirmation message verb
-
- Ticking this box will archive the record. No data will be lost but the record will be hidden.
+
+ Reactivated
+
+ src/app/core/entity/entity-actions/entity-actions.service.ts
+ 196
+
+ Entity action confirmation message verb
+
+
+ [anonymized ]src/app/core/entity/model/entity.ts
- 195
+ 316,318
- Description of checkbox
+ Entity.toString fallback for anonymized recordFilter Options
@@ -5042,7 +5236,7 @@ Please try again. If the problem persists contact Aam Digital support.
Usernamesrc/app/core/user/user.ts
- 38
+ 39Label of username
@@ -5050,7 +5244,7 @@ Please try again. If the problem persists contact Aam Digital support.
cannot be changed after initializationsrc/app/core/user/user.ts
- 46
+ 47e.g. username cannot be changed after initializationError message when trying to change the username
@@ -5525,7 +5719,7 @@ Please try again. If the problem persists contact Aam Digital support.
src/app/features/file/edit-photo/edit-photo.component.html
- 17
+ 22Tooltip upload file button
@@ -5533,7 +5727,7 @@ Please try again. If the problem persists contact Aam Digital support.
File "" deletedsrc/app/features/file/edit-file/edit-file.component.ts
- 132
+ 134Message for user
@@ -5630,7 +5824,7 @@ Please try again. If the problem persists contact Aam Digital support.
Click on the map to select a different locationsrc/app/features/location/edit-location/edit-location.component.ts
- 118
+ 119help text in map popup
@@ -5803,11 +5997,18 @@ Please try again. If the problem persists contact Aam Digital support.
15
+
+ Please select a report and a date range
+
+ src/app/features/reporting/reporting/select-report/select-report.component.html
+ 66
+
+ Calculate src/app/features/reporting/reporting/select-report/select-report.component.html
- 65,67
+ 70,72Calculate the results for a report
@@ -5815,7 +6016,7 @@ Please try again. If the problem persists contact Aam Digital support.
Download src/app/features/reporting/reporting/select-report/select-report.component.html
- 87
+ 93Button to download data
@@ -5895,7 +6096,7 @@ Please try again. If the problem persists contact Aam Digital support.
Deadlinesrc/app/features/todos/model/todo.ts
- 47
+ 48Label
@@ -5903,7 +6104,7 @@ Please try again. If the problem persists contact Aam Digital support.
When you are planning to start work so that you keep enough time before the actual hard deadline.src/app/features/todos/model/todo.ts
- 55
+ 57Description
@@ -5911,7 +6112,7 @@ Please try again. If the problem persists contact Aam Digital support.
Assigned tosrc/app/features/todos/model/todo.ts
- 68
+ 71Label
@@ -5919,7 +6120,7 @@ Please try again. If the problem persists contact Aam Digital support.
repeatssrc/app/features/todos/model/todo.ts
- 94
+ 100label for Todo entity property
@@ -5927,7 +6128,7 @@ Please try again. If the problem persists contact Aam Digital support.
every weeksrc/app/features/todos/model/todo.ts
- 97
+ 103repetition interval option
@@ -5935,7 +6136,7 @@ Please try again. If the problem persists contact Aam Digital support.
every monthsrc/app/features/todos/model/todo.ts
- 101
+ 107repetition interval option
@@ -5943,7 +6144,7 @@ Please try again. If the problem persists contact Aam Digital support.
completedsrc/app/features/todos/model/todo.ts
- 110
+ 117label for Todo entity property
@@ -6109,7 +6310,7 @@ Please try again. If the problem persists contact Aam Digital support.
Overduesrc/app/features/todos/todo-list/todo-list.component.ts
- 99
+ 101Filter-option for todos
@@ -6117,7 +6318,7 @@ Please try again. If the problem persists contact Aam Digital support.
Completedsrc/app/features/todos/todo-list/todo-list.component.ts
- 104
+ 106Filter-option for todos
@@ -6125,7 +6326,7 @@ Please try again. If the problem persists contact Aam Digital support.
All Opensrc/app/features/todos/todo-list/todo-list.component.ts
- 109
+ 111Filter-option for todos
@@ -6133,21 +6334,21 @@ Please try again. If the problem persists contact Aam Digital support.
Anysrc/app/features/todos/todo-list/todo-list.component.ts
- 112
+ 114Tasks duesrc/app/features/todos/todo-list/todo-list.component.ts
- 114
+ 116Currently Activesrc/app/features/todos/todo-list/todo-list.component.ts
- 129
+ 131Filter-option for todos
@@ -6168,15 +6369,6 @@ Please try again. If the problem persists contact Aam Digital support.
dashboard showing open todossubtitle
-
- Also show completed
-
- src/app/features/todos/todos-related-to-entity/todos-related-to-entity.component.html
- 17,19
-
- also show entries that are inactive
- slider
-
diff --git a/src/index.html b/src/index.html
index 702f4b74d9..ac4754347a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,4 +1,5 @@
-
--
- Aam Digital
-
+ +
+ Aam Digital
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
Aam Digital
-
... is loading for the first time.
-
- This may take a few seconds or even minutes depending on your internet
- connection.
-
-
- Browser Details:
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
Aam Digital
+
... is loading for the first time.
+
+ This may take a few seconds or even minutes depending on your internet
+ connection.
+