Added device field

JeffersonLab · Aug 7, 2023 · 44e9637 · 44e9637
1 parent d7f1dc6
commit 44e9637
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 description 'Jefferson Lab Alarm Warning System (JAWS) web admin interface'
 group 'org.jlab'
-version '4.2.0'
+version '4.3.0'
 
 // IndexDB Client-side cache data version
 ext.cacheVersion = '1'

diff --git a/src/main/java/org/jlab/jaws/json/AlarmInstanceMixin.java b/src/main/java/org/jlab/jaws/json/AlarmInstanceMixin.java
@@ -14,6 +14,9 @@ interface AlarmInstanceMixin {
     @JsonProperty
     Object getSource();
 
+    @JsonProperty
+    String getDevice();
+
     @JsonProperty
     List<String> getLocation();
 

diff --git a/src/main/java/org/jlab/jaws/model/JAWSModel.java b/src/main/java/org/jlab/jaws/model/JAWSModel.java
@@ -56,12 +56,13 @@ public JAWSModel() {
         valueFields.add(new FieldDefinition("contact", FieldType.STRING));
         classModel.setValueFields(valueFields);
 
-        instanceModel.setTableColumns(Arrays.asList(new String[]{"name", "class", "location", "epicspv"}));
+        instanceModel.setTableColumns(Arrays.asList(new String[]{"name", "class", "device", "location", "epicspv"}));
         keyFields = new ArrayList<>();
         keyFields.add(new FieldDefinition("name", FieldType.STRING));
         instanceModel.setKeyFields(keyFields);
         valueFields = new ArrayList<>();
         valueFields.add(new FieldDefinition("class", FieldType.STRING));
+        valueFields.add(new FieldDefinition("device", FieldType.STRING));
         valueFields.add(new FieldDefinition("location", FieldType.MULTI_ENUM));
         valueFields.add(new FieldDefinition("epicspv", FieldType.STRING));
         valueFields.add(new FieldDefinition("maskedby", FieldType.STRING));
@@ -109,7 +110,7 @@ public JAWSModel() {
         valueFields.addAll(activationModel.getValueFields());
         notificationModel.setValueFields(valueFields);
 
-        registrationModel.setTableColumns(Arrays.asList(new String[]{"name", "category", "class", "location", "priority", "contact", "epicspv"}));
+        registrationModel.setTableColumns(Arrays.asList(new String[]{"name", "category", "class", "device", "location", "priority", "contact", "epicspv"}));
         keyFields = new ArrayList<>();
         keyFields.add(new FieldDefinition("name", FieldType.STRING));
         registrationModel.setKeyFields(keyFields);

diff --git a/src/main/webapp/resources/modules/jaws-admin-gui/entities.mjs b/src/main/webapp/resources/modules/jaws-admin-gui/entities.mjs
@@ -32,9 +32,10 @@ class AlarmClass {
 }
 
 class AlarmInstance {
-    constructor(name, alarmclass, location, maskedby, screencommand, epicspv) {
+    constructor(name, alarmclass, device, location, maskedby, screencommand, epicspv) {
         this.name = name;
         this.class = alarmclass;
+        this.device = device;
         this.location = location;
         this.maskedby = maskedby;
         this.screencommand = screencommand;
@@ -62,7 +63,7 @@ class AlarmOverride {
 
 class EffectiveAlarm {
     constructor(name, priority, category, rationale, action, contact, filterable, latchable,
-                ondelay, offdelay, alarmclass, location, maskedby, screencommand, epicspv, state) {
+                ondelay, offdelay, alarmclass, device, location, maskedby, screencommand, epicspv, state) {
         this.name = name;
 
         this.priority = priority;
@@ -76,6 +77,7 @@ class EffectiveAlarm {
         this.offdelay = offdelay;
 
         this.class = alarmclass;
+        this.device = device;
         this.location = location;
         this.maskedby = maskedby;
         this.screencommand = screencommand;
@@ -108,10 +110,11 @@ class EffectiveNotification {
 }
 
 class EffectiveRegistration {
-    constructor(name, alarmclass, priority, location, category, rationale, action, contact,
+    constructor(name, alarmclass, device, priority, location, category, rationale, action, contact,
                 filterable, latchable, ondelay, offdelay, maskedby, screencommand, epicspv) {
         this.name = name;
         this.class = alarmclass;
+        this.device = device;
         this.priority = priority;
         this.location = location;
         this.category = category;

diff --git a/src/main/webapp/worker.mjs b/src/main/webapp/worker.mjs
@@ -101,6 +101,7 @@ let toAlarm = function(key, value) {
         value.registration.ondelay,
         value.registration.offdelay,
         value.registration.class,
+        value.registration.device,
         value.registration.location,
         value.registration.maskedby,
         value.registration.screencommand,
@@ -156,6 +157,7 @@ let toInstance = function(key, value) {
     return new AlarmInstance(
         key,
         value.alarmclass,
+        value.device,
         value.location,
         value.maskedby,
         value.screencommand,
@@ -210,6 +212,7 @@ let toRegistration = function(key, value) {
     return new EffectiveRegistration(
         key,
         value.alarmclass,
+        value.device,
         value.priority,
         value.location,
         value.category,