Merge pull request #2884 from SCADA-LTS/feature/#2503_Add_alignment_a…

…nd_template_feature_for_html_and_js

Feature/#2503 add alignment and template feature for html and js

WebContent/WEB-INF/jsp/publicView.jsp

@@ -31,6 +31,7 @@
   <link href="resources/js-ui/app/css/chunk-vendors.css" rel="stylesheet" type="text/css">
 
   <!-- Script -->
+  <script src="resources/fuscabr/fuscabr.js" defer></script>
   <script type="text/javascript">var djConfig = { isDebug: true };</script>
   <!--<script type="text/javascript" src="http://o.aolcdn.com/dojo/0.4.2/dojo.js"></script> -->
   <script type="text/javascript" src="resources/dojo/dojo.js"></script>
@@ -58,4 +59,4 @@
   <%@ include file="/WEB-INF/jsp/include/vue/vue-app.js.jsp"%>
   <%@ include file="/WEB-INF/jsp/include/vue/vue-view.js.jsp"%>
 </body>
-</html>
+</html>

WebContent/WEB-INF/tags/page.tag

@@ -72,6 +72,7 @@
   </style>
 
   <!-- Scripts -->
+  <script src="resources/fuscabr/fuscabr.js" defer></script>
   <script type="text/javascript">
   	var djConfig = { isDebug: false, extraLocale: ['en-us', 'nl', 'nl-nl', 'ja-jp', 'fi-fi', 'sv-se', 'zh-cn', 'zh-tw','xx'] };
   	var ctxPath = "<%=request.getContextPath()%>";
@@ -458,4 +459,4 @@
 </c:if>
 
 </body>
-</html>
+</html>

WebContent/WEB-INF/web.xml

@@ -364,7 +364,14 @@
     <servlet-name>default</servlet-name>
     <url-pattern>*.mp3</url-pattern>
   </servlet-mapping>
-
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>*.json</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>*.html</url-pattern>
+  </servlet-mapping>
   <servlet-mapping>
     <servlet-name>springDispatcher</servlet-name>
     <url-pattern>/</url-pattern>

WebContent/resources/fuscabr/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2021 Celso Dell Anhol Ubaldo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.

WebContent/resources/fuscabr/conf/common.json

@@ -0,0 +1,45 @@
+{
+		"language": "en",
+		"languageFile": "resources/fuscabr/conf/i18n/en.json",
+
+		"modulesPath": "resources/fuscabr/modules/minified/",
+		"modules": [
+			{
+				"name": "align",
+				"enabled": true,
+				"file": "align.js",
+				"pages": [ "view_edit.shtm" ]
+			},
+			{
+				"name": "chart",
+				"enabled": true,
+				"file": "chart.js",
+				"pages": [ "views.shtm", "view_edit.shtm", "public_view.htm" ]
+			},
+			{
+				"name": "ceditor",
+				"enabled": true,
+				"file": "ceditor.js",
+				"pages": [ "sql.shtm", "emport.shtm", "view_edit.shtm", "point_links.shtm",
+						   "compound_events.shtm", "data_source_edit.shtm", "scripting.shtm" ]
+			},
+			{
+				"name": "calendar",
+				"enabled": true,
+				"file": "calendar.js",
+				"pages": [ "views.shtm", "view_edit.shtm", "public_view.htm" ]
+			},
+			{
+				"name": "csnippet",
+				"enabled": true,
+				"file": "csnippet.js",
+				"pages": [ "view_edit.shtm" ]
+			},
+			{
+				"name": "fixes",
+				"enabled": true,
+				"file": "fixes.js",
+				"pages": [ "view_edit.shtm" ]
+			}
+		]
+}

WebContent/resources/fuscabr/conf/i18n/en.json

