From 4e4d43dcf4e5a42a82654762d0a50730d9fab974 Mon Sep 17 00:00:00 2001
From: Alessandro <a.francia@teamdev.it>
Date: Wed, 6 Feb 2019 11:38:03 +0100
Subject: [PATCH] fix alarms

---
 Step/wwwroot/assets/styles/base/alarms.less            | 10 ++++++++--
 Step/wwwroot/assets/styles/style.css                   | 10 ++++++++--
 .../src/app_modules/alarms/components/alarm-history.ts |  6 +++++-
 .../app_modules/alarms/components/alarm-history.vue    |  6 +++---
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Step/wwwroot/assets/styles/base/alarms.less b/Step/wwwroot/assets/styles/base/alarms.less
index 2e6fa93e..38e22c4d 100644
--- a/Step/wwwroot/assets/styles/base/alarms.less
+++ b/Step/wwwroot/assets/styles/base/alarms.less
@@ -753,6 +753,9 @@
             .alarm-history-table{
                 width: 1241px;
                 max-height: 680px;
+                border-radius: 2px;
+                position: relative;
+                border: solid 1px @color-label-grey;
                 table{
                     table-layout: fixed;
                     width: 100%;
@@ -806,7 +809,7 @@
                 }
                 tbody{
                     display: block;
-                    height: 597px;
+                    height: 587px;
                     width: 1241px;
                     tr{
                         cursor: pointer;
@@ -826,7 +829,10 @@
                     display: table;
                 }
                 .pagination {
-                    display: inline-block;
+                    display: flex;
+                    justify-content: center;
+                    border-top: solid 2px @color-silver;
+                    padding: 5px 0;
                 }
 
                 .pagination button {
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index d4b57dc8..a427f4e9 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -4639,6 +4639,9 @@ footer .container button.big:before {
 .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table {
   width: 1241px;
   max-height: 680px;
+  border-radius: 2px;
+  position: relative;
+  border: solid 1px #979797;
 }
 .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table table {
   table-layout: fixed;
@@ -4703,7 +4706,7 @@ footer .container button.big:before {
 }
 .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody {
   display: block;
-  height: 597px;
+  height: 587px;
   width: 1241px;
 }
 .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody tr {
@@ -4723,7 +4726,10 @@ footer .container button.big:before {
   display: table;
 }
 .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table .pagination {
-  display: inline-block;
+  display: flex;
+  justify-content: center;
+  border-top: solid 2px #bbbcbc;
+  padding: 5px 0;
 }
 .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table .pagination button {
   padding: 0;
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 800deb46..228a9d2d 100644
--- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts
+++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts
@@ -59,7 +59,7 @@ export default class AlarmHistory extends Vue {
 
   users: Array<any> = [];
   data: AlarmModel[] = []
-  paginationData: { firstDate: any, pages: number } = null;
+  paginationData: { firstDate: any, pages: number } = {firstDate: new Date(), pages: 0};;
   selectedAlarm: AlarmModel = null;
   selectedAttach: any = null;
   selectedNote: any = null;
@@ -298,4 +298,8 @@ export default class AlarmHistory extends Vue {
     debugger
     this.selectedPage = Math.min(Math.max(page, 1), this.paginationData.pages);
   }
+
+  public clearDate(){
+    this.filter.interval = [new Date(new Date().setDate(new Date().getDate() - 6)), new Date(new Date().setDate(new Date().getDate() + 1))];
+  }
 }
diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue
index e0748117..b4324bc4 100644
--- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue
+++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue
@@ -52,7 +52,7 @@
                 </div>
             <div class="filter-date-range">
               <label>{{'alarm_history_body_date_range' | localize("Intervallo date")}}</label>
-              <date-picker v-model="filter.interval" range type="daterange" :lang="lang"></date-picker>
+              <date-picker v-on:clear="clearDate()" v-model="filter.interval" range type="daterange" :lang="lang"></date-picker>
             </div>
             <!--<div class="filter-user">
               <label>{{'alarm_history_body_user' | localize("Utente")}}</label>
@@ -100,7 +100,6 @@
                   <th>{{'alarms_history.ID' | localize("ID")}}</th>
                   <th>{{'alarms_history.Sorgente' | localize("Sorgente") }}</th>
                   <th>{{'alarms_history.Titolo' | localize("Titolo Allarme") }}</th>
-                  <th>{{'alarms_history.Descrizione'| localize("Descrizione")}}</th>
                   <th>{{'alarms_history.Data'| localize("Data")}}</th>
                   <th>{{'alarms_history.Utente'| localize("Utente")}}</th>
                 </tr>
@@ -111,7 +110,6 @@
                   <td colspan="1">{{filter.sources[row.source]}}</td>
                   <td colspan="1" v-if="row.source == 0 ">{{row.title}}</td>
                   <td colspan="1" v-if="row.source == 1 ">{{'alarm_'+ row.alarmId | localize('alarm_'+ row.alarmId)}}</td>
-                  <td colspan="1">{{row.description}}</td>
                   <td colspan="1">{{row.timeStamp | date('DD-MM-YYYY HH:mm:ss')}}</td>
                   <td colspan="1">
                     <span v-for="(iduser, index) in row.users" :key="iduser">
@@ -120,8 +118,10 @@
                     </span>
                   </td>
                 </tr>
+ 
               </tbody>
             </table>
+
             <div class="pagination" v-if="paginationData && paginationData.pages">
               <button  @click="selectPage(selectedPage-1)"><i class="fa fa-angle-double-left"></i></button>
               <button class="page" :class="{active: selectedPage == paginator.min + p}"