From f4223d6de081e7fc05f8aae5dd10bebb616241fc Mon Sep 17 00:00:00 2001
From: Alessio <alessiogiombetti@live.it>
Date: Mon, 18 May 2020 12:51:24 +0200
Subject: [PATCH] fix opening dashboard

---
 .../wwwroot/assets/styles/base/dashboard.less       |  2 +-
 Thermo.Active/wwwroot/assets/styles/style.css       |  2 +-
 .../setup/avvio-pruduzione/avvio-produzione.ts      | 13 +++++++++----
 .../setup/avvio-pruduzione/avvio-produzione.vue     |  2 +-
 .../app_modules_thermo/setup/components/setup.ts    |  5 +----
 .../app_modules_thermo/setup/components/setup.vue   |  2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less
index dacfa7fa..65ef0bab 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less
@@ -10,7 +10,7 @@
     width: 100%;
     background-image: url("../../assets/icons/png/bg.png");
     position: fixed;
-    z-index: 1001;
+    z-index: 1002;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index d0361d0d..3454f57a 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -4042,7 +4042,7 @@
   width: 100%;
   background-image: url("../../assets/icons/png/bg.png");
   position: fixed;
-  z-index: 1001;
+  z-index: 1002;
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts
index 2f8e5d7b..3d4848f9 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts
@@ -4,7 +4,8 @@ import { Factory, messageService, awaiter } from "@/_base";
 import Component from "vue-class-component";
 import { Prop } from 'vue-property-decorator';
 import ToggleButton from "@/components/toggleButton.vue";
-import Tastierino from "@/app_modules_thermo/setup/formato/components/tastierino.vue"
+import Tastierino from "@/app_modules_thermo/setup/formato/components/tastierino.vue";
+import {appModelActions} from "@/store/app.store";
 
 @Component({ 
   components: { 
@@ -25,9 +26,13 @@ export default class AvvioProduzione extends Vue {
         ModalHelper.HideModal();
       };
   
-      conferma(){
-        ModalHelper.HideModal();
-      };
+      // conferma(){
+      //   ModalHelper.HideModal();
+      // };
+
+      showDashboard() {
+        appModelActions.ShowDashboard(this.$store);
+      }
   
       async beforeMount() {
           // this.contactInfo = await awaiter(new machineService().getContactConfiguration());
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue
index 289dbb0c..af42cc09 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue
@@ -22,7 +22,7 @@
             </section>
 			<footer>
 				<button class="btn" @click="annulla()">Annulla</button>
-				<button class="btn btn-success" @click="conferma()">Avvio</button>
+				<button class="btn btn-success" @click="showDashboard()">Avvio</button>
 			</footer>
 		</modal>
 	</div>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts
index 13ba04a4..38c0bc9e 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts
@@ -3,7 +3,6 @@ import { Modal, ModalHelper } from "@/components/modals"
 import Component from 'vue-class-component';
 import { messageService } from "@/_base/messageService";
 import setupButton from "./setupButton.vue";
-import {appModelActions} from "@/store/app.store";
 
 @Component({
     components: {
@@ -16,7 +15,5 @@ export default class Setup extends Vue {
         messageService.publishToChannel(name);
     }
 
-    showDashboard() {
-        appModelActions.ShowDashboard(this.$store);
-    }
+  
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
index 2b3d31d6..ba056ce8 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
@@ -80,7 +80,7 @@
                 ></setup-button>
 
                 <div class="setup-play">
-                    <img class="dim" src="assets/icons/svg/setup-play.svg" @click="showDashboard()"/>  
+                    <img class="dim" src="assets/icons/svg/setup-play.svg" @click="sendMessage('show-avvio-produzione-info')"/>  
                 </div>
             </div>
         </modal>