From 5197f08e1aebf4f8c2efcd408c9e7b9dba87d9db Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Tue, 26 Jun 2018 14:54:02 +0200
Subject: [PATCH] Fix UI Maintenances

---
 Step/wwwroot/assets/styles/base/modals.less            |  2 +-
 Step/wwwroot/assets/styles/style.css                   |  2 +-
 Step/wwwroot/src/components/maintenance.ts             |  1 -
 .../modules/base-components/cards/maintenance-card.vue | 10 ++++++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less
index 013d035c..7f3bb9cd 100644
--- a/Step/wwwroot/assets/styles/base/modals.less
+++ b/Step/wwwroot/assets/styles/base/modals.less
@@ -343,7 +343,7 @@ sans-serif;
                 content: '';
                 width: 18px;
                 height: 18px;
-                background: @color-perrywinkle;
+                background-image: linear-gradient(to bottom, #1756ad, #002680);
                 position: absolute;
                 top: 4px;
                 left: 4px;
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 5f47921e..595c631e 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -304,7 +304,7 @@
   content: '';
   width: 18px;
   height: 18px;
-  background: #8eb5e2;
+  background-image: linear-gradient(to bottom, #1756ad, #002680);
   position: absolute;
   top: 4px;
   left: 4px;
diff --git a/Step/wwwroot/src/components/maintenance.ts b/Step/wwwroot/src/components/maintenance.ts
index 833edaf3..5d072124 100644
--- a/Step/wwwroot/src/components/maintenance.ts
+++ b/Step/wwwroot/src/components/maintenance.ts
@@ -92,7 +92,6 @@ export default class Maintenance extends Vue {
                 var expirationDate = minutes + "m";
                 return expirationDate;
             }
-
         }
         else{
             let hour = moment.duration(missingDays).asHours();
diff --git a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
index cc8b1093..63d35428 100644
--- a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
@@ -11,7 +11,7 @@
         <div class="body">
             <div class="box scrollable">
                 <div class="title-box">{{selectedMaintenance.description}}</div>
-                <div class="subtitle" v-if="existMantainance()">Ultimo intervento effettuato {{this.getDaysFromLastExpiration(selectedMaintenance)}} gg fa</div>
+                <div class="subtitle" v-if="existMantainance()">{{this.getDaysFromLastExpiration(selectedMaintenance)}}</div>
                 <div class="subtitle" v-if="!existMantainance()">Nessuna manutenzione effettuata</div>
                 <div class="info">
                     <!-- <div class="estimated-time">
@@ -248,7 +248,13 @@ export default {
           if(m){
               var today = moment(new Date());
               var end = moment(m.lastPerformedDate);
-              return moment.duration(today.diff(end))._data.days;
+              var days = moment.duration(today.diff(end))._data.days;
+              if(days==0)
+                return "Ultimo intervento effettuato oggi";
+              else if(days<=7)
+                return "Ultimo intervento effettuato " + days + " giorni fa";
+              else
+                return "Ultimo intervento effettuato in data: " + moment(m.lastPerformedDate).format('DD-MM-YYYY');
           }
           return "";
       },