@@ -0,0 +1,62 @@
+{
+	"align": {
+		"align_elements": "Align Elements",
+		"align_options": "Align options:",
+		"start_alignment": "Start alignment",
+		"stop_alignment": "Stop alignment (Esc)",
+		"align": "Align:",
+		"align_left": "Left (A)",
+		"align_right": "Right (D)",
+		"align_top": "Top (W)",
+		"align_bottom": "Bottom (X)",
+		"anchor": "Anchor",
+		"anchor_position": "Anchor position:",
+		"clear_selection": "Clear selection (S)",
+		"cannot_delete_components": "You cannot delete components while the alignment mode is active!",
+		"center": "Center:",
+		"center_horizontally": "Horizontally (F)",
+		"center_vertically": "Vertically (G)",
+		"distribute": "Distribute:",
+		"distribute_horizontally": "Horizontally (R)",
+		"distribute_vertically": "Vertically (T)",
+		"elements_follow_anchor": "Elements follow anchor",
+		"move_with_arrows": "Move with keyboard arrows",
+		"fuscabr_library": "FUScaBR Library"
+	},
+
+	"csnippet": {
+		"apply": "Apply",
+		"template": "Template:",
+
+
+		"acknowledge_alarms": "Acknowledge alarms button",
+		"button_change_page": "Button (change page)",
+		"button_logout": "Button (logout)",
+		"clock": "Digital clock",
+		"full_screen": "Toggle Full Screen",
+		"html_image": "HTML image",
+		"run_multiple_scripts": "Run multiple ScadaBR scripts",
+		"silence_alarms": "Silence alarms button",
+		"simple_text": "Simple text example",
+
+		"active_users_table": "Active users table",
+		"binary_text": "Binary text",
+		"change_password": "Change user password (experimental)",
+		"checkbox": "Checkbox",
+		"customizable_data_point": "Customizable data point",
+		"demo_functions": "Demo functions",
+		"drop_down_selector": "Drop-down selector",
+		"fuscabr_chart_time": "FUScaBR Chart (time based)",
+		"fuscabr_chart_latest": "FUScaBR Chart (latest values)",
+		"gauge": "Gauge",
+		"history_csv": "Point values history download (CSV)",
+		"horizontal_bar": "Bar (horizontal)",
+		"vertical_bar": "Bar (vertical)",
+		"image_button": "Button (image)",
+		"image_sequence": "Image sequence",
+		"numeric_selector": "Numeric selector",
+		"pulse_button": "Button (pulse)",
+		"show_username": "Show username",
+		"slider": "Slider selector"
+	}
+}

WebContent/resources/fuscabr/conf/i18n/es.json

