Adoption to stricter Typescript checking

Author: christophscheuing

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

@@ -32,12 +32,12 @@ export class RangeInputComponent extends CustomFormControlDirective<NumericRange
   });
   formControlDirective: FormControlDirective;
 
-  @Input() set value(value: NumericRange) {
+  @Input() override set value(value: NumericRange) {
     // update the internal formGroup when the value changes from the outside
     this.formGroup.setValue(value, { emitEvent: false });
     super.value = value;
   }
-  get value(): NumericRange {
+  override get value(): NumericRange {
     return super.value;
   }
 

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

@@ -1,11 +1,5 @@
 import { Entity } from "../../entity/model/entity";
-import { DateRangeFilterConfigOption } from "../../entity-list/EntityListConfig";
-import { DateRange, NumberRange } from "@angular/material/datepicker";
-import { calculateDateRange } from "../../basic-datatypes/date/date-range-filter/date-range-filter-panel/date-range-filter-panel.component";
-import moment from "moment";
 import { DataFilter, Filter } from "./filters";
-import { isValidDate } from "../../../utils/utils";
-import { DateRangeFilterComponent } from "../../basic-datatypes/date/date-range-filter/date-range-filter.component";
 import { NumberRangeFilterComponent } from "app/core/basic-datatypes/number/number-range-filter/number-range-filter.component";
 
 /**
@@ -15,36 +9,19 @@ export class NumberFilter<T extends Entity> extends Filter<T> {
   override component = NumberRangeFilterComponent;
 
   constructor(
-    public name: string,
-    public label: string = name,
-    // public rangeOptions: DateRangeFilterConfigOption[],
+    public override name: string,
+    public override label: string = name,
   ) {
     super(name, label);
     this.selectedOptionValues = [];
   }
 
-  /**
-   * Returns the date range according to the selected option or dates
-   */
-  // getNumberRange(): NumberRange<Number> {
-  //   // const selectedOption = this.getSelectedOption();
-  //   // if (selectedOption) {
-  //   //   return calculateDateRange(selectedOption);
-  //   // }
-  //   const values = this.selectedOptionValues;
-  //   if (values?.length == 2) {
-  //     return new NumberRange(values[0], values[1]);
-  //   }
-  //   return new NumberRange(undefined, undefined);
-  // }
-
   getFilter(): DataFilter<T> {
     console.log("Peter this.selectedOptionValues", this.selectedOptionValues);
 
-    // const range = this.getNumberRange();
-    const filterObject: { $gte?: number; $lte?: number } = {};
+    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]);
@@ -59,21 +36,4 @@ export class NumberFilter<T extends Entity> extends Filter<T> {
     }
     return {} as DataFilter<T>;
   }
-
-  // getSelectedOption() {
-  //   return this.rangeOptions[this.selectedOptionValues as any];
-  // }
-
-  // private getDateRangeFromDateStrings(
-  //   dateStr1: string,
-  //   dateStr2: string,
-  // ): DateRange<Date> {
-  //   const date1 = moment(dateStr1).toDate();
-  //   const date2 = moment(dateStr2).toDate();
-
-  //   return new DateRange(
-  //     isValidDate(date1) ? date1 : undefined,
-  //     isValidDate(date2) ? date2 : undefined,
-  //   );
-  // }
 }