Task module

src/app/app.module.ts

@@ -82,15 +82,17 @@ import {
   DEFAULT_LANGUAGE,
   LANGUAGE_LOCAL_STORAGE_KEY,
 } from "./core/language/language-statics";
-import { DateAdapter, MAT_DATE_FORMATS } from "@angular/material/core";
+import {DateAdapter, MAT_DATE_FORMATS} from "@angular/material/core";
 import {
   DATE_FORMATS,
   DateAdapterWithFormatting,
 } from "./core/language/date-adapter-with-formatting";
-import { FileModule } from "./features/file/file.module";
-import { ConfigSetupModule } from "./core/config-setup/config-setup.module";
-import { LocationModule } from "./features/location/location.module";
-import { MatchingEntitiesModule } from "./features/matching-entities/matching-entities.module";
+import {FileModule} from "./features/file/file.module";
+import {ConfigSetupModule} from "./core/config-setup/config-setup.module";
+import {LocationModule} from "./features/location/location.module";
+import {MatchingEntitiesModule} from "./features/matching-entities/matching-entities.module";
+import {TodosModule} from "./features/todos/todos.module";
+import {DemoTodoGeneratorService} from "./features/todos/model/demo-todo-generator.service";
 
 /**
  * Main entry point of the application.
@@ -162,6 +164,7 @@ import { MatchingEntitiesModule } from "./features/matching-entities/matching-en
         maxCountAttributes: 5,
       }),
       ...DemoPermissionGeneratorService.provider(),
+      ...DemoTodoGeneratorService.provider(),
     ]),
     AttendanceModule,
     DashboardShortcutWidgetModule,
@@ -170,6 +173,7 @@ import { MatchingEntitiesModule } from "./features/matching-entities/matching-en
     DatabaseModule,
     LocationModule,
     MatchingEntitiesModule,
+    TodosModule,
   ],
   providers: [
     { provide: ErrorHandler, useClass: LoggingErrorHandler },

src/app/child-dev-project/children/child-block/child-block.component.scss

@@ -1,7 +1,8 @@
+@use "src/styles/variables/sizes";
 
 .child-pic {
-  width: 28px;
-  height: 28px;
+  width: sizes.$icon-block;
+  height: sizes.$icon-block;
   border-radius: 50%;
   object-fit: cover;
   margin-right: 4px;

src/app/core/config/config-fix.ts

@@ -52,6 +52,11 @@ export const defaultJsonConfig = {
         "icon": "file-alt",
         "link": "/note"
       },
+      {
+        "name": $localize`:Menu item:Tasks`,
+        "icon": "tasks",
+        "link": "/todo"
+      },
       {
         "name": $localize`:Menu item:Admin`,
         "icon": "wrench",
@@ -176,6 +181,10 @@ export const defaultJsonConfig = {
             "warningLevels": ["WARNING", "URGENT"],
           }
         },
+        {
+          "component": "TodosDashboard",
+          "config": {}
+        },
         {
           "component": "NotesDashboard",
           "config": {
@@ -688,11 +697,15 @@ export const defaultJsonConfig = {
           ]
         },
         {
-          "title": $localize`:Panel title:Notes & Reports`,
+          "title": $localize`:Panel title:Notes & Tasks`,
           "components": [
             {
               "title": "",
               "component": "NotesRelatedToEntity"
+            },
+            {
+              "title": "Tasks",
+              "component": "TodosRelatedToEntity"
             }
           ]
         },
@@ -1132,5 +1145,59 @@ export const defaultJsonConfig = {
       "newEntityMatchPropertyRight": "schoolId",
       "columnsToReview": ["start", "end", "result", "childId", "schoolId"]
     }
+  },
+
+  "entity:Todo": {
+    "attributes": []
+  },
+  "view:todo": {
+    "component": "TodoList",
+    "config": {
+      "entity": "Todo",
+      "columns": ["deadline", "subject", "assignedTo", "startDate", "relatedEntities"],
+      "filters": [
+        { "id": "assignedTo" },
+
+        {
+          "id": "due-status",
+          "type": "prebuilt"
+        },
+        { "id": "deadline" },
+        { "id": "deadline" },
+        { "id": "startDate" }
+      ]
+    }
+  },
+  "view:todo/:id": {
+    "component": "EntityDetails",
+    "config": {
+      "entity": "Todo",
+      "panels": [
+        {
+          "title": $localize`:Panel title:Overview`,
+          "components": [
+            {
+              "title": "",
+              "component": "Form",
+              "config": {
+                "cols": [
+                  [
+                    "subject",
+                    "description",
+                    "relatedEntities"
+                  ],
+                  [
+                    "assignedTo",
+                    "deadline",
+                    "startDate",
+                    "repetitionInterval"
+                  ]
+                ]
+              }
+            }
+          ]
+        }
+      ],
+    }
   }
 };

src/app/core/confirmation-dialog/confirmation-dialog.service.ts

@@ -53,7 +53,6 @@ export class ConfirmationDialogService {
           },
         })
         .afterClosed()
-        .pipe(map((choice) => !!choice))
     );
   }
 }

src/app/core/confirmation-dialog/confirmation-dialog/confirmation-dialog.component.ts

@@ -42,7 +42,7 @@ export interface ConfirmationDialogConfig {
 
 export interface ConfirmationDialogButton {
   text: string;
-  dialogResult?: boolean;
+  dialogResult?: boolean|undefined;
   click();
 }
 
@@ -75,3 +75,30 @@ export const YesNoButtons: ConfirmationDialogButton[] = [
     dialogResult: false,
   },
 ];
+
+export const YesNoCancelButtons: ConfirmationDialogButton[] = [
+  {
+    text: $localize`:Confirmation dialog Yes:Yes`,
+    click() {
+      // Intentionally blank
+      // To react to emissions from this button, use the `MatDialogRef.beforeClosed()` hook
+    },
+    dialogResult: true,
+  },
+  {
+    text: $localize`:Confirmation dialog No:No`,
+    click() {
+      // Intentionally blank
+      // To react to emissions from this button, use the `MatDialogRef.beforeClosed()` hook
+    },
+    dialogResult: false,
+  },
+  {
+    text: $localize`:Confirmation dialog Cancel:Cancel`,
+    click() {
+      // Intentionally blank
+      // To react to emissions from this button, use the `MatDialogRef.beforeClosed()` hook
+    },
+    dialogResult: undefined,
+  },
+];

src/app/core/entity-components/entity-details/form/form.component.ts

@@ -83,18 +83,7 @@ export class FormComponent<E extends Entity>
     if (this.creatingNew) {
       this.location.back();
     }
-    this.resetForm();
+    this.entityFormService.resetForm(this.form, this.entity);
     this.form.disable();
   }
-
-  private resetForm(entity = this.entity) {
-    // Patch form with values from the entity
-    this.form.patchValue(entity as any);
-    // Clear values that are not yet present on the entity
-    const newKeys = Object.keys(
-      _.omit(this.form.controls, Object.keys(this.entity))
-    );
-    newKeys.forEach((key) => this.form.get(key).setValue(null));
-    this.form.markAsPristine();
-  }
 }

src/app/core/entity-components/entity-form/entity-form.service.ts

@@ -7,6 +7,7 @@ import { EntitySchemaService } from "../../entity/schema/entity-schema.service";
 import { DynamicValidatorsService } from "./dynamic-form-validators/dynamic-validators.service";
 import { EntityAbility } from "../../permissions/ability/entity-ability";
 import { InvalidFormFieldError } from "./invalid-form-field.error";
+import * as _ from "lodash-es";
 
 /**
  * These are utility types that allow to define the type of `FormGroup` the way it is returned by `EntityFormService.create`
@@ -151,4 +152,13 @@ export class EntityFormService {
       return this.ability.can("update", oldEntity);
     }
   }
+
+  resetForm<E extends Entity>(form: EntityForm<E>, entity: E) {
+    // Patch form with values from the entity
+    form.patchValue(entity as any);
+    // Clear values that are not yet present on the entity
+    const newKeys = Object.keys(_.omit(form.controls, Object.keys(entity)));
+    newKeys.forEach((key) => form.get(key).setValue(null));
+    form.markAsPristine();
+  }
 }

src/app/core/entity-components/entity-form/entity-form/FormConfig.ts

@@ -1,10 +1,10 @@
+import { FormValidatorConfig } from "../dynamic-form-validators/form-validator-config";
+
 /**
  * The general configuration for fields in tables and forms.
  * This defines which property is displayed and how it should be displayed.
  * Most information does not need to be provided if a property with schema definitions is displayed.
  */
