diff --git a/ui-ngx/src/app/shared/components/time/quick-time-interval.component.html b/ui-ngx/src/app/shared/components/time/quick-time-interval.component.html index 52479173c1..2a68d672c9 100644 --- a/ui-ngx/src/app/shared/components/time/quick-time-interval.component.html +++ b/ui-ngx/src/app/shared/components/time/quick-time-interval.component.html @@ -17,7 +17,7 @@ -->
- timewindow.interval + timewindow.interval {{ timeIntervalTranslationMap.get(interval) | translate}} diff --git a/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts b/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts index 1edaad40e5..87b3687d0e 100644 --- a/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts +++ b/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts @@ -18,6 +18,7 @@ import { Component, forwardRef, Input, OnInit } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { QuickTimeInterval, QuickTimeIntervalTranslationMap } from '@shared/models/time/time.models'; import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field'; +import { coerceBoolean } from '@shared/decorators/coercion'; @Component({ selector: 'tb-quick-time-interval', @@ -40,6 +41,10 @@ export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor rendered = false; + @Input() + @coerceBoolean() + displayLabel = true; + @Input() disabled: boolean; @Input() onlyCurrentInterval = false; diff --git a/ui-ngx/src/app/shared/components/time/timeinterval.component.html b/ui-ngx/src/app/shared/components/time/timeinterval.component.html index f72704bcea..3cf001e426 100644 --- a/ui-ngx/src/app/shared/components/time/timeinterval.component.html +++ b/ui-ngx/src/app/shared/components/time/timeinterval.component.html @@ -22,19 +22,19 @@
- + timeinterval.days - + timeinterval.hours - + timeinterval.minutes - + timeinterval.seconds diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html index b5c279df4e..42daf5f6ff 100644 --- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html +++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html @@ -16,7 +16,7 @@ -->
-
@@ -24,24 +24,18 @@
{{ 'timewindow.time-range' | translate }}
- - - + +
- + - + -
-
- - -
-
-
- - -
- timewindow.for-all-time -
-
- -
- timewindow.last - -
-
- -
- timewindow.time-period - -
-
- -
- timewindow.interval - -
-
-
+
+
+
{{ 'timewindow.time-range' | translate }}
+
+ + + + + + +
+ + + + + + + + + + + + + + + + +
-
- - + + +
-
-
-
{{ 'aggregation.aggregation' | translate }}
- - - - {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }} - - - -
+
+ +
+
{{ 'aggregation.aggregation' | translate }}
+ + + + {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }} + + + +
-
-
{{ 'aggregation.limit' | translate }}
-
-
- - - - - +
+
{{ 'aggregation.limit' | translate }}
+
+
+ + + + + + +
-
+
+
+ +
+
{{ 'aggregation.group-interval' | translate }}
+ + + + + + + +
-
- - -
-
- - -
-
-
- - -
- - - - - -
+ + + + + + +