Merge pull request #14443 from vvlladd28/bug/alarm-details/duration

Fixed show duration in alarm details dialog

ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.ts

@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { Component, Inject, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -51,7 +51,7 @@ export interface AlarmDetailsDialogData {
   templateUrl: './alarm-details-dialog.component.html',
   styleUrls: ['./alarm-details-dialog.component.scss']
 })
-export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDialogComponent, boolean> implements OnInit {
+export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDialogComponent, boolean> {
 
   alarmId: string;
   alarmFormGroup: UntypedFormGroup;
@@ -128,13 +128,12 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
       this.alarmFormGroup.get('startTime')
         .patchValue(this.datePipe.transform(alarm.startTs, 'yyyy-MM-dd HH:mm:ss'));
     }
-    if (alarm.startTs || alarm.endTs) {
+    if (alarm.startTs || alarm.clearTs) {
       let duration = '';
-      if (alarm.startTs && (alarm.status === AlarmStatus.ACTIVE_ACK || alarm.status === AlarmStatus.ACTIVE_UNACK)) {
+      if (alarm.startTs && !alarm.cleared) {
         duration = this.millisecondsToTimeStringPipe.transform(Date.now() - alarm.startTs);
-      }
+      } else if (alarm.clearTs && alarm.cleared) {
-      if (alarm.endTs && (alarm.status === AlarmStatus.CLEARED_ACK || alarm.status === AlarmStatus.CLEARED_UNACK)) {
+        duration = this.millisecondsToTimeStringPipe.transform(alarm.clearTs - alarm.startTs);
-        duration = this.millisecondsToTimeStringPipe.transform(alarm.endTs - alarm.startTs);
       }
       this.alarmFormGroup.get('duration').patchValue(duration);
     }
@@ -144,9 +143,6 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
     this.alarmFormGroup.get('alarmDetails').patchValue(alarm.details);
   }
 
-  ngOnInit(): void {
-  }
-
   close(): void {
     this.dialogRef.close(this.alarmUpdated);
   }

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -5948,13 +5948,13 @@
     "timewindow": {
         "timewindow": "Time window",
         "timewindow-settings": "Time window settings",
-        "years": "{ years, plural, =1 { year } other {# years } }",
+        "years": "{ years, plural, =1 {1 year } other {# years } }",
         "years-short": "{{ years }}y",
-        "months": "{ months, plural, =1 { month } other {# months } }",
+        "months": "{ months, plural, =1 {1 month } other {# months } }",
         "months-short": "{{ months }}M",
-        "weeks": "{ weeks, plural, =1 { week } other {# weeks } }",
+        "weeks": "{ weeks, plural, =1 {1 week } other {# weeks } }",
         "weeks-short": "{{ weeks }}w",
-        "days": "{ days, plural, =1 { day } other {# days } }",
+        "days": "{ days, plural, =1 {1 day } other {# days } }",
         "days-short": "{{ days }}d",
         "hours": "{ hours, plural, =0 { hour } =1 {1 hour } other {# hours } }",
         "hr": "{{ hr }} hr",