Resolve conversations

puzzle · Jan 24, 2025 · 0f6222f · 0f6222f
1 parent 226b0b6
commit 0f6222f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.ts b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { KeyResultMetric } from '../../../shared/types/model/key-result-metric';
 import { CheckInMin } from '../../../shared/types/model/check-in-min';
-import { formInputCheck, hasFormFieldErrors } from '../../../shared/common';
+import { formInputCheck } from '../../../shared/common';
 import { TranslateService } from '@ngx-translate/core';
 import { CheckInMetricMin } from '../../../shared/types/model/check-in-metric-min';
 
@@ -24,8 +24,6 @@ export class CheckInFormMetricComponent {
 
   protected readonly formInputCheck = formInputCheck;
 
-  protected readonly hasFormFieldErrors = hasFormFieldErrors;
-
   constructor(private translate: TranslateService) {}
 
   generateUnitLabel(): string {

diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts
@@ -177,7 +177,6 @@ describe('CheckInFormComponent', () => {
     component.keyResult = keyResultOrdinal;
     component.ngOnInit();
     component.setDefaultValues();
-    console.log(component.dialogForm.value);
     expect(component.dialogForm.value)
       .toStrictEqual({
         confidence: keyResultOrdinal.lastCheckIn!.confidence,

diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts
@@ -111,18 +111,15 @@ export class CheckInFormComponent implements OnInit {
 
     const actionList: Action[] = this.actionList$.value as Action[];
     this.dialogForm.patchValue({ actionList: actionList });
-
     const baseCheckIn: any = {
       id: this.checkIn.id,
       version: this.checkIn.version,
       keyResultId: this.keyResult.id,
-      confidence: this.dialogForm.controls.confidence.value,
-      changeInfo: this.dialogForm.controls.changeInfo.value,
-      initiatives: this.dialogForm.controls.initiatives.value
+      ...this.dialogForm.value
     };
-    this.keyResult.keyResultType === 'metric'
-      ? baseCheckIn.value = this.dialogForm.controls.metricValue.value
-      : baseCheckIn.zone = this.dialogForm.controls.ordinalZone.value;
+
+    baseCheckIn.value = this.dialogForm.controls.metricValue.value;
+    baseCheckIn.zone = this.dialogForm.controls.ordinalZone.value;
 
     this.checkInService.saveCheckIn(baseCheckIn)
       .subscribe(() => {