From 627fd320aeee648fa7c44ce6a4a6386070f4c3e2 Mon Sep 17 00:00:00 2001
From: Francesco Guerrieri <f.guerrieri87@gmail.com>
Date: Fri, 15 May 2020 15:09:11 +0200
Subject: [PATCH] fix style dashboard

---
 .../wwwroot/assets/styles/base/dashboard.less       | 13 +++----------
 .../wwwroot/assets/styles/base/paddle.less          |  1 +
 Thermo.Active/wwwroot/assets/styles/style.css       |  3 +++
 Thermo.Active/wwwroot/src/App.ts                    |  2 --
 .../src/app_modules_thermo/dashboard/dashboard.ts   | 11 ++---------
 .../app_modules_thermo/setup/components/setup.ts    |  1 -
 Thermo.Active/wwwroot/src/store/app.store.ts        |  2 --
 7 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less
index 9870ca04..33a33ce0 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less
@@ -7,16 +7,9 @@
     height: 100%;
     width: 100%;
     background-image: url("../../assets/icons/png/bg.png");
-        // section{
-        //     display: flex;
-        //     .specific{
-        //         display: flex;
-        //         flex-direction: column;
-        //         div{
-        //             display: flex;
-        //         }
-        //     }
-        // }
+    position: fixed;
+    z-index: 1001;
+
     .ribbon-container{
         height: 80px;
         z-index: 900;
diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less
index 2499730e..7badbf5f 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/paddle.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/paddle.less
@@ -18,6 +18,7 @@ html {
     position: absolute;
     top: 50%;
     right: 0;
+    z-index: 1000;
   }
  
 
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 6ebd1977..504ae789 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -3674,6 +3674,8 @@
   height: 100%;
   width: 100%;
   background-image: url("../../assets/icons/png/bg.png");
+  position: fixed;
+  z-index: 1001;
 }
 .dashboard .ribbon-container {
   height: 80px;
@@ -4196,6 +4198,7 @@ body {
   position: absolute;
   top: 50%;
   right: 0;
+  z-index: 1000;
 }
 .text-head-sidebar {
   margin: 10px auto;
diff --git a/Thermo.Active/wwwroot/src/App.ts b/Thermo.Active/wwwroot/src/App.ts
index 09a7d861..ecf2fe37 100644
--- a/Thermo.Active/wwwroot/src/App.ts
+++ b/Thermo.Active/wwwroot/src/App.ts
@@ -162,7 +162,6 @@ export default class app extends Vue {
   }
 
   get statusDashboard(){
-    debugger
     return this.$store.state.isShowDashboard;
   }
 
@@ -243,7 +242,6 @@ export default class app extends Vue {
   }
 
   toogleDashboard(){
-    debugger
     this.showDashboard = true;
   }
 
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 6cc287ad..73dbe5a2 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts
@@ -5,7 +5,7 @@ import { messageService } from '@/_base';
 import { ModalHelper } from '@/components/modals';
 import AppRibbon from "@/components/app-ribbon.vue";
 import moment from "moment";
-import { AppModel } from '@/store';
+import { AppModel, appModelActions } from '@/store';
 import { getColorFromName,isDarkColor } from "@/_base/utils";
 import ArchInterface from "../components/arch-interface/arch-interface.vue";
 
@@ -27,9 +27,6 @@ export default class Dashboard extends Vue{
   public monthIt: string = moment(new Date()).locale('it').format('MMMM');
 
   created(){
-    // document.getElementsByTagName('header')[0].setAttribute("style","position:unset");
-    // document.getElementsByClassName('window-buttons')[0].setAttribute("style","position:unset");
-
     this.updateTime();
     // Ora aggiornata ogni 10 secondi
     window.setInterval(() => {
@@ -139,11 +136,7 @@ export default class Dashboard extends Vue{
   }
     
   close() {
-    // messageService.deleteChannel("esc_pressed"); 
-    this.$router.push('/setup');
-    document.getElementsByTagName('header')[0].setAttribute("style","position:absolute");
-    document.getElementsByClassName('window-buttons')[0].setAttribute("style","position:fixed");
-    // ModalHelper.HideModal();
+    appModelActions.ShowDashboard(this.$store);
   };  
 
 }
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 2faa514d..151829a5 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
@@ -17,7 +17,6 @@ export default class Setup extends Vue {
     }
 
     showDashboard() {
-        debugger
         appModelActions.ShowDashboard(this.$store);
       }
 }
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/store/app.store.ts b/Thermo.Active/wwwroot/src/store/app.store.ts
index 45c6eb4d..687920ca 100644
--- a/Thermo.Active/wwwroot/src/store/app.store.ts
+++ b/Thermo.Active/wwwroot/src/store/app.store.ts
@@ -105,7 +105,6 @@ const _store = {
         state.currentUser.language = newlanguage;
     },
     setShowDashboard(state) {
-      debugger
       state.isShowDashboard = !state.isShowDashboard;
     }
   },
@@ -128,7 +127,6 @@ const _store = {
       context.commit("favSoftkey", false);
     },
     ShowDashboard(context){
-      debugger
       context.commit("setShowDashboard");
     },
     SetCurrentUser(context, userinfo) {