@@ -0,0 +1,62 @@
+{
+	"align": {
+		"align_elements": "Alinear elementos",
+		"align_options": "Opciones de alineación:",
+		"start_alignment": "Iniciar alineación",
+		"stop_alignment": "Parar alineación (Esc)",
+		"align": "Alinear:",
+		"align_left": "A la izquierda (A)",
+		"align_right": "A la derecha (D)",
+		"align_top": "Arriba (W)",
+		"align_bottom": "Abajo (X)",
+		"anchor": "Ancla",
+		"anchor_position": "Posición del ancla:",
+		"clear_selection": "Deseleccionar (S)",
+		"cannot_delete_components": "¡Usted no puede borrar los componentes mientras el modo de alineación está activo!",
+		"center": "Centralizar:",
+		"center_horizontally": "Horizontalmente (F)",
+		"center_vertically": "Verticalmente (G)",
+		"distribute": "Distribuir:",
+		"distribute_horizontally": "Horizontalmente (R)",
+		"distribute_vertically": "Verticalmente (T)",
+		"elements_follow_anchor": "Elementos siguen el ancla",
+		"move_with_arrows": "Mover con las flechas del teclado",
+		"fuscabr_library": "Biblioteca FUScaBR"
+	},
+
+	"csnippet": {
+		"apply": "Aplicar",
+		"template": "Modelo:",
+
+
+		"acknowledge_alarms": "Botón (reconocer alarmas)",
+		"button_change_page": "Botón (cambiar página)",
+		"button_logout": "Botón (logout)",
+		"clock": "Reloj digital",
+		"full_screen": "Alternar modo Pantalla Completa",
+		"html_image": "Imagen HTML",
+		"run_multiple_scripts": "Ejecutar varios scripts de ScadaBR",
+		"silence_alarms": "Botón (silenciar alarmas)",
+		"simple_text": "Ejemplo de texto simple",
+
+		"active_users_table": "Tabla de usuarios activos",
+		"binary_text": "Texto binario",
+		"change_password": "Cambiar contraseña de usuario (experimental)",
+		"checkbox": "Checkbox",
+		"customizable_data_point": "Punto de datos personalizable",
+		"demo_functions": "Funciones de demostración",
+		"drop_down_selector": "Lista desplegable",
+		"fuscabr_chart_time": "Gráfico FUScaBR (basado en tiempo)",
+		"fuscabr_chart_latest": "Gráfico FUScaBR (últimos valores)",
+		"gauge": "Medidor (tipo 'gauge')",
+		"history_csv": "Descargar historial de valores de punto (CSV)",
+		"horizontal_bar": "Barra (horizontal)",
+		"vertical_bar": "Barra (vertical)",
+		"image_button": "Botón (imagen)",
+		"image_sequence": "Secuencia de imágenes",
+		"numeric_selector": "Selector numérico",
+		"pulse_button": "Botón (pulso)",
+		"show_username": "Exhibir nombre de usuario",
+		"slider": "Control deslizante (slider)"
+	}
+}

WebContent/resources/fuscabr/conf/i18n/pt.json

@@ -0,0 +1,62 @@
+{
+	"align": {
+		"align_elements": "Alinhar elementos",
+		"align_options": "Opções de alinhamento:",
+		"start_alignment": "Iniciar alinhamento",
+		"stop_alignment": "Parar alinhamento (Esc)",
+		"align": "Alinhar:",
+		"align_left": "À esquerda (A)",
+		"align_right": "À direita (D)",
+		"align_top": "Ao topo (W)",
+		"align_bottom": "À base (X)",
+		"anchor": "Âncora",
+		"anchor_position": "Posição do âncora:",
+		"clear_selection": "Limpar seleção (S)",
+		"cannot_delete_components": "Você não pode deletar componentes enquanto o modo de alinhamento está ativo!",
+		"center": "Centralizar:",
+		"center_horizontally": "Horizontalmente (F)",
+		"center_vertically": "Verticalmente (G)",
+		"distribute": "Distribuir:",
+		"distribute_horizontally": "Horizontalmente (R)",
+		"distribute_vertically": "Verticalmente (T)",
+		"elements_follow_anchor": "Elementos seguem o âncora",
+		"move_with_arrows": "Mover com as setas do teclado",
+		"fuscabr_library": "Biblioteca FUScaBR"
+	},
+
+	"csnippet": {
+		"apply": "Aplicar",
+		"template": "Modelo:",
+
+
+		"acknowledge_alarms": "Botão para reconhecer alarmes",
+		"button_change_page": "Botão (mudar de página)",
+		"button_logout": "Botão (logout)",
+		"clock": "Relógio digital",
+		"full_screen": "Alternar modo Tela Cheia",
+		"html_image": "Imagem HTML",
+		"run_multiple_scripts": "Executar vários scripts do ScadaBR",
+		"silence_alarms": "Botão para silenciar alarmes",
+		"simple_text": "Exemplo de texto simples",
+
+		"active_users_table": "Tabela de usuários ativos",
+		"binary_text": "Texto binário",
+		"change_password": "Mudar senha do usuário (experimental)",
+		"checkbox": "Checkbox",
+		"customizable_data_point": "Data point personalizável",
+		"demo_functions": "Funções de demonstração",
+		"drop_down_selector": "Seletor drop-down",
+		"fuscabr_chart_time": "Gráfico FUScaBR (baseado no tempo)",
+		"fuscabr_chart_latest": "Gráfico FUScaBR (últimos valores)",
+		"gauge": "Medidor (tipo 'gauge')",
+		"history_csv": "Baixar histórico de valores de ponto (CSV)",
+		"horizontal_bar": "Barra (horizontal)",
+		"vertical_bar": "Barra (vertical)",
+		"image_button": "Botão (imagem)",
+		"image_sequence": "Sequência de imagens",
+		"numeric_selector": "Seletor numérico",
+		"pulse_button": "Botão (pulso)",
+		"show_username": "Mostrar nome de usuário",
+		"slider": "Controle deslizante (slider)"
+	}
+}

