Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

This commit is contained in:
Paolo Possanzini
2018-02-22 16:48:28 +01:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -88,7 +88,7 @@ namespace Step.Utils
public const string BROADCAST_DATA = "BROADCAST_DATA";
// ID prefix
public const string MAINTENANCE_PREFIX_ID = "MAINT_";
public const string MAINTENANCE_PREFIX_ID = "maintenance_";
// Maintenances types
public const string MAINT_MACHINE_INTERVAL_TYPE = "machine_interval";
+1 -1
View File
@@ -80,7 +80,7 @@ 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 : "maintenance_" + element.Id, id: element.Id, dateTime: new Date(element.ExpirationDate) } as any)
}
}
alarmsModelActions.checkRemoveServiceAlarm(store, status.map(i => i.guid));