Added numberOfTeachers for Schools and further adoptions

Author: christophscheuing

src/app/child-dev-project/children/demo-data-generators/demo-school-generator.service.ts

@@ -56,7 +56,7 @@ export class DemoSchoolGenerator extends DemoDataGenerator<Entity> {
         $localize`:School demo timing:11 a.m. - 4 p.m.`,
         $localize`:School demo timing:6:30-11:00 and 11:30-16:00`,
       ]);
-
+      school["numberOfTeachers"] = faker.number.int({ min: 3, max: 75 });
       school["address"] = faker.geoAddress();
 
       data.push(school);

src/app/core/basic-datatypes/number/number-range-filter/number-range-filter.component.html

@@ -2,6 +2,6 @@
   <mat-label>{{ filterConfig.label || filterConfig.name }}</mat-label>
   <app-range-input
     [formControl]="formControl"
-    [deactivateValidation]="false"
+    [activateValidation]="true"
   ></app-range-input>
 </mat-form-field>

src/app/core/basic-datatypes/number/number-range-filter/number-range-filter.component.ts

@@ -27,29 +27,12 @@ export class NumberRangeFilterComponent<T extends Entity> {
   from: number;
   to: number;
 
-  // private validatorFunction: ValidatorFn = (): ValidationErrors | null => {
-  //   if (
-  //     this.formControl.value.from &&
-  //     this.formControl.value.to &&
-  //     this.formControl.value.from === this.formControl.value.to
-  //   ) {
-  //     return {
-  //       sameValue: "The from value is the same as the to value.",
-  //     };
-  //   } else {
-  //     return null;
-  //   }
-  // };
-
   ngOnInit() {
-    console.log("filterConfig", this.filterConfig);
     this.formControl = new FormControl<NumericRange>({
       from: Number(this.filterConfig.selectedOptionValues[0]),
       to: Number(this.filterConfig.selectedOptionValues[1]),
     });
     this.formControl.valueChanges.subscribe((value) => {
-      console.log(this.formControl.valid, this.formControl.errors);
-
       this.filterConfig.selectedOptionValues = [
         this.formControl.value.from?.toString() ?? "",
         this.formControl.value.to?.toString() ?? "",

src/app/core/basic-datatypes/number/number-range-filter/range-input/range-input.component.spec.ts

@@ -1,23 +1,22 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { RangeInputComponent } from './range-input.component';
+import { RangeInputComponent } from "./range-input.component";
 
-describe('RangeInputComponent', () => {
+describe("RangeInputComponent", () => {
   let component: RangeInputComponent;
   let fixture: ComponentFixture<RangeInputComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [RangeInputComponent]
-    })
-    .compileComponents();
-    
+      imports: [RangeInputComponent],
+    }).compileComponents();
+
     fixture = TestBed.createComponent(RangeInputComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
 
-  it('should create', () => {
+  it("should create", () => {
     expect(component).toBeTruthy();
   });
 });

src/app/core/basic-datatypes/number/number-range-filter/range-input/range-input.component.ts

@@ -42,7 +42,7 @@ export class RangeInputComponent extends CustomFormControlDirective<NumericRange
   }
 
   @Input()
-  deactivateValidation: boolean = false;
+  activateValidation: boolean = true;
 
   constructor(
     elementRef: ElementRef<HTMLElement>,
@@ -67,7 +67,11 @@ export class RangeInputComponent extends CustomFormControlDirective<NumericRange
   }
 
   private validatorFunction: ValidatorFn = (): ValidationErrors | null => {
-    if (this.value.from && this.value.to && this.value.from > this.value.to) {
+    if (
+      this.value.from != undefined &&
+      this.value.to != undefined &&
+      this.value.from > this.value.to
+    ) {
       return {
         fromGreaterThanTo: "The 'from' value is greater than the 'to' value.",
       };
@@ -77,7 +81,7 @@ export class RangeInputComponent extends CustomFormControlDirective<NumericRange
   };
 
   ngAfterViewInit() {
-    if (!this.deactivateValidation) {
+    if (this.activateValidation) {
       this.formControlDirective.form.addValidators([this.validatorFunction]);
     }
   }

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

@@ -395,10 +395,14 @@ export const defaultJsonConfig = {
         "name",
         { id: "DisplayParticipantsCount", viewComponent: "DisplayParticipantsCount", label: $localize`Children` },
         "privateSchool",
-        "language"
+        "language",
+        "numberOfTeachers"
       ],
       "filters": [
-        { "id": "privateSchool" }
+        { "id": "privateSchool"},
+        {  "id": "numberOfTeachers",          "type": "numbers",
+          "label": "Number of Teachers"
+         }
       ]
     }
   },
@@ -418,7 +422,7 @@ export const defaultJsonConfig = {
                   { "fields": ["name", "privateSchool", "parentSchool"] },
                   { "fields": ["address", "phone"] },
                   { "fields": ["language", "timing"] },
-                  { "fields": ["remarks"] }
+                  { "fields": ["remarks", "numberOfTeachers"] }
                 ]
               }
             }
@@ -503,7 +507,6 @@ export const defaultJsonConfig = {
               "name",
               "age",
               "gender",
-              "shoeSize",
               "schoolClass",
               "schoolId",
               "center",
@@ -565,11 +568,6 @@ export const defaultJsonConfig = {
           "id": "schoolId",
           "type": "School",
           "label": $localize`:Label of schools filter:School`
-        },
-        {
-          "id": "shoeSize",
-          "type": "numbers",
-          "label": "Shoe Size"
         }
       ],
       "exportConfig": [
@@ -600,7 +598,7 @@ export const defaultJsonConfig = {
                     "header": $localize`:Header for form section:Personal Information`
                   },
                   {
-                    "fields": ["dateOfBirth", "birth_certificate", "gender", "motherTongue","shoeSize"],
+                    "fields": ["dateOfBirth", "birth_certificate", "gender", "motherTongue"],
                     "header": $localize`:Header for form section:Additional`
                   },
                   {
@@ -1036,10 +1034,6 @@ export const defaultJsonConfig = {
         "dataType": "location",
         "label": $localize`:Label for the address of a child:Address`
       },
-      "shoeSize": {
-        "dataType": "number",
-        "label": $localize`:Label for a child attribute:Shoe Size`
-      },
       "health_bloodGroup": {
         "dataType": "string",
         "label": $localize`:Label for a child attribute:Blood Group`
@@ -1100,6 +1094,10 @@ export const defaultJsonConfig = {
         "dataType": "string",
         "label": $localize`:Label for the timing of a school:School Timing`
       },
+      "numberOfTeachers": {
+        "dataType": "number",
+        "label": $localize`:Label for a school attribute:Number of Teachers`
+      },
       "remarks": {
         "dataType": "string",
         "label": $localize`:Label for the remarks for a school:Remarks`

src/app/core/filter/filters/filters.spec.ts

@@ -74,22 +74,40 @@ describe("Filters", () => {
     testFilter(filter, [recordFalse, recordTrue], [recordFalse, recordTrue]);
   });
 
-  fit("should support a numbers filter", async () => {
+  it("should support a numbers filter", async () => {
     const filter = new NumberFilter("value", "My Filter");
 
-    const record_5 = { value: -5 };
+    const recordMinus5 = { value: -5 };
     const record0 = { value: 0 };
     const record1 = { value: 1 };
+    const record1_6 = { value: 1.6 };
     const record2 = { value: 2 };
     const record3 = { value: 3 };
     const record10 = { value: 10 };
-    const records = [record_5, record0, record1, record2, record3, record10];
+    const records = [
+      recordMinus5,
+      record0,
+      record1,
+      record1_6,
+      record2,
+      record3,
+      record10,
+    ];
 
     filter.selectedOptionValues = ["2", "3"];
     testFilter(filter, records, [record2, record3]);
 
+    filter.selectedOptionValues = ["0", "3"];
+    testFilter(filter, records, [
+      record0,
+      record1,
+      record1_6,
+      record2,
+      record3,
+    ]);
+
     filter.selectedOptionValues = ["-8", "1"];
-    testFilter(filter, records, [record_5, record0, record1]);
+    testFilter(filter, records, [recordMinus5, record0, record1]);
 
     filter.selectedOptionValues = ["10", "10"];
     testFilter(filter, records, [record10]);
@@ -98,7 +116,7 @@ describe("Filters", () => {
     testFilter(filter, records, [record10]);
 
     filter.selectedOptionValues = ["", "-1"];
-    testFilter(filter, records, [record_5]);
+    testFilter(filter, records, [recordMinus5]);
 
     filter.selectedOptionValues = ["", ""];
     testFilter(filter, records, records);

src/app/core/filter/filters/numberFilter.ts

@@ -17,8 +17,6 @@ export class NumberFilter<T extends Entity> extends Filter<T> {
   }
 
   getFilter(): DataFilter<T> {
-    console.log("Peter this.selectedOptionValues", this.selectedOptionValues);
-
     const filterObject: { $gte?; $lte?: number } = {};
     if (this.selectedOptionValues[0]) {
       filterObject.$gte = Number(this.selectedOptionValues[0]);
@@ -27,9 +25,6 @@ export class NumberFilter<T extends Entity> extends Filter<T> {
       filterObject.$lte = Number(this.selectedOptionValues[1]);
     }
     if (filterObject.$gte || filterObject.$lte) {
-      console.log("Peter data filter", {
-        [this.name]: filterObject,
-      } as DataFilter<T>);
       return {
         [this.name]: filterObject,
       } as DataFilter<T>;