UI: Top flow meter SCADA symbol.

application/src/main/data/json/system/widget_bundles/scada_water_system_symbols.json

@@ -22,12 +22,11 @@
     "bottom_tee_pipe",
     "right_tee_pipe",
     "top_tee_pipe",
+    "top_flow_meter",
     "horizontal_tank_with_screen",
     "horizontal_faucet",
-    "top_white_counter",
     "water_blower_right_connector",
     "vertical_tank_with_level",
-    "top_black_counter",
     "pump_left",
     "pump",
     "level_and_fan"

ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts

@@ -359,10 +359,10 @@ const defaultSetValueSettings = (set: ScadaSymbolBehaviorAction): SetValueSettin
 });
 
 const defaultWidgetActionSettings = (widgetAction: ScadaSymbolBehavior): WidgetAction => ({
-  type: WidgetActionType.updateDashboardState,
+  type: WidgetActionType.doNothing,
   targetDashboardStateId: null,
   openRightLayout: false,
-  setEntityId: true,
+  setEntityId: false,
   stateEntityParamName: null
 });
 
@@ -457,7 +457,7 @@ export class ScadaSymbolObject {
       for (const tag of this.metadata.tags) {
         const elements = this.context.tags[tag.tag];
         elements.forEach(element => {
-          element.timeline().finish();
+          element.timeline().stop();
           element.timeline(null);
         });
       }

ui-ngx/src/app/shared/models/widget.models.ts

@@ -539,6 +539,7 @@ export interface LegendData {
 }
 
 export enum WidgetActionType {
+  doNothing = 'doNothing',
   openDashboardState = 'openDashboardState',
   updateDashboardState = 'updateDashboardState',
   openDashboard = 'openDashboard',
@@ -563,6 +564,7 @@ export const widgetActionTypes = Object.keys(WidgetActionType) as WidgetActionTy
 
 export const widgetActionTypeTranslationMap = new Map<WidgetActionType, string>(
   [
+    [ WidgetActionType.doNothing, 'widget-action.do-nothing' ],
     [ WidgetActionType.openDashboardState, 'widget-action.open-dashboard-state' ],
     [ WidgetActionType.updateDashboardState, 'widget-action.update-dashboard-state' ],
     [ WidgetActionType.openDashboard, 'widget-action.open-dashboard' ],

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

@@ -3620,7 +3620,28 @@
             "left-fluid-color": "Left fluid color",
             "right-fluid-color": "Right fluid color",
             "top-fluid-color": "Top fluid color",
-            "bottom-fluid-color": "Bottom fluid color"
+            "bottom-fluid-color": "Bottom fluid color",
+            "value": "Value",
+            "flow-meter-value-hint": "Double value showing on flow meter display",
+            "warning-state": "Warning state",
+            "warning": "Warning",
+            "warning-state-hint": "Indicates whether component is in warning state.",
+            "critical-state": "Critical state",
+            "critical": "Critical",
+            "critical-state-hint": "Indicates whether component is in critical state.",
+            "critical-state-animation": "Critical state animation",
+            "critical-state-animation-hint": "Whether to enable blinking animation when component is in critical state.",
+            "animation": "Animation",
+            "broken": "Broken",
+            "broken-hint": "Indicates whether component is broken.",
+            "on-display-click": "On display click",
+            "on-display-click-hint": "Action invoked when user clicks on the display.",
+            "pipe": "Pipe",
+            "default-border-color": "Default border color",
+            "active-border-color": "Active border color",
+            "warning-border-color": "Warning border color",
+            "critical-border-color": "Critical border color",
+            "background-color": "Background color"
         }
     },
     "item": {
@@ -5571,6 +5592,7 @@
     },
     "widget-action": {
         "header-button": "Widget header button",
+        "do-nothing": "Do nothing",
         "open-dashboard-state": "Navigate to new dashboard state",
         "update-dashboard-state": "Update current dashboard state",
         "open-dashboard": "Navigate to other dashboard",