diff --git a/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.html b/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.html index fe4df7ca62..9088f5cc33 100644 --- a/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.html @@ -63,24 +63,30 @@
- - datakey.aggregation-type + + datakey.aggregation - {{ (aggregation === aggregationTypes.NONE ? 'datakey.latest-value' : aggregationTypesTranslations.get(aggregationTypes[aggregation])) | translate }} + {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }} - {{ dataKeyFormGroup.get('aggregationType').value ? (dataKeyAggregationTypeHintTranslations.get(aggregationTypes[dataKeyFormGroup.get('aggregationType').value]) | translate) : '' }} + + {{ dataKeyFormGroup.get('aggregationType').value ? (dataKeyAggregationTypeHintTranslations.get(aggregationTypes[dataKeyFormGroup.get('aggregationType').value]) | translate) : '' }} +
+ {{ 'datakey.aggregation-type-hint-common' | translate }} +
+
- widgets.chart.comparison-settings + datakey.delta-calculation - + - {{ 'widgets.chart.enable-comparison' | translate }} + {{ 'datakey.enable-delta-calculation' | translate }} + {{ 'datakey.enable-delta-calculation-hint' | translate }} @@ -113,7 +119,7 @@ - datakey.comparison-result + datakey.delta-calculation-result {{ comparisonResultTypeTranslations.get(comparisonResultTypes[comparisonResultType]) | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.scss b/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.scss index d0d7e56137..7fd1fba872 100644 --- a/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/data-key-config.component.scss @@ -83,6 +83,7 @@ .mat-expansion-panel-header { padding: 0; color: rgba(0, 0, 0, 0.87); + height: 140px; &:hover { background: none; diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts index 0472949680..92b977e346 100644 --- a/ui-ngx/src/app/shared/models/widget.models.ts +++ b/ui-ngx/src/app/shared/models/widget.models.ts @@ -267,9 +267,9 @@ export enum ComparisonResultType { export const comparisonResultTypeTranslationMap = new Map( [ - [ComparisonResultType.PREVIOUS_VALUE, 'datakey.comparison-result-previous-value'], - [ComparisonResultType.DELTA_ABSOLUTE, 'datakey.comparison-result-delta-absolute'], - [ComparisonResultType.DELTA_PERCENT, 'datakey.comparison-result-delta-percent'] + [ComparisonResultType.PREVIOUS_VALUE, 'datakey.delta-calculation-result-previous-value'], + [ComparisonResultType.DELTA_ABSOLUTE, 'datakey.delta-calculation-result-delta-absolute'], + [ComparisonResultType.DELTA_PERCENT, 'datakey.delta-calculation-result-delta-percent'] ] ); diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index e64d7b9b78..1fd934d92d 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -1040,18 +1040,21 @@ "prev-value-description": "result of the previous function call;", "time-prev-description": "timestamp of the previous value;", "prev-orig-value-description": "original previous value;", - "aggregation-type": "Aggregation type", - "latest-value": "Latest value", - "aggregation-type-none-hint": "Take latest value", - "aggregation-type-min-hint": "Take min value", - "aggregation-type-max-hint": "Take max value", - "aggregation-type-avg-hint": "Calculate average value", - "aggregation-type-sum-hint": "Calculate sum value", - "aggregation-type-count-hint": "Calculate count value", - "comparison-result": "Comparison result", - "comparison-result-previous-value": "Previous value", - "comparison-result-delta-absolute": "Delta (absolute)", - "comparison-result-delta-percent": "Delta (percent)" + "aggregation": "Aggregation", + "aggregation-type-hint-common": "For performance reasons, the aggregated values calculation is available only for fixed time intervals like \"current day\", \"current month\", etc, and is not available for sliding window intervals like 'last 30 minutes' or 'last 24 hours'.", + "aggregation-type-none-hint": "Take latest value.", + "aggregation-type-min-hint": "Find minimum value among data points within a selected time window.", + "aggregation-type-max-hint": "Find maximum value among data points within a selected time window.", + "aggregation-type-avg-hint": "Calculate an average value among data points within a selected time window.", + "aggregation-type-sum-hint": "Sum all values of the data points within a selected time window.", + "aggregation-type-count-hint": "Total number of the data points within a selected time window.", + "delta-calculation": "Delta calculation", + "enable-delta-calculation": "Enable delta calculation", + "enable-delta-calculation-hint": "When enabled, the data key value is calculated based on the aggregated values for a selected time window and a specified comparison period. For performance reasons, the delta calculation is available only for history time windows and not for real-time values. For example, you may calculate the delta between the energy consumption for yesterday compared to the energy consumption for the day before yesterday.", + "delta-calculation-result": "Delta calculation result", + "delta-calculation-result-previous-value": "Previous value", + "delta-calculation-result-delta-absolute": "Delta (absolute)", + "delta-calculation-result-delta-percent": "Delta (percent)" }, "datasource": { "type": "Datasource type",