diff --git a/application/src/main/data/json/system/scada_symbols/cross-pipe.svg b/application/src/main/data/json/system/scada_symbols/cross-pipe.svg
new file mode 100644
index 0000000000..45b3df428c
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/cross-pipe.svg
@@ -0,0 +1,476 @@
+
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-connector-long.svg b/application/src/main/data/json/system/scada_symbols/horizontal-connector-long.svg
deleted file mode 100644
index 40b3148fe0..0000000000
--- a/application/src/main/data/json/system/scada_symbols/horizontal-connector-long.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-pipe.svg b/application/src/main/data/json/system/scada_symbols/horizontal-pipe.svg
index 6dc82ca4ef..2b405e2a9e 100644
--- a/application/src/main/data/json/system/scada_symbols/horizontal-pipe.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-pipe.svg
@@ -1,6 +1,11 @@
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/long-horizontal-pipe.svg b/application/src/main/data/json/system/scada_symbols/long-horizontal-pipe.svg
new file mode 100644
index 0000000000..fb16786572
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/long-horizontal-pipe.svg
@@ -0,0 +1,362 @@
+
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/long-vertical-pipe.svg b/application/src/main/data/json/system/scada_symbols/long-vertical-pipe.svg
new file mode 100644
index 0000000000..ceaffd4729
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/long-vertical-pipe.svg
@@ -0,0 +1,359 @@
+
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/quadro-connector.svg b/application/src/main/data/json/system/scada_symbols/quadro-connector.svg
deleted file mode 100644
index 31b2f2accc..0000000000
--- a/application/src/main/data/json/system/scada_symbols/quadro-connector.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-connector-long.svg b/application/src/main/data/json/system/scada_symbols/vertical-connector-long.svg
deleted file mode 100644
index af1c25d862..0000000000
--- a/application/src/main/data/json/system/scada_symbols/vertical-connector-long.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-connector.svg b/application/src/main/data/json/system/scada_symbols/vertical-connector.svg
deleted file mode 100644
index 53ae6c58dc..0000000000
--- a/application/src/main/data/json/system/scada_symbols/vertical-connector.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-pipe.svg b/application/src/main/data/json/system/scada_symbols/vertical-pipe.svg
new file mode 100644
index 0000000000..0314f062ae
--- /dev/null
+++ b/application/src/main/data/json/system/scada_symbols/vertical-pipe.svg
@@ -0,0 +1,296 @@
+
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_bundles/scada_water_system_symbols.json b/application/src/main/data/json/system/widget_bundles/scada_water_system_symbols.json
index 49e42f3f03..7e15717472 100644
--- a/application/src/main/data/json/system/widget_bundles/scada_water_system_symbols.json
+++ b/application/src/main/data/json/system/widget_bundles/scada_water_system_symbols.json
@@ -8,10 +8,12 @@
"name": "SCADA water system symbols"
},
"widgetTypeFqns": [
- "level_and_fan",
- "vertical_connector_long",
+ "horizontal_pipe",
+ "long_horizontal_pipe",
+ "vertical_pipe",
+ "long_vertical_pipe",
+ "cross_pipe",
"horizontal_tank_with_screen",
- "quadro_connector",
"horizontal_faucet",
"top_white_counter",
"right_top_angle_connector",
@@ -19,12 +21,10 @@
"water_blower_right_connector",
"vertical_tank_with_level",
"left_bottom_angle_connector",
- "horizontal_connector_long",
"top_black_counter",
"right_bottom_angle_connector",
- "vertical_connector",
- "horizontal_pipe",
"pump_left",
- "pump"
+ "pump",
+ "level_and_fan"
]
}
\ No newline at end of file
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html
index 5a73fc0474..e9c6f0967e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html
@@ -18,7 +18,7 @@
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/scada/scada-symbol-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/scada/scada-symbol-widget-settings.component.html
index 7756989ab9..50ec0fabe1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/scada/scada-symbol-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/scada/scada-symbol-widget-settings.component.html
@@ -17,7 +17,7 @@
-->
diff --git a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
index f54e2bc831..1c4d6c204d 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
@@ -141,7 +141,7 @@ const routes: Routes = [
icon: 'view_in_ar'
} as BreadCrumbConfig,
auth: [Authority.TENANT_ADMIN, Authority.SYS_ADMIN],
- title: 'scada.symbol'
+ title: 'scada.symbol.symbol'
},
resolve: {
symbolData: scadaSymbolResolver
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol.component.html b/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol.component.html
index 3c613ed7ff..54251bd8ed 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol.component.html
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol.component.html
@@ -60,7 +60,7 @@