Added tests for numbers filter

Author: christophscheuing

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

@@ -503,6 +503,7 @@ export const defaultJsonConfig = {
               "name",
               "age",
               "gender",
+              "shoeSize",
               "schoolClass",
               "schoolId",
               "center",
@@ -566,9 +567,9 @@ export const defaultJsonConfig = {
           "label": $localize`:Label of schools filter:School`
         },
         {
-          "id": "schoolClass",
+          "id": "shoeSize",
           "type": "numbers",
-          "label": "Classes"
+          "label": "Shoe Size"
         }
       ],
       "exportConfig": [
@@ -599,7 +600,7 @@ export const defaultJsonConfig = {
                     "header": $localize`:Header for form section:Personal Information`
                   },
                   {
-                    "fields": ["dateOfBirth", "birth_certificate", "gender", "motherTongue"],
+                    "fields": ["dateOfBirth", "birth_certificate", "gender", "motherTongue","shoeSize"],
                     "header": $localize`:Header for form section:Additional`
                   },
                   {
@@ -1035,6 +1036,10 @@ 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`

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

@@ -1,6 +1,7 @@
 import { Filter, SelectableFilter } from "./filters";
 import { FilterService } from "../filter.service";
 import { BooleanFilter } from "./booleanFilter";
+import { NumberFilter } from "./numberFilter";
 import { Entity } from "../../entity/model/entity";
 
 describe("Filters", () => {
@@ -73,6 +74,36 @@ describe("Filters", () => {
     testFilter(filter, [recordFalse, recordTrue], [recordFalse, recordTrue]);
   });
 
+  fit("should support a numbers filter", async () => {
+    const filter = new NumberFilter("value", "My Filter");
+
+    const record_5 = { value: -5 };
+    const record0 = { value: 0 };
+    const record1 = { value: 1 };
+    const record2 = { value: 2 };
+    const record3 = { value: 3 };
+    const record10 = { value: 10 };
+    const records = [record_5, record0, record1, record2, record3, record10];
+
+    filter.selectedOptionValues = ["2", "3"];
+    testFilter(filter, records, [record2, record3]);
+
+    filter.selectedOptionValues = ["-8", "1"];
+    testFilter(filter, records, [record_5, record0, record1]);
+
+    filter.selectedOptionValues = ["10", "10"];
+    testFilter(filter, records, [record10]);
+
+    filter.selectedOptionValues = ["10", ""];
+    testFilter(filter, records, [record10]);
+
+    filter.selectedOptionValues = ["", "-1"];
+    testFilter(filter, records, [record_5]);
+
+    filter.selectedOptionValues = ["", ""];
+    testFilter(filter, records, records);
+  });
+
   it("should support numbers as options", () => {
     const filter = new SelectableFilter("counts", [], "Counts");
 

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

@@ -21,7 +21,7 @@ export class NumberFilter<T extends Entity> extends Filter<T> {
 
     const filterObject: { $gte?; $lte?: number } = {};
     if (this.selectedOptionValues[0]) {
-      filterObject.$gte = [{}, Number(this.selectedOptionValues[0])];
+      filterObject.$gte = Number(this.selectedOptionValues[0]);
     }
     if (this.selectedOptionValues[1]) {
       filterObject.$lte = Number(this.selectedOptionValues[1]);

src/environments/environment.ts

@@ -33,7 +33,7 @@ export const environment = {
   remoteLoggingDsn: undefined, // only set for production mode in environment.prod.ts
 
   demo_mode: true,
-  session_type: SessionType.local,
+  session_type: SessionType.mock,
   account_url: "https://accounts.aam-digital.net",
   email: undefined,