From d99fda458b91bba7abfdf2c177bdab9aad256323 Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Mon, 16 Dec 2019 14:55:59 +0100
Subject: [PATCH] Fix maintenance Machine

---
 .../app_modules/maintenance/components/maintenance-card.ts | 7 ++++++-
 .../maintenance/components/maintenance-card.vue            | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts
index 12eb6895..d2f03e19 100644
--- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts
+++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts
@@ -135,7 +135,12 @@ export default class MaintenanceCard extends Vue {
     return moment(date).format('LT');
   }
   convertToIntervalTime(value,umeas) {
-    return value + umeas.toLowerCase();
+    umeas = umeas.toLowerCase();
+    if(umeas=="m")
+      umeas = "M"
+    else if(umeas=="mm")
+      umeas = "m"
+    return value + umeas;
   }
   expandInfo(){
     this.infoExpanded = !this.infoExpanded;
diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.vue b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.vue
index c6000d1e..5c76c2bf 100644
--- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.vue
+++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.vue
@@ -60,7 +60,7 @@
                             <div class="title" v-if="selectedMaintenance.state">
                                 {{'maintenance_status' | localize("Status")}}
                             </div>         
-                            <div class="time" :class="{'red':this.setRedColor(selectedMaintenance.percentageOfCompletion),'yellow':this.setYellowColor(selectedMaintenance.percentageOfCompletion)}" >
+                            <div class="time" v-if="selectedMaintenance.state" :class="{'red':this.setRedColor(selectedMaintenance.percentageOfCompletion),'yellow':this.setYellowColor(selectedMaintenance.percentageOfCompletion)}" >
                                 {{'maintenance_state_'+selectedMaintenance.state | localize("Stato")}}
                             </div>
                         </div>