feat: table with alarms #1310 #1072 #352

frangoteam · Oct 23, 2024 · ee592d1 · ee592d1
1 parent aeb5067
commit ee592d1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/client/dist/assets/i18n/en.json b/client/dist/assets/i18n/en.json
@@ -425,6 +425,8 @@
     "table.property-gridline": "Show grid",
     "table.property-type-data": "Data table",
     "table.property-type-history": "History table",
+    "table.property-type-alarms": "Alarms table",
+    "table.property-type-alarms-history": "Alarms History table",
     "table.property-grid-color": "Grid color",
     "table.property-cols": "Columns",
     "table.property-rows": "Rows",
@@ -463,6 +465,13 @@
     "table.rangetype-last1d": "Last day",
     "table.rangetype-last3d": "Last 3 days",
 
+    "table.alarms-title": "Table Alarms",
+    "table.alarms-history-title": "Table Alarms History",
+    "table.alarm-column": "Alarms Column",
+    "table.alarm-filter": "Alarms Filter",
+    "table.alarm-priority": "Priority",
+    "table.alarm-tags": "Tags",
+
     "editor.view-svg": "Canvas/SVG",
     "editor.view-cards": "Multi views container",
     "editor.views": "Views",
@@ -1117,6 +1126,7 @@
     "alarms.view-offtime": "OFF Date/Time",
     "alarms.view-acktime": "ACK Date/Time",
     "alarms.view-userack": "ACK User",
+    "alarms.view-ack": "ACK",
     "alarms.view-ack-all-alarms": "ACK All Alarms",
     "alarm.status-active": "Active",
     "alarm.status-passive": "Passive",

diff --git a/client/dist/index.html b/client/dist/index.html
@@ -45,6 +45,6 @@
             </div>
         </div>
     </app-root>
-<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.a82d16ab07fd5e87.js" type="module"></script>
+<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.9494b37aa8115d13.js" type="module"></script>
 
 </body></html>
diff --git a/client/dist/main.a82d16ab07fd5e87.js → client/dist/main.9494b37aa8115d13.js b/client/dist/main.a82d16ab07fd5e87.js → client/dist/main.9494b37aa8115d13.js
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa",
-  "version": "1.2.0-1956",
+  "version": "1.2.0-1960",
   "keywords": [],
   "author": "frangoteam <[email protected]>",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",

diff --git a/client/src/app/gauges/controls/html-table/table-property/table-property.component.ts b/client/src/app/gauges/controls/html-table/table-property/table-property.component.ts
@@ -94,11 +94,16 @@ export class TablePropertyComponent implements OnInit, OnDestroy {
 
             dialogRef.afterClosed().subscribe((result: TableAlarmsType) => {
                 if (result) {
+                    let columns = [];
                     result.columns.forEach(clnId => {
-                        if (!this.options.alarmsColumns.find(cln => cln.id === clnId)) {
-                            this.options.alarmsColumns.push(new TableColumn(clnId, TableCellType.label, this.translateService.instant('alarms.view-' + clnId)));
+                        const column = this.options.alarmsColumns.find(cln => cln.id === clnId);
+                        if (!column) {
+                            columns.push(new TableColumn(clnId, TableCellType.label, this.translateService.instant('alarms.view-' + clnId)));
+                        } else {
+                            columns.push(column);
                         }
                     });
+                    this.options.alarmsColumns = columns;
                     if (this.property.type === TableType.alarms)
                     {
                         this.options.alarmsColumns = this.options.alarmsColumns.sort((a, b) => AlarmColumns.indexOf(a.id) - AlarmColumns.indexOf(b.id));

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa-server",
-  "version": "1.2.0-1956",
+  "version": "1.2.0-1960",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
   "main": "main.js",
   "scripts": {