clean up

frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts

@@ -14,6 +14,7 @@ import { CheckInMetricMin } from '../../../shared/types/model/check-in-metric-mi
 import { CheckInOrdinalMin } from '../../../shared/types/model/check-in-ordinal-min';
 import { BehaviorSubject } from 'rxjs';
 import { Zone } from '../../../shared/types/enums/zone';
+import { numberValidator } from '../../../shared/constant-library';
 
 @Component({
   selector: 'app-check-in-form',
@@ -35,7 +36,7 @@ export class CheckInFormComponent implements OnInit {
 
   dialogForm = new FormGroup({
     metricValue: new FormControl<number | undefined>(undefined, [Validators.required,
-      Validators.pattern('^\\s*-?\\d+\\.?\\d*\\s*$')]),
+      numberValidator()]),
     ordinalZone: new FormControl<Zone>(Zone.COMMIT, [Validators.required]),
     confidence: new FormControl<number>(5, [Validators.required,
       Validators.min(0),
@@ -103,8 +104,8 @@ export class CheckInFormComponent implements OnInit {
 
   setValueOrZone() {
     this.keyResult.keyResultType === 'metric'
-      ? this.dialogForm.controls.metricValue.setValue(Number.parseFloat(this.getCheckInValue()))
-      : this.dialogForm.controls.ordinalZone.setValue(this.getCheckInValue() as Zone);
+      ? this.dialogForm.controls.metricValue.setValue((this.checkIn as CheckInMetricMin).value)
+      : this.dialogForm.controls.ordinalZone.setValue((this.checkIn as CheckInOrdinalMin).zone);
   }
 
   calculateTarget(keyResult: KeyResultMetric): number {
@@ -138,14 +139,6 @@ export class CheckInFormComponent implements OnInit {
       });
   }
 
-  getCheckInValue(): string {
-    if ((this.checkIn as CheckInMetricMin).value != null) {
-      return (this.checkIn as CheckInMetricMin).value!.toString();
-    } else {
-      return (this.checkIn as CheckInOrdinalMin).zone!;
-    }
-  }
-
   getKeyResultMetric(): KeyResultMetric {
     return this.keyResult as KeyResultMetric;
   }

frontend/src/app/shared/constant-library.ts

@@ -127,7 +127,7 @@ function ownerValidator(): ValidatorFn {
   };
 }
 
-function numberValidator(): ValidatorFn {
+export function numberValidator(): ValidatorFn {
   return (control: AbstractControl): ValidationErrors | null => {
     const isAllowed = (/^-?\d+\.?\d*$/).test(control.value);
     return isAllowed ? null : { number: { value: control.value } };

frontend/src/app/shared/types/model/check-in-metric-min.ts

@@ -1,5 +1,5 @@
 import { CheckInMin } from './check-in-min';
 
 export interface CheckInMetricMin extends CheckInMin {
-  value: number | undefined;
+  value: number;
 }

frontend/src/app/shared/types/model/check-in-ordinal-min.ts

@@ -1,5 +1,6 @@
 import { CheckInMin } from './check-in-min';
+import { Zone } from '../enums/zone';
 
 export interface CheckInOrdinalMin extends CheckInMin {
-  zone: string | undefined;
+  zone: Zone;
 }