Fix duplicate import of TimezoneService

opf · Apr 3, 2024 · ec66285 · ec66285
1 parent e3250c4
commit ec66285
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/frontend/src/app/shared/components/fields/edit/field-types/progress-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/progress-edit-field.component.ts
@@ -28,14 +28,11 @@
 
 import { Directive, Injector, OnDestroy, OnInit } from '@angular/core';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
-import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { EditFieldComponent } from 'core-app/shared/components/fields/edit/edit-field.component';
 import { DeviceService } from 'core-app/core/browser/device.service';
 
 @Directive()
 export abstract class ProgressEditFieldComponent extends EditFieldComponent implements OnInit, OnDestroy {
-  @InjectField() readonly timezoneService:TimezoneService;
-
   @InjectField() deviceService:DeviceService;
 
   @InjectField() injector:Injector;

diff --git a/.../app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.html b/.../app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.html
@@ -9,7 +9,7 @@
     class="spot-input"
     (click)="onInputClick($event)"
     (focus)="showProgressModal()"
-    [value]="formatter(value)"
+    [value]="asHours"
   />
 
   <ng-container slot="body">

diff --git a/...rc/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts b/...rc/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts
@@ -91,7 +91,7 @@ export class ProgressPopoverEditFieldComponent extends ProgressEditFieldComponen
     private halEvents:HalEventsService,
     private toastService:ToastService,
     private apiV3Service:ApiV3Service,
-    private timeZoneService:TimezoneService,
+    private timezoneService:TimezoneService,
   ) {
     super(I18n, elementRef, change, schema, handler, cdRef, injector);
   }
@@ -123,11 +123,10 @@ export class ProgressPopoverEditFieldComponent extends ProgressEditFieldComponen
       .removeEventListener('turbo:submit-end', this.contextBasedListener.bind(this));
   }
 
-  // HELP!
   public get asHours():string {
     if (this.value) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      this.timezoneService.formattedDuration(this.value);
+      return this.timezoneService.formattedDuration(this.value);
     }
 
     return this.text.placeholder;