Merge branch 'feature/scada-symbol' into AD/imp/drain-pipe

application/src/main/data/json/system/scada_symbols/vertical-tank-with-level.svg

@@ -1,24 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="168" height="280" viewBox="0 0 168 280" fill="none">
-<tb:metadata xmlns=""><![CDATA[{
-  "title": "Vertical tank with level",
-  "widgetSizeX": 3,
-  "widgetSizeY": 5,
-  "tags": [],
-  "behavior": [],
-  "properties": []
-}]]></tb:metadata><path d="M0 55C-4.39865e-05 -7.62939e-06 56.5 0 56.5 0H84H112.5C112.5 0 168 0 168 55C168 98.4236 168 213.531 168 260.063C168 271.109 159.046 280 148 280H20C8.9543 280 2.24098e-06 271.109 4.61562e-06 260.063C1.46193e-05 213.531 3.47283e-05 98.4236 0 55Z" fill="url(#paint0_linear_828_77723)"/><path d="M0 55C-4.39865e-05 -7.62939e-06 56.5 0 56.5 0H84H112.5C112.5 0 168 0 168 55C168 98.4236 168 213.531 168 260.063C168 271.109 159.046 280 148 280H20C8.9543 280 2.24098e-06 271.109 4.61562e-06 260.063C1.46193e-05 213.531 3.47283e-05 98.4236 0 55Z" fill="url(#paint1_linear_828_77723)" fill-opacity="0.2"/><rect x="0.5" y="57.5" width="3" height="167" transform="rotate(-90 0.5 57.5)" fill="#D9D9D9" stroke="#727171"/><rect x="130.5" y="90.5" width="15" height="119" rx="1.5" fill="#4A4848" stroke="#7D7D7D"/><mask id="mask0_828_77723" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="131" y="90" width="14" height="120">
-<rect x="131" y="90.8571" width="14" height="118.286" rx="1" fill="#D9D9D9"/>
-</mask><g mask="url(#mask0_828_77723)">
-<rect x="131" y="126.857" width="14" height="120" fill="#62A5F2"/>
-</g><defs>
-<linearGradient id="paint0_linear_828_77723" x1="168" y1="153.243" x2="-4.02657e-05" y2="153.243" gradientUnits="userSpaceOnUse">
-<stop stop-color="#727171"/>
-<stop offset="0.504644" stop-color="#CACACA"/>
-<stop offset="1" stop-color="#727171"/>
-</linearGradient>
-<linearGradient id="paint1_linear_828_77723" x1="84" y1="228.919" x2="84" y2="280" gradientUnits="userSpaceOnUse">
-<stop stop-opacity="0"/>
-<stop offset="1"/>
-</linearGradient>
-</defs>
-</svg>

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

@@ -22,6 +22,12 @@
     "bottom_tee_pipe",
     "right_tee_pipe",
     "top_tee_pipe",
+    "right_elbow_drain_pipe",
+    "left_elbow_drain_pipe",
+    "left_drain_pipe",
+    "right_drain_pipe",
+    "short_left_drain_pipe",
+    "short_right_drain_pipe",    
     "top_flow_meter",
     "right_flow_meter",
     "bottom_flow_meter",
@@ -41,14 +47,8 @@
     "vertical_wheel_valve",
     "horizontal_ball_valve",
     "vertical_ball_valve",
+    "vertical_tank",
     "horizontal_tank_with_screen",
-    "vertical_tank_with_level",
+    "level_and_fan"
-    "level_and_fan",
-    "right_elbow_drain_pipe",
-    "left_elbow_drain_pipe",
-    "left_drain_pipe",
-    "right_drain_pipe",
-    "short_left_drain_pipe",
-    "short_right_drain_pipe"
   ]
 }

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

@@ -3737,7 +3737,22 @@
             "opened-color": "Opened color",
             "closed-color": "Closed color",
             "opened-rotation-angle": "Opened rotation angle",
-            "closed-rotation-angle": "Closed rotation angle"
+            "closed-rotation-angle": "Closed rotation angle",
+            "tank-capacity": "Tank capacity",
+            "tank-capacity-hint": "Double value indicating total tank capacity.",
+            "current-volume": "Current volume",
+            "current-volume-hint": "Double value indicating the current occupied volume.",
+            "tank-color": "Tank color",
+            "value-box": "Value box",
+            "value-text": "Value text",
+            "scale": "Scale",
+            "transparent-mode": "Transparent mode",
+            "major-ticks": "Major ticks",
+            "intervals": "Intervals",
+            "major-ticks-color": "Major ticks color",
+            "normal": "Normal",
+            "minor-ticks": "Minor ticks",
+            "minor-ticks-color": "Minor ticks color"
         }
     },
     "item": {