From c2cd9adef80e365c75f129bec62829222e6d8ec7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 13 Oct 2020 18:10:57 +0200
Subject: [PATCH] Fix Dashboards UI

---
 Thermo.Active/wwwroot/src/@types/prod.cs.d.ts              | 2 +-
 .../app_modules_thermo/dashboard/base-components/gauge.ts  | 2 +-
 .../app_modules_thermo/dashboard/base-components/gauge.vue | 6 +++---
 .../app_modules_thermo/dashboard/base-components/item.ts   | 7 +++++++
 .../app_modules_thermo/dashboard/base-components/item.vue  | 3 ++-
 .../wwwroot/src/app_modules_thermo/dashboard/dashboard.ts  | 5 ++---
 .../wwwroot/src/app_modules_thermo/dashboard/dashboard.vue | 2 +-
 .../src/app_modules_thermo/processo/components/processo.ts | 4 ++--
 .../setup/avvio-produzione/avvio-produzione.ts             | 2 +-
 Thermo.Active/wwwroot/src/store/prod.store.ts              | 1 +
 10 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts
index f9a7b79b..a89fae0f 100644
--- a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts
+++ b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts
@@ -3,7 +3,6 @@ declare module Prod {
   interface IProd {
     numTarget: number;
     numDone: number;
-    numPreHot: number;
     timeWarm: number;
     timeVent: number;
     timeVacuum: number;
@@ -20,6 +19,7 @@ declare module Prod {
   interface IProdPanel {
     numTarget: number;
     numDone: number;
+    numPreHot: number;
     inizioProd: string;
     stimaDurata: number;
     tempAct: number;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts
index 8999b1f4..7d6b66b8 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.ts
@@ -48,7 +48,7 @@ export default class MainGauge extends Vue {
     };
   }
 
-  get prod() { return store.state.prod.prod }
+  get prod() { return store.state.prod.panel }
 
 
   polarToCartesian(centerX, centerY, radius, angleInDegrees) {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue
index acc397ae..cc8d7f34 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/gauge.vue
@@ -5,7 +5,7 @@
 			<svg viewBox="8,8,84,84" class="gauge">
 				<path
 					class="dial"
-					:class="{'ok': (prod.numPreHot ==0), 'pre': (prod.numPreHot != 0) }"
+					:class="{'ok': (!prod.numPreHot || prod.numPreHot ==0), 'pre': (prod.numPreHot && prod.numPreHot != 0) }"
 					fill="none"
 					stroke="#eee"
 					stroke-width="2"
@@ -31,11 +31,11 @@
 			</svg>
 		</div>
 		<div ref="gauge2" class="gauge2"></div>
-		<span class="done" v-if="prod.numPreHot == 0">
+		<span class="done" v-if="!prod.numPreHot || prod.numPreHot == 0">
 			{{prod.numDone}}
 			<small class="error" v-if="scrapedItems.length">-{{scrapedItems.length}}</small>
 		</span>
-		<span class="done" v-if="prod.numPreHot != 0">-{{prod.numPreHot}}</span>
+		<span class="done" v-if="prod.numPreHot && prod.numPreHot != 0">-{{prod.numPreHot}}</span>
 		<hr />
 		<span class="target">{{prod.numTarget}}</span>
 	</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts
index bf2df8ac..6e246259 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts
@@ -9,6 +9,13 @@ export default class Item extends Vue {
   @Prop()
   value: Prod.IProd;
 
+  @Prop()
+  panel: Prod.IProdPanel
+
+  get noDisplayNumber(){ 
+      return this.panel && this.value.numDone > this.panel.numTarget;
+  }
+
   showDetails: boolean = false;
 
   async setScrap(num: number) {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue
index be6ae58c..4f259388 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue
@@ -1,7 +1,8 @@
   <template>
 	<div class="history-item">
 		<div class="body" @click="showDetails = !showDetails">
-			<label :class="{red: value.isScrap}">{{value.numDone}}</label>
+			<label v-if="noDisplayNumber">--</label>
+			<label :class="{red: value.isScrap}" v-else>{{value.numDone}}</label>
 			<div class="col">
 				<small>{{'history-item_warmup' | localize("tempo riscaldo")}}</small>
 				<span>{{Math.floor(value.timeWarm / 60) | round(0)}}'{{value.timeWarm % 60 | round(0)}}''</span>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts
index 8f304237..7b5b6032 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts
@@ -48,15 +48,13 @@ export default class Dashboard extends Vue {
 
   @Watch("lastItem", { deep: true })
   async lastitemChanged(n: Prod.IProd, o) {
-    if (this.items.length && n.numDone - 1 != this.items[0].numDone) {
+    if ((this.items.length && n.numDone - 1 != this.items[0].numDone) || (!this.items.length && n.numDone > 1)) {
       let result = await prodService.History(n.numDone - 1, 1);
       if (result && result.length) {
         for (const i of result) {
           this.itemsMap.set(i.numDone, i);
         }
-
         this.items = Array.from(this.itemsMap.values()).sort((a, b) => b.numDone - a.numDone);
-
       }
     }
 
@@ -94,6 +92,7 @@ export default class Dashboard extends Vue {
   get softKeys(): { [id: number]: SoftKeysConfigurationModel[] } {
     return store.state.machineInfo.softKeys as { [id: number]: SoftKeysConfigurationModel[] };
   }
+  
 
   get allSoftKeys(): SoftKeysConfigurationModel[] {
     var result = [];
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue
index 914c7a76..4b3e3624 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue
@@ -182,7 +182,7 @@
 				></stats>
 			</div>
 			<div class="current-item">
-				<hitem :value="lastItem"></hitem>
+				<hitem :value="lastItem" :panel="panel"></hitem>
 			</div>
 			<div class="history-list scrollable">
 				<hitem :value="item" v-for="(item, idx) in items" :key="idx"></hitem>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
index ccde98b2..c67dfd2d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
@@ -18,11 +18,11 @@ import { Hub } from '@/services';
 export default class Processo extends Vue {
 
   get actual(): number {
-    return store.state.prod.prod.numDone;
+    return store.state.prod.panel.numDone;
   };
 
   get tot(): number {
-    return store.state.prod.prod.numTarget;
+    return store.state.prod.panel.numTarget;
   };
 
   get blocks(): server.Modblock[] {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.ts
index c453f7a2..ecbc8cc4 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.ts
@@ -45,11 +45,11 @@ export default class AvvioProduzione extends Vue {
 
   async showDashboard() {
 
-    await prodService.Start(this.pieces.setpointHMI, this.newjob, this.warmuppieces.setpointHMI);
     if (this.newjob) {
       messageService.publishToChannel('restart-cycle');
       prodActions.resetProd(store);
     }
+    await prodService.Start(this.pieces.setpointHMI, this.newjob, this.warmuppieces.setpointHMI);
 
 
     ModalHelper.HideModal();
diff --git a/Thermo.Active/wwwroot/src/store/prod.store.ts b/Thermo.Active/wwwroot/src/store/prod.store.ts
index a1b403eb..082d911d 100644
--- a/Thermo.Active/wwwroot/src/store/prod.store.ts
+++ b/Thermo.Active/wwwroot/src/store/prod.store.ts
@@ -55,6 +55,7 @@ export const prodStore = {
         tempSetpoint: 0,
         lastCadenza: 0,
         lastTCiclo: 0,
+        numPreHot: 0
       }
     },