From 772aa06eb935082f9ce3adfb5765238739ee8181 Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Wed, 22 Jul 2020 09:39:00 +0200
Subject: [PATCH 1/2] softkeys

---
 Thermo.Active/wwwroot/assets/styles/base/paddle.less        | 4 ++++
 Thermo.Active/wwwroot/assets/styles/style.css               | 3 +++
 .../src/app_modules_thermo/components/paddle/paddle.vue     | 1 +
 .../src/app_modules_thermo/components/paddle/softkey.ts     | 6 ++++++
 .../src/app_modules_thermo/components/paddle/softkey.vue    | 2 +-
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less
index 636f3ec0..e3065eab 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/paddle.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/paddle.less
@@ -153,6 +153,10 @@
     color: @color-darkish-blue;
     background: #fff;
   }
+
+  &.active {
+    box-shadow: inset 0px 0px 0px 3px #1791ff;
+  }
 }
 
 .box-softkeys-prefered-footer {
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 85dee545..0f6fb75e 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4878,6 +4878,9 @@ article .box .body {
   color: #002680;
   background: #fff;
 }
+.softkey.active {
+  box-shadow: inset 0px 0px 0px 3px #1791ff;
+}
 .box-softkeys-prefered-footer {
   height: 65px;
   display: flex;
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 67dbd69c..6a51798c 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
@@ -55,6 +55,7 @@
 				<template v-for="(b,idx) in allSoftKeys">
 					<soft-key
 						v-if="getSoftKeyStatus(b.id) && getSoftKeyStatus(b.id).visible"
+						:id="b.id"
 						:key="idx"
 						:title="'softkey_' + b.id | localize('softkey_' + b.id)"
 						:type="b.type"
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.ts
index 8c76853d..812f9e07 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.ts
@@ -18,9 +18,15 @@ export default class SoftKey extends Vue {
   @Prop({ default: false })
   configMode: boolean;
 
+  @Prop({ default: false })
+  active: boolean;
+
   @Prop({ default: false })
   isFavourite: boolean;
 
+  @Prop({ default: null })
+  id: number;
+
   doclick() {
     if (!this.configMode && this.type != 0) this.$emit('click');
   }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.vue
index 1974d3f8..8ab93ce4 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="softkey" @click="doclick()">
+	<div class="softkey" @click="doclick()" :class="{ active: (active && type==1)}">
 		<button class="configure" v-if="configMode" @click.prevent.stop="$emit('toggleFavourite')">
 			<i class="fa fa-plus" v-if="!isFavourite"></i>
 			<i class="fa fa-minus" v-if="isFavourite"></i>

From b9f82cb6f0a8f75bbaf50881156cdfd798c5f6f9 Mon Sep 17 00:00:00 2001
From: = <paolo@teamdev.it>
Date: Wed, 22 Jul 2020 10:33:52 +0200
Subject: [PATCH 2/2] starred ?

---
 .../wwwroot/assets/styles/base/paddle.less    |  6 ++
 Thermo.Active/wwwroot/assets/styles/style.css |  3 +
 .../processo/components/processo.ts           | 55 ++++++++++++++-----
 .../processo/components/processo.vue          | 37 +++++--------
 .../processo/components/softkey.ts            | 26 +++++++++
 .../processo/components/softkey.vue           |  7 +++
 .../wwwroot/src/services/dataService.ts       |  5 ++
 7 files changed, 102 insertions(+), 37 deletions(-)
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.ts
 create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.vue

diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less
index e3065eab..dc8158ff 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/paddle.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/paddle.less
@@ -159,6 +159,12 @@
   }
 }
 
+.starred-softkey {
+  &.active {
+    box-shadow: inset 0px 0px 0px 3px #1791ff;
+  }
+}
+
 .box-softkeys-prefered-footer {
   height: 65px;
   background-color: #002680;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 0f6fb75e..c35c28e9 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4881,6 +4881,9 @@ article .box .body {
 .softkey.active {
   box-shadow: inset 0px 0px 0px 3px #1791ff;
 }
+.starred-softkey.active {
+  box-shadow: inset 0px 0px 0px 3px #1791ff;
+}
 .box-softkeys-prefered-footer {
   height: 65px;
   display: flex;
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 e7c0ed7c..a761d95f 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
@@ -1,25 +1,29 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
-import { Prop } from 'vue-property-decorator';
 import { messageService } from "@/_base/messageService";
-import { Modal, ModalHelper } from "@/components/modals";
-import gantt from "./gantt/gantt.vue";
-import { moduleService } from '@/services/moduleService';
+import { Modal as modal, ModalHelper } from "@/components/modals";
 import { CONFIGURATION } from '@/config';
-import zoom from "./gantt/zoomLevel.vue";
 import { store } from '@/store';
+import { dataService } from '@/services/dataService';
+import gantt from "./gantt/gantt.vue";
+import zoom from "./gantt/zoomLevel.vue";
+import softKey from "./softkey.vue";
+import { Hub } from '@/services';
 
 @Component({
   components: {
-    modal: Modal, gantt, zoom
+    modal, gantt, zoom, softKey
   }
 })
 export default class Processo extends Vue {
 
-  @Prop({ default: 25 })
-  actual: number;
-  @Prop({ default: 145 })
-  tot: number;
+  get actual(): number {
+    return store.state.prod.panel.numDone;
+  };
+
+  get tot(): number {
+    return store.state.prod.panel.numTarget;
+  };
 
   get blocks(): server.Modblock[] {
     return store.state.modules.blocks;
@@ -29,6 +33,8 @@ export default class Processo extends Vue {
 
   zoomStep = 1.2;
 
+  starred: { id: number }[] = []
+
   get gaugeData() {
     return store.state.machineStatus.gaugeData;
   }
@@ -40,11 +46,34 @@ export default class Processo extends Vue {
   showAllBlocks: boolean = false;
 
   async mounted() {
-
     let c = await CONFIGURATION;
     this.showAllBlocks = c.allUIVisible;
-
-
+    this.starred = await dataService.GetStarredSoftKeysConfiguration();
   }
 
+  confirmationDelegate = null;
+  waitingForSftkConfirm = false;
+  softKeyChanged(id, confirm) {
+    if (!confirm)
+      Hub.Current.sendUserSoftKey(id);
+    else {
+      this.confirmationDelegate = () => {
+        Hub.Current.sendUserSoftKey(id);
+      };
+      this.waitingForSftkConfirm = true;
+    }
+  }
+
+  sendKeyCancel() {
+    this.confirmationDelegate = null;
+  }
+  sendKeyConfirm() {
+    if (this.confirmationDelegate)
+      this.confirmationDelegate();
+    this.confirmationDelegate = null;
+  }
+
+  getSoftKeyStatus(id) {
+    return this.$store.getters.getSoftKeyStatus(id);
+  }
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
index cd275533..4aab2c8c 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
@@ -5,30 +5,19 @@
 			:title="'processo_lbl_title' | localize('Attività attuale (es. attesa spostamento assi)')"
 		>
 			<div class="tab-header" slot="header-buttons">
-				<button>
-					<img src="assets/icons/png/star.png" />
-					<span>Opzioni di lavorazione</span>
-				</button>
-				<button>
-					<img src="assets/icons/png/star.png" />
-					<span>Pirometro</span>
-				</button>
-				<button>
-					<img src="assets/icons/png/star.png" />
-					<span>Attivazione riscaldi</span>
-				</button>
-				<button>
-					<img src="assets/icons/png/star.png" />
-					<span>Riscaldo +10 secondi</span>
-				</button>
-				<button>
-					<img src="assets/icons/png/star.png" />
-					<span>Risclado -10 secondi</span>
-				</button>
-				<button>
-					<img src="assets/icons/png/star.png" />
-					<span>Label pulsante opzionale</span>
-				</button>
+				<template v-for="(b,idx) in starred">
+					<soft-key
+						v-if="getSoftKeyStatus(b.id) && getSoftKeyStatus(b.id).visible"
+						:id="b.id"
+						:key="idx"
+						:title="'softkey_' + b.id | localize('softkey_' + b.id)"
+						:type="b.type"
+						v-model="getSoftKeyStatus(b.id).value"
+						:active="getSoftKeyStatus(b.id).active"
+						@click="softKeyChanged(b.id, b.operatorConfirmationNeeded)"
+						@checkChanged="softKeyChanged(b.id, b.operatorConfirmationNeeded)"
+					></soft-key>
+				</template>
 				<label>{{actual}}/{{tot}}</label>
 			</div>
 			<gantt
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.ts
new file mode 100644
index 00000000..28ab0105
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.ts
@@ -0,0 +1,26 @@
+import Vue from "vue";
+import Component from "vue-class-component";
+import { Prop } from "vue-property-decorator";
+
+@Component({})
+export default class SoftKey extends Vue {
+
+  @Prop({ default: "" })
+  title: string;
+
+  @Prop({ default: 0 })
+  type: number;
+
+  @Prop({ default: false })
+  value: boolean;
+
+  @Prop({ default: false })
+  active: boolean;
+
+  @Prop({ default: null })
+  id: number;
+
+  doclick() {
+    this.$emit('click');
+  }
+}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.vue
new file mode 100644
index 00000000..70c5f937
--- /dev/null
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/softkey.vue
@@ -0,0 +1,7 @@
+<template>
+	<button class="starred-softkey" @click="doclick()" :class="{ active: active }">
+		<img src="assets/icons/png/star.png" />
+		<span>{{title}}</span>
+	</button>
+</template>
+<script src="./softkey.ts" lang="ts"/>
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/services/dataService.ts b/Thermo.Active/wwwroot/src/services/dataService.ts
index 698854b5..58cb6315 100644
--- a/Thermo.Active/wwwroot/src/services/dataService.ts
+++ b/Thermo.Active/wwwroot/src/services/dataService.ts
@@ -14,6 +14,11 @@ export class DataService extends baseRestService {
     machineInfoActions.updateMachineInfo(store, { softKeys: result })
   }
 
+  async GetStarredSoftKeysConfiguration(): Promise<{ id: number }[]> {
+    let result = await this.Get<{ id: number }[]>((await this.BASE_URL()) + "/api/starred_softkey/get");
+    return result;
+  }
+
   async AddUserSoftkeyFavorite(model: number) {
     machineInfoActions.addSoftKeysFavorites(store, model);
     let result = await this.Put<number[]>((await this.BASE_URL()) + "/api/user_softkey/favorite", machineInfoStore.state.softkeysFavorites, true);