alarmfix

Step.Config/Config/AlarmsConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <alarm>
-    <alarmId>1</alarmId>
+    <alarmId>0</alarmId>
     <plcId>1</plcId>
     <restoreIsActive>false</restoreIsActive>
   </alarm>

Step/wwwroot/assets/styles/base/plc-softkeys.less

@@ -134,9 +134,9 @@
                     display: flex;
                     background: transparent;
                     color: #fff;
-                    // flex-grow: 1;
-                    width: 48px;
-                    height: 24px;
+                    flex-grow: 1;
+                    min-width: 48px;
+                    min-height: 24px;
                     margin-top: -1px;
                     margin-left: -1px;
                     box-sizing: border-box;

Step/wwwroot/assets/styles/style.css

@@ -1547,8 +1547,9 @@ footer .container button.big:before {
   display: flex;
   background: transparent;
   color: #fff;
-  width: 48px;
-  height: 24px;
+  flex-grow: 1;
+  min-width: 48px;
+  min-height: 24px;
   margin-top: -1px;
   margin-left: -1px;
   box-sizing: border-box;

Step/wwwroot/src/@types/signalr.alarms.d.ts

@@ -3,11 +3,14 @@ import { processModelActions } from "src/store";
 declare module signalr_alarms {
 
   interface genericAlarm {
-    id: number,
+    id?: number,
+    Id?: number,
     guid?: string,
     source?: string,
-    message: string,
+    message?: string,
+    Message?: string,
     dateTime: Date,
+    DateTime: Date,
     isWarning: boolean
   }
 

Step/wwwroot/src/components/test-status.ts

@@ -18,12 +18,7 @@ export default class TestStatus extends Vue {
   removeProcess() {
     processModelActions.removeAllProcess(this.$store);
   }
-  addAlarm() {
-    alarmsModelActions.addAlarm(this.$store, { message: "Lorem Ipsum dolor sit amen ... ", dateTime: new Date(), id: new Date().getTime(), isWarning: false });
-  }
-  addWarning() {
-    alarmsModelActions.addWarning(this.$store, { message: "Lorem Ipsum dolor sit amen ... ", dateTime: new Date(),  id: new Date().getTime(), isWarning: true });
-  }
+
   removeAlarms() {
     alarmsModelActions.removeAllAlarms(this.$store);
   }

Step/wwwroot/src/services/hub.ts

@@ -18,7 +18,7 @@ function recalcArrayId(prefix: string, alarms: Array<signalr_alarms.genericAlarm
   for (const key in alarms) {
     if (alarms.hasOwnProperty(key)) {
       const element = alarms[key];
-      element.guid = prefix + "__" + element.id.toString();
+      element.guid = prefix + "__" + (element.id || element.Id).toString();
       element.source = prefix.toUpperCase();
     }
   }

Step/wwwroot/src/store/alarms.store.ts

@@ -55,12 +55,12 @@ export const alarmsStore = {
 
       if (!store._alarms.has(alarm.guid)) {
         store._alarms.set(alarm.guid, {
-          date: alarm.dateTime,
+          date: (alarm.dateTime || alarm.DateTime),
           source: alarm.source,
-          id: alarm.id.toString(),
+          id: (alarm.id || alarm.Id).toString(),
           uid: alarm.guid,
           description: null,
-          title: alarm.message,
+          title: alarm.message || alarm.Message,
           process: (alarm as any).process,
           status: "active",
           type: "alarm"
@@ -73,12 +73,12 @@ export const alarmsStore = {
     AddWarning(store, alarm: signalr_alarms.genericAlarm) {
       if (!store._warnings.has(alarm.guid)) {
         store._warnings.set(alarm.guid, {
-          date: alarm.dateTime,
+          date:(alarm.dateTime || alarm.DateTime),
           source: alarm.source,
-          id: alarm.id.toString(),
+          id: (alarm.id || alarm.Id).toString(),
           uid: alarm.guid,
           description: null,
-          title: alarm.message,
+          title: alarm.message || alarm.Message,
           process: (alarm as any).process,
           status: "active",
           type: "warning"
@@ -117,11 +117,11 @@ export const alarmsStore = {
     AddServiceAlarm(store, alarm: signalr_alarms.genericAlarm) {
       if (!store._serviceAlarms.has(alarm.guid)) {
         store._serviceAlarms.set(alarm.guid, {
-          date: alarm.dateTime,
-          id: (alarm.id || "").toString(),
+          date: (alarm.dateTime || alarm.DateTime),
+          id: (alarm.id || alarm.Id || "").toString(),
           uid: alarm.guid,
           description: null,
-          title: alarm.message,
+          title: alarm.message || alarm.Message,
           status: "active",
           type: "service"
         } as AlarmModel);
@@ -132,7 +132,7 @@ export const alarmsStore = {
       if (store._serviceAlarms.has(alarm.guid))
         store._serviceAlarms.delete(alarm.guid);
 
-      store.serviceAlarms = Array.from(store._serviceAlarms.values());      
+      store.serviceAlarms = Array.from(store._serviceAlarms.values());
       if (Object.keys(store.serviceAlarms).length <= 0)
         store.serviceOpened = false;
     },