From ecf407030f2dd93320ae87caf691f8ec6eec3df2 Mon Sep 17 00:00:00 2001
From: Paolo Possanzini <paolo@teamdev.it>
Date: Tue, 29 Jan 2019 09:13:37 +0100
Subject: [PATCH] fix alarms query

---
 .../alarms/components/alarm-history.ts        |  9 ++++--
 Step/wwwroot/src/services/alarmsService.ts    | 29 ++-----------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts
index 929b3ff9..800deb46 100644
--- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts
+++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts
@@ -118,8 +118,11 @@ export default class AlarmHistory extends Vue {
       })
     })
 
-    this.data = await alarmsService.getAlarms(this.filter.title, arraySourceFilter, arrayUserFilter, from, to, this.selectedPage - 1, 9);
-    this.paginationData = await alarmsService.getAlarmsData();
+    // this.paginationData = await alarmsService.getAlarmsData();
+    let result = await alarmsService.getAlarms(this.filter.title, arraySourceFilter, arrayUserFilter, from, to, this.selectedPage - 1, 9);
+    this.data = result.alarms;
+    this.paginationData.pages = result.pages;
+
   }
 
   async mounted() {
@@ -293,6 +296,6 @@ export default class AlarmHistory extends Vue {
   }
   public selectPage(page) {
     debugger
-    this.selectedPage = Math.min(Math.max(page,1), this.paginationData.pages);
+    this.selectedPage = Math.min(Math.max(page, 1), this.paginationData.pages);
   }
 }
diff --git a/Step/wwwroot/src/services/alarmsService.ts b/Step/wwwroot/src/services/alarmsService.ts
index ed954410..97fa6e3a 100644
--- a/Step/wwwroot/src/services/alarmsService.ts
+++ b/Step/wwwroot/src/services/alarmsService.ts
@@ -11,16 +11,9 @@ export class AlarmsService extends baseRestService {
     return (await this.Post(this.BASE_URL + `data?pagesize=${pagesize}`, null, true)) as any;
   }
 
-  async getAlarms(title: string, sources: Array<number>, users?: Array<number>, fromDate?: Date, toDate?: Date, page: number = 0, pagesize: number = 100): Promise<AlarmModel[]> {
-    //let users = [];
-    //let sources = [];
-
-    //if (user) users.push(user);
-    // if (type) types.push(type);
-    //if(source != null || source != undefined){
-    //  sources.push(source);
-    //}
-    let result = await this.Post<AlarmModel[]>(this.BASE_URL + "paginated",
+  async getAlarms(title: string, sources: Array<number>, users?: Array<number>, fromDate?: Date, toDate?: Date, page: number = 0, pagesize: number = 100):
+    Promise<{pages:number, alarms:AlarmModel[]}> {
+    let result = await this.Post<{pages:number, alarms:AlarmModel[]}>(this.BASE_URL + "paginated",
       {
         "page": page,
         "pageSize": pagesize,
@@ -31,22 +24,6 @@ export class AlarmsService extends baseRestService {
         "userIds": users,
         language: "en"
       }
-      // {
-      //   "page": 0,
-      //   "pageSize": 100,
-      //   "title": "",
-      //   "type": [
-      //     0,
-      //     1
-      //   ],
-      //   "startDate": "2019-01-03T23:00:00.000Z",
-      //   "endDate": "2019-01-14T10:01:01.686Z",
-      //   "userIds": [
-      //     1,
-      //     -1
-      //   ],
-      //   "language": "en"
-      // }
       , true);
     return result;
   }