From 9de2db13983b7f855bbcb535eaaeafc40466501b Mon Sep 17 00:00:00 2001 From: Alessandro Francia Date: Mon, 25 Jun 2018 15:58:44 +0200 Subject: [PATCH] fix title ribbon maintenance --- Step/wwwroot/src/@types/signalr.alarms.d.ts | 2 +- Step/wwwroot/src/modules/alarms-list.ts | 1 - Step/wwwroot/src/services/hub.ts | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Step/wwwroot/src/@types/signalr.alarms.d.ts b/Step/wwwroot/src/@types/signalr.alarms.d.ts index 67cc1887..feba810a 100644 --- a/Step/wwwroot/src/@types/signalr.alarms.d.ts +++ b/Step/wwwroot/src/@types/signalr.alarms.d.ts @@ -11,7 +11,7 @@ declare module signalr_alarms { dateTime: Date, DateTime: Date, isWarning: boolean, - restorationIsEnabled: boolean, + restorationIsEnabled: boolean } interface maintenanceAlarm extends genericAlarm{ diff --git a/Step/wwwroot/src/modules/alarms-list.ts b/Step/wwwroot/src/modules/alarms-list.ts index 6dba47b8..e54334b5 100644 --- a/Step/wwwroot/src/modules/alarms-list.ts +++ b/Step/wwwroot/src/modules/alarms-list.ts @@ -38,7 +38,6 @@ export default class alarmsList extends Vue { public get serviceRequests(): Array { - debugger let model = (this.$store.state as AppModel); return model.alarms.serviceAlarms.sort((a, b) => { return moment(a.date).diff(moment(b.date)); diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts index 5a47e2be..7ec2e8b4 100644 --- a/Step/wwwroot/src/services/hub.ts +++ b/Step/wwwroot/src/services/hub.ts @@ -162,15 +162,16 @@ export class Hub { } private static expiredMaintenances(status) { + debugger console.log(status); for (const key in status) { if (status.hasOwnProperty(key)) { const element = status[key]; if(element.createdByCms){ - alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate), title: null} as any) + alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate), message: null} as any) } else{ - alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate), title: element.title } as any) + alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate), message: element.title } as any) } }