WebContent/resources/fuscabr/conf/modules/align.json

@@ -0,0 +1,6 @@
+{
+	"moveAnchorOffset": 10,
+	"anchorBorderColor": "#008000",
+	"elementBorderColor": "#FF7A00",
+	"hoverBorderColor": "#F1F116"
+}

WebContent/resources/fuscabr/conf/modules/calendar.json

@@ -0,0 +1,13 @@
+{
+    "flatpickrFile": "resources/fuscabr/lib/flatpickr/flatpickr.min.js",
+    "flatpickrCSSFile": "resources/fuscabr/lib/flatpickr/flatpickr.min.css",
+    "flatpickrLocaleFile": "resources/fuscabr/lib/flatpickr/l10ns/allLocales.min.js",
+    "detectBrowserLocale": true,
+
+    "rules": [{
+            "desc": "Calendar entries in Graphical Views",
+            "pages": [ "views.shtm", "view_edit.shtm" ],
+            "inputSelector": "#viewContent > div:not(.windowDiv) input[type='text'][id^='chartComparator']"
+        }
+    ]
+}

WebContent/resources/fuscabr/conf/modules/ceditor.json

@@ -0,0 +1,31 @@
+{
+    "baseFolder": "resources/fuscabr/lib/codemirror/",
+
+    "themesFolder": "resources/fuscabr/lib/codemirror/theme/",
+    "theme": "codemirror.css",
+
+    "modesFolder": "resources/fuscabr/lib/codemirror/mode/",
+    "addonsFolder": "resources/fuscabr/lib/codemirror/addon/",
+
+    "editorSize": {
+        "default": { "height": 150, "width": 250 },
+
+        "emport.shtm": { "height": 576, "width": 870 },
+        "sql.shtm": { "height": 128, "width": 593 },
+        "point_links.shtm": { "height": 156, "width": 383 },
+        "compound_events.shtm": {"height": 156, "width": 453 },
+        "scripting.shtm": { "height": 250, "width": 383},
+        "view_edit.shtm": { "height": 200, "width": 385},
+
+        "meta_ds": { "height": 156, "width": 383 },
+        "httpimage_ds": { "height": 156, "width": 292},
+        "sql_ds_1": { "height": 156, "width": 348},
+        "sql_ds_2": { "height": 156, "width": 278}
+    },
+
+    "editorBorderColor": "#BFBFBF",
+
+	"editorFontSize": "11px",
+
+    "watchdogInterval": 50
+}

WebContent/resources/fuscabr/conf/modules/chart.json

@@ -0,0 +1,19 @@
+{
+    "chartJsFile": "resources/fuscabr/lib/Chart.bundle.min.js",
+    "fallbackBackgroundColor": "#2583E8B8",
+    "fallbackBorderColor": "#2583E8B8",
+    "enableDatapointWarnings": true,
+    "refreshTime": 250,
+
+    "timeOptions": {
+        "tooltipFormat": "DD/MM/YYYY - HH:mm:ss",
+        "displayFormats": {
+            "second": "HH:mm:ss",
+            "minute": "HH:mm",
+            "hour": "HH:mm",
+            "day": "DD/MM",
+            "month": "MM/YYYY",
+            "year": "YYYY"
+        }
+    }
+}