-import { FormValidatorConfig } from "../dynamic-form-validators/form-validator-config";
-
 export interface FormFieldConfig {
   /**
    * The id of the entity which should be accessed
@@ -77,6 +77,11 @@ export interface FormFieldConfig {
    */
   hideFromTable?: boolean;
 
+  /**
+   * If true, the field will only be shown in tables and excluded from forms and popups.
+   */
+  hideFromForm?: boolean;
+
   /**
    * An internal flag that will be automatically set in the entity subrecord in order to adapt the view/edit components.
    */

src/app/core/entity-components/entity-list/EntityListConfig.ts

@@ -71,24 +71,30 @@ export interface GroupConfig {
   columns: string[];
 }
 
-export interface FilterConfig {
+export type FilterConfig<T = any> =
+  | BasicFilterConfig
+  | BooleanFilterConfig
+  | PrebuiltFilterConfig<T>
+  | ConfigurableEnumFilterConfig<T>;
+
+export interface BasicFilterConfig {
   id: string;
   type?: string;
   default?: string;
   label?: string;
 }
 
-export interface BooleanFilterConfig extends FilterConfig {
+export interface BooleanFilterConfig extends BasicFilterConfig {
   true: string;
   false: string;
   all: string;
 }
 
-export interface PrebuiltFilterConfig<T extends Entity> extends FilterConfig {
+export interface PrebuiltFilterConfig<T> extends BasicFilterConfig {
   options: FilterSelectionOption<T>[];
 }
 
-export interface ConfigurableEnumFilterConfig<T> extends FilterConfig {
+export interface ConfigurableEnumFilterConfig<T> extends BasicFilterConfig {
   enumId: string;
 }
 

src/app/core/entity-components/entity-select/display-entity-array/display-entity-array.component.html

@@ -1,5 +1,5 @@
 <ng-container *ngIf="entities">
-  <app-display-entity style="display: inline-block; margin-right: 10px"
+  <app-display-entity class="display-entity"
     *ngFor="let e of entities"
     [entityToDisplay]="e"
   ></app-display-entity>

src/app/core/entity-components/entity-select/display-entity-array/display-entity-array.component.scss

@@ -0,0 +1,7 @@
+@use "src/styles/variables/sizes";
+
+.display-entity {
+  display: inline-block;
+  margin-right: sizes.$small;
+  vertical-align: middle;
+}