alarms

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

@@ -19,37 +19,37 @@ declare module signalr_alarms {
   }
 
   interface alarmMessage {
-    NcAlarms: Array<genericAlarm>,
-    PlcAlarms: Array<genericAlarm>,
-    ProcessAlarms: Array<processAlarm>,
+    ncAlarms: Array<genericAlarm>,
+    plcAlarms: Array<genericAlarm>,
+    processAlarms: Array<processAlarm>,
   }
 
   interface powerItemValue {
-    Id: number,
-    Active: boolean,
-    Clickable: boolean
+    id: number,
+    active: boolean,
+    clickable: boolean
   }
 
   interface prePowerOnMessage {
-    AirPressure: powerItemValue;
-    EmergencyButtons: powerItemValue;
-    PowerOn: powerItemValue;
-    ProtectionStatus: powerItemValue;
-    SettingMode: powerItemValue;
-    StartingKey: powerItemValue;
+    airPressure: powerItemValue;
+    emergencyButtons: powerItemValue;
+    powerOn: powerItemValue;
+    protectionStatus: powerItemValue;
+    settingMode: powerItemValue;
+    startingKey: powerItemValue;
   }
 
   interface postPowerOnMessage {
-    AxisReset: powerItemValue;
-    WaterjetPump: powerItemValue;
+    axisReset: powerItemValue;
+    waterjetPump: powerItemValue;
   }
 
   interface powerMessage {
-    AxisReset: {
-      IsActive: boolean,
-      Percentage: number
+    axisReset: {
+      isActive: boolean,
+      percentage: number
     }
-    PostPowerOn: postPowerOnMessage;
-    PrePowerOn: prePowerOnMessage;
+    postPowerOn: postPowerOnMessage;
+    prePowerOn: prePowerOnMessage;
   }
 }

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

@@ -1,10 +1,10 @@
 declare module signalr_security{
 
   interface securityFunction{
-    Id: number,
-    Name: string,
-    Area: string,
-    Enabled: boolean
+    id: number,
+    name: string,
+    area: string,
+    enabled: boolean
   }
 
 }

Step/wwwroot/src/services/hub.ts

@@ -19,7 +19,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 || element.Id).toString();
+      element.guid = prefix + "__" + (element.id).toString();
       element.source = prefix.toUpperCase();
     }
   }
@@ -152,10 +152,10 @@ export class Hub {
     for (const key in status) {
       if (status.hasOwnProperty(key)) {
         const element = status[key];
-        alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.Id, id: element.Id, dateTime: new Date(element.ExpirationDate) } as any)
+        alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate) } as any)
       }
     }
-    alarmsModelActions.checkRemoveServiceAlarm(store, status.map(i => "maint_" + i.Id));
+    alarmsModelActions.checkRemoveServiceAlarm(store, status.map(i => "maint_" + i.id));
   }
 
   private static manageProcesses(status: signalr_process.DTOProcessDataModel) {
@@ -227,11 +227,11 @@ export class Hub {
 
   private manageAlarmsCallbacks(alarms: signalr_alarms.alarmMessage) {
 
-    recalcArrayId("cn", alarms.NcAlarms);
-    recalcArrayId("plc", alarms.PlcAlarms);
-    recalcArrayId("cn", alarms.ProcessAlarms);
+    recalcArrayId("cn", alarms.ncAlarms);
+    recalcArrayId("plc", alarms.plcAlarms);
+    recalcArrayId("cn", alarms.processAlarms);
 
-    let tempList = alarms.NcAlarms.concat(alarms.PlcAlarms).concat(alarms.ProcessAlarms);
+    let tempList = alarms.ncAlarms.concat(alarms.plcAlarms).concat(alarms.processAlarms);
 
     for (const key in tempList) {
       if (tempList.hasOwnProperty(key)) {
@@ -251,19 +251,19 @@ export class Hub {
 
 
 
-    machineStatusActions.setResetAxes(store, { reset: power.AxisReset.IsActive, progress: power.AxisReset.Percentage });
+    machineStatusActions.setResetAxes(store, { reset: power.axisReset.isActive, progress: power.axisReset.percentage });
 
     // Pre-power on
-    machineStatusActions.setAirPressureAlarm(store, power.PrePowerOn.AirPressure);
-    machineStatusActions.setPowerAlarm(store, power.PrePowerOn.PowerOn);
-    machineStatusActions.setEmergencyAlarm(store, power.PrePowerOn.EmergencyButtons);
-    machineStatusActions.setProtectionsAlarm(store, power.PrePowerOn.ProtectionStatus);
-    machineStatusActions.setSettingsModeAlarm(store, power.PrePowerOn.SettingMode);
-    machineStatusActions.setKeyReadyAlarm(store, power.PrePowerOn.StartingKey);
+    machineStatusActions.setAirPressureAlarm(store, power.prePowerOn.airPressure);
+    machineStatusActions.setPowerAlarm(store, power.prePowerOn.powerOn);
+    machineStatusActions.setEmergencyAlarm(store, power.prePowerOn.emergencyButtons);
+    machineStatusActions.setProtectionsAlarm(store, power.prePowerOn.protectionStatus);
+    machineStatusActions.setSettingsModeAlarm(store, power.prePowerOn.settingMode);
+    machineStatusActions.setKeyReadyAlarm(store, power.prePowerOn.startingKey);
 
     // Post-power on
-    machineStatusActions.setResetAxesAlarm(store, power.PostPowerOn.AxisReset);
-    machineStatusActions.setWaterJet1Alarm(store, power.PostPowerOn.WaterjetPump);
+    machineStatusActions.setResetAxesAlarm(store, power.postPowerOn.axisReset);
+    machineStatusActions.setWaterJet1Alarm(store, power.postPowerOn.waterjetPump);
   }
 
   _axesVisible: boolean = false;

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 || alarm.DateTime),
+          date: (alarm.dateTime ),
           source: alarm.source,
-          id: (alarm.id || alarm.Id).toString(),
+          id: (alarm.id ).toString(),
           uid: alarm.guid,
           description: null,
-          title: alarm.message || alarm.Message,
+          title: 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 || alarm.DateTime),
+          date:(alarm.dateTime),
           source: alarm.source,
-          id: (alarm.id || alarm.Id).toString(),
+          id: (alarm.id ).toString(),
           uid: alarm.guid,
           description: null,
-          title: alarm.message || alarm.Message,
+          title: 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 || alarm.DateTime),
-          id: (alarm.id || alarm.Id || "").toString(),
+          date: (alarm.dateTime ),
+          id: (alarm.id || "").toString(),
           uid: alarm.guid,
           description: null,
-          title: alarm.message || alarm.Message,
+          title: alarm.message ,
           status: "active",
           type: "service"
         } as AlarmModel);

Step/wwwroot/src/store/machineStatus.store.ts

@@ -53,9 +53,9 @@ export interface MachineStatusModel {
 }
 
 export interface buttonStatus {
-  Active: boolean,
-  Clickable: boolean,
-  Id: number
+  active: boolean,
+  clickable: boolean,
+  id: number
 }
 
 export interface MachineStatusActions {
@@ -82,16 +82,16 @@ export interface MachineStatusActions {
 export const machineStatusStore = {
   state: {
 
-    powerOnAlarm: { Active: false, Clickable: false, Id: null },
-    airPressureAlarm: { Active: false, Clickable: false, Id: null },
-    protectionsAlarm: { Active: false, Clickable: false, Id: null },
-    emergencyAlarm: { Active: false, Clickable: false, Id: null },
-    settingsModeAlarm: { Active: false, Clickable: false, Id: null },
-    keyReadyAlarm: { Active: false, Clickable: false, Id: null },
+    powerOnAlarm: { active: false, clickable: false, id: null },
+    airPressureAlarm: { active: false, clickable: false, id: null },
+    protectionsAlarm: { active: false, clickable: false, id: null },
+    emergencyAlarm: { active: false, clickable: false, id: null },
+    settingsModeAlarm: { active: false, clickable: false, id: null },
+    keyReadyAlarm: { active: false, clickable: false, id: null },
 
-    resetAxesAlarm: { Active: false, Clickable: false, Id: null },
-    waterJet1Alarm: { Active: false, Clickable: false, Id: null },
-    waterJet2Alarm: { Active: false, Clickable: false, Id: null },
+    resetAxesAlarm: { active: false, clickable: false, id: null },
+    waterJet1Alarm: { active: false, clickable: false, id: null },
+    waterJet2Alarm: { active: false, clickable: false, id: null },
 
     ncReady: false,
 
@@ -112,17 +112,17 @@ export const machineStatusStore = {
   } as MachineStatusModel,
   getters: {
     mainStatus: state => {
-      return state.powerOnAlarm.Active ||
-        state.airPressureAlarm.Active ||
-        state.protectionsAlarm.Active ||
-        state.emergencyAlarm.Active ||
-        state.settingsModeAlarm.Active ||
-        state.keyReadyAlarm.Active;
+      return state.powerOnAlarm.active ||
+        state.airPressureAlarm.active ||
+        state.protectionsAlarm.active ||
+        state.emergencyAlarm.active ||
+        state.settingsModeAlarm.active ||
+        state.keyReadyAlarm.active;
     },
     powerOnAlarms: state => {
-      return state.resetAxesAlarm.Active ||
-        state.waterJet1Alarm.Active ||
-        state.waterJet2Alarm.Active;
+      return state.resetAxesAlarm.active ||
+        state.waterJet1Alarm.active ||
+        state.waterJet2Alarm.active;
     },
     securityFunction: state => id => {
       return state._functions.get[id];
@@ -148,8 +148,8 @@ export const machineStatusStore = {
   },
   mutations: {
     SetSecurityFunction(store, func: signalr_security.securityFunction) {
-      if (!store._functions.has(func.Id) || store._functions.get(func.Name).Enabled != func.Enabled) {
-        store._functions.set(func.Name, func);
+      if (!store._functions.has(func.id) || store._functions.get(func.name).Enabled != func.enabled) {
+        store._functions.set(func.name, func);
         store.functions = Array.from(store._functions.values());
         Factory.Get(MessageService).publishToChannel("force-ui-update");
       }