From ad6e349d1f87feec42e8d69e21fc0308eb9a5f5a Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Fri, 17 Jul 2020 15:41:09 +0200
Subject: [PATCH] fix problemi di rendering

---
 .../components/arch-interface/gauge.ts        | 12 ++++----
 .../components/paddle/paddle.vue              |  4 +--
 .../components/gantt/gantt-component.ts       |  8 ++++--
 .../components/gantt/gantt-component.vue      | 14 ++++++----
 .../processo/components/gantt/gantt-row.ts    |  4 ++-
 .../src/app_modules_thermo/save/save.ts       |  7 +++++
 .../src/app_modules_thermo/save/save.vue      | 28 +++++++++++++++++++
 .../wwwroot/src/filters/localizeFilter.ts     |  6 ++--
 .../wwwroot/src/modules/app-header.vue        |  3 ++
 .../wwwroot/src/store/localization.store.ts   |  2 +-
 10 files changed, 69 insertions(+), 19 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/save/save.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/save/save.vue

diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/gauge.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/gauge.ts
index 7f98fe4e..83339a00 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/gauge.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/gauge.ts
@@ -35,12 +35,14 @@ export default class gauge extends Vue {
 
     var largeArcFlag = endAngle - startAngle <= 180 ? "0" : "1";
 
-    var d = [
-      "M", start.x, start.y,
-      "A", radius, radius, 0, largeArcFlag, 0, end.x, end.y
-    ].join(" ");
+    var d = [];
+    if (Number.isFinite(start.x) && Number.isFinite(end.y))
+      d = [
+        "M", start.x, start.y,
+        "A", radius, radius, 0, largeArcFlag, 0, end.x, end.y
+      ];
 
-    return d;
+    return d.join(" ");
   }
 
   get actualValue() {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue
index 93739101..67dbd69c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.vue
@@ -14,7 +14,7 @@
 			<article class="scrollable">
 				<template v-for="(b,idx) in Favourites">
 					<soft-key
-						v-if="getSoftKeyStatus(b.id).visible"
+						v-if="getSoftKeyStatus(b.id) && getSoftKeyStatus(b.id).visible"
 						:key="`f_${idx}`"
 						:title="'softkey_' + b.id | localize('softkey_' + b.id)"
 						:type="b.type"
@@ -54,7 +54,7 @@
 			<article class="scrollable">
 				<template v-for="(b,idx) in allSoftKeys">
 					<soft-key
-						v-if="getSoftKeyStatus(b.id).visible"
+						v-if="getSoftKeyStatus(b.id) && getSoftKeyStatus(b.id).visible"
 						:key="idx"
 						:title="'softkey_' + b.id | localize('softkey_' + b.id)"
 						:type="b.type"
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts
index e9255c9b..30d245a7 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts
@@ -54,11 +54,15 @@ export default class GanttComponent extends Vue {
   }
 
   get actualDelay() {
-    return this.value.actualDelay * this.delayDuration / Math.max(this.value.estimatedDelay, this.value.actualDelay);
+    let result = this.value.actualDelay * this.delayDuration / Math.max(this.value.estimatedDelay, this.value.actualDelay);
+    if (Number.isFinite(result)) return result;
+    return 0;
   }
 
   get actualDuration() {
-    return this.value.actualDuration * this.duration / Math.max(this.value.estimatedDuration, this.value.actualDuration);
+    let result = this.value.actualDuration * this.duration / Math.max(this.value.estimatedDuration, this.value.actualDuration);
+    if (Number.isFinite(result)) return result;
+    return 0;
   }
 
   get statusDuration() {
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue
index e32579c2..fabfa642 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue
@@ -33,15 +33,19 @@
 				<foreignObject :width="duration * ganttOptions.secondSize" height="44" x="0" y="0">
 					<div class="body-header">{{value.label | localize(value.label)}}</div>
 				</foreignObject>
-				<foreignObject :width="duration * ganttOptions.secondSize" height="26" x="0" y="44">
+				<foreignObject
+					:width="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"
+					height="26"
+					x="0"
+					y="44"
+				>
 					<div class="body-footer">{{value.estimatedDuration | round(1)}}s</div>
 				</foreignObject>
 				<line
-					v-if="showStatus && recipeValue"
 					class="vertical-line"
-					:x1="duration * ganttOptions.secondSize"
-					:x2="duration * ganttOptions.secondSize"
-					:y1="44"
+					:x1="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"
+					:x2="(duration - (showStatus && recipeValue?statusDuration:0)) * ganttOptions.secondSize"
+					:y1="0"
 					:y2="70"
 				/>
 			</g>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts
index f20c3d1d..f8e0c708 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-row.ts
@@ -69,7 +69,9 @@ export default class GanttRow extends Vue {
   }
 
   get rowHeight() {
-    return Math.max(...this.blocksInSection.map(b => this.verticalPosition(b) + this.ganttOptions.elementHeight + this.ganttOptions.elementPadding * 2)) * this.zoomFactor;
+    let result = Math.max(...this.blocksInSection.map(b => this.verticalPosition(b) + this.ganttOptions.elementHeight + this.ganttOptions.elementPadding * 2)) * this.zoomFactor;
+    if (!Number.isNaN(result) && Number.isFinite(result)) return result;
+    return 0;
   }
 }
 
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/save/save.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/save/save.ts
new file mode 100644
index 00000000..0c299424
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/save/save.ts
@@ -0,0 +1,7 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+
+@Component({})
+export default class SaveAs extends Vue {
+
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/save/save.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/save/save.vue
new file mode 100644
index 00000000..7826f5d8
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/save/save.vue
@@ -0,0 +1,28 @@
+<template>
+	<div class="setup">
+		<modal type="save-as" :title="'save-as' | localize('Salva con nome')">
+			<div slot="header-buttons">
+				<button class="modal-close" @click="close()">
+					<i class="fa fa-remove"></i>
+				</button>
+			</div>
+			<section>
+				<article>
+					<div class="input-area mb-10">
+						<label>{{'recipe_name' | localize('Nome della ricetta')}}</label>
+						<input
+							class="custom"
+							v-model="searchText"
+							:placeholder="'recipe_name' | localize('Nome della ricetta')"
+						/>
+					</div>
+				</article>
+			</section>
+			<footer>
+				<button class="btn" @click="annulla()">{{'cancel' | localize("Annulla")}}</button>
+				<button class="btn btn-success" @click="save()">{{'confirm' | localize("Conferma")}}</button>
+			</footer>
+		</modal>
+	</div>
+</template>
+<script src="./save.ts" lang="ts"></script>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/filters/localizeFilter.ts b/Thermo.Active/wwwroot/src/filters/localizeFilter.ts
index 2b6e5fa5..867168f7 100644
--- a/Thermo.Active/wwwroot/src/filters/localizeFilter.ts
+++ b/Thermo.Active/wwwroot/src/filters/localizeFilter.ts
@@ -9,9 +9,9 @@ Vue.filter("localize", function (key: string, defaultValue: string, ...args): st
   let isSiemens = (store.state as AppModel).machineInfo.isSiemens;
   let isRadius = (store.state as AppModel).tooling.radiusMetricType;
 
-  if(!isRadius)
-    key = key.replace("radius", "diameter").replace("Radius", "Diameter");
-  
+  if (!isRadius)
+    key = key.replace("radius", "diameter").replace("Radius", "Diameter").toLowerCase();
+
   let value = labels[isSiemens == true ? "siemens_" + key : key];
   let dvalue = ""
   if (!value)
diff --git a/Thermo.Active/wwwroot/src/modules/app-header.vue b/Thermo.Active/wwwroot/src/modules/app-header.vue
index 472371ab..c49262a7 100644
--- a/Thermo.Active/wwwroot/src/modules/app-header.vue
+++ b/Thermo.Active/wwwroot/src/modules/app-header.vue
@@ -154,6 +154,9 @@
 			<button v-if="p.visible && !mainStatus" class="save-circle"></button>
 			<button v-if="p.visible && !mainStatus" class="dot-circle"></button>
 		</div>
+		<button class="over blue" :title="'recipe_save' | localize('save')">
+			<i class="fa fa-save"></i>
+		</button>
 		<archinterface></archinterface>
 		<user-info></user-info>
 	</header>
diff --git a/Thermo.Active/wwwroot/src/store/localization.store.ts b/Thermo.Active/wwwroot/src/store/localization.store.ts
index edd924ac..c72382f2 100644
--- a/Thermo.Active/wwwroot/src/store/localization.store.ts
+++ b/Thermo.Active/wwwroot/src/store/localization.store.ts
@@ -41,7 +41,7 @@ export const localizationStore = {
       // cambio solo le lables presenti,
       // lascio le vecchie labels se non aggiornate dalla nuova lingua.
       for (const key in labels) {
-        store.labels[key] = labels[key];
+        store.labels[key.toLowerCase()] = labels[key];
       }
 
       VuexPersistance.Persist(store, "localizationStore");