v3.11.0

README.md

@@ -54,11 +54,12 @@ Wenn ihr in **FHEMApp** Daten aus FHEM-Logs in Charts darstellt, ist es ggf. sin
 ```
 
 ### Anzeigeeinstellungen für FHEMApp (optional)
-Wenn ihr in **FHEMApp** bei der mobilen Ansicht (1-spaltiges Layout) im Header sehen wollt, in welcher Bereich bzw. in welche Gruppe euch gerade befindet, dann könnt ihr unter Options den Parameter `mobileHeader` setzen. Weiterhin könnt ihr über den Parameter `reloadBtn` einen Button für einen kompletten Browser-Refresh im Header aktivieren.
+Wenn ihr in **FHEMApp** bei der mobilen Ansicht (1-spaltiges Layout) im Header sehen wollt, in welcher Bereich bzw. in welche Gruppe euch gerade befindet, dann könnt ihr unter Options den Parameter `mobileHeader` setzen. Ebenfalls in der mobilen Ansicht könnt ihr über den Parameter `homeBtn` einen Home-Button auf der rechten Seite im Header einblenden. Weiterhin könnt ihr über den Parameter `reloadBtn` einen Button für einen kompletten Browser-Refresh im Header aktivieren. 
 ```
 "options": {
   "mobileHeader": true,
-  "reloadBtn": true
+  "reloadBtn": true,
+  "homeBtn": true
 },
 ```
 
@@ -236,6 +237,7 @@ Beispiele:
 - **%i1** - erhöht (%i1.5) bzw. verringert (%i-1.5) das *Reading* um den Wert. Hierfür muss das *Reading* Zahlenwerte enthalten.
 - **%t** - liefert das *Reading* als Zeitstempel im Format TT.MM.JJJJ hh:mm:ss zurück
 - **%v** - ausschließlich in Verbindung mit dem Element *slider* notwendig.
+- **:** - HTML-entity wenn ein Doppelpunkt ausgegeben werden soll
 
 ## verfügbare Elemente
 |Bereich|Element|Zuweisung|Beschreibung|

public/cfg/templ_dimmer2.json

@@ -13,6 +13,12 @@
       "slider": ["pct::%v:%n:0:100"],
       "rightBtn": "mdi-lightbulb",
       "rightClick": ["state::on"]
+    },
+    {
+      "text": ["pct::%s % :"],
+      "rightBtn": "mdi-dots-vertical",
+      "rightMenu": ["aus:off","25 %:pct 25","50 %:pct 50","75 %:pct 75","an:on"]
+
     }
   ],
   "info": {

src/App.vue

@@ -30,32 +30,30 @@
         {{ app.data.header }}
       </div>
       <v-spacer />
-      <div v-if="app.options.debugMode">
-        <v-btn
-          small
-          icon
-          link
-          to="/syslog"
-        >
-          <v-icon
-            small
-          >
-            mdi-format-list-bulleted
-          </v-icon>
-        </v-btn>
-      </div>
+      <v-btn
+        v-if="app.options.debugMode"
+        icon
+        @click="goTo('/syslog')"
+      >
+        <v-icon>mdi-format-list-bulleted</v-icon>
+      </v-btn>
 
-      <div v-if="app.options.reloadBtn">
-        <v-btn
-          small
-          icon
-          @click="reload"
-        >
-          <v-icon>
-            mdi-reload
-          </v-icon>
-        </v-btn>
-      </div>
+      <v-btn
+        v-if="app.options.reloadBtn"
+        icon
+        @click="reload()"
+      >
+        <v-icon>mdi-reload</v-icon>
+      </v-btn>
+
+      <v-btn
+        class="hidden-lg-and-up text-h5"
+        v-if="app.options.homeBtn"
+        icon
+        @click="goTo()"
+      >
+        <v-icon>mdi-home</v-icon>
+      </v-btn>
 
       <v-tooltip bottom>
         <template v-slot:activator="{ on, attrs }">
@@ -219,7 +217,7 @@
           header: ''
         }
       },
-      version: 'v3.10.0',
+      version: 'v3.11.0',
       status: {
         color: 'secondary',
         icon: 'mdi-circle',
@@ -266,6 +264,12 @@
 
       reload() {
         location.reload(true);
+      },
+
+      goTo(val) {
+        let route = val || '/';
+
+        if(this.$router.currentRoute.path != route) this.$router.push(route);
       }
     }
   }

src/components/TemplDefault.vue

@@ -79,7 +79,7 @@
                 dense
                 color="secondary lighten-2"
               >
-                <v-list-item-group>
+                <v-list-item-group active-class="success--text">
                   <v-list-item
                     v-for="(menu, i) in vals.main.leftMenu"
                     :key="i"
@@ -162,7 +162,7 @@
                 dense
                 color="secondary lighten-2"
               >
-                <v-list-item-group>
+                <v-list-item-group active-class="success--text">
                   <v-list-item
                     v-for="(menu, i) in vals.main.rightMenu"
                     :key="i"

src/components/TemplScenes.vue

@@ -52,7 +52,7 @@
               >
                 <v-list-item-group
                   v-model="vals.sceneSelected"
-                  active-class="accent--text"
+                  active-class="success--text"
                 >
                   <v-list-item
                     v-for="(scene, i) in vals.scenes"

src/plugins/fhem.js

@@ -320,7 +320,7 @@ export default class Fhem extends EventEmitter {
     }
   }
 
-  // subfunction for handleVals %s %n %i %t
+  // subfunction for handleVals %s %n %i %t :
   replaceVals(defSet, state) {
     let chkNum = /-?[0-9]/.exec(state);
     let result = [];
@@ -346,6 +346,8 @@ export default class Fhem extends EventEmitter {
         }
       }
 
+      val = val.replace(':',':');
+
       result.push(val);
     }
 

www/fhemapp/cfg/templ_dimmer2.json

@@ -13,6 +13,12 @@
       "slider": ["pct::%v:%n:0:100"],
       "rightBtn": "mdi-lightbulb",
       "rightClick": ["state::on"]
+    },
+    {
+      "text": ["pct::%s % :"],
+      "rightBtn": "mdi-dots-vertical",
+      "rightMenu": ["aus:off","25 %:pct 25","50 %:pct 50","75 %:pct 75","an:on"]
+
     }
   ],
   "info": {

www/fhemapp/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><link href="css/chunk-03454508.55c011d2.css" rel="prefetch"><link href="css/chunk-07709945.d4481170.css" rel="prefetch"><link href="css/chunk-085bcd30.01cf6fd8.css" rel="prefetch"><link href="css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="css/chunk-17d492e6.1bbdaac2.css" rel="prefetch"><link href="css/chunk-28a3f15f.fc346ba4.css" rel="prefetch"><link href="css/chunk-2c05d556.cb4d0868.css" rel="prefetch"><link href="css/chunk-4a62a958.b490d9b1.css" rel="prefetch"><link href="css/chunk-53c4ff2a.9398bfa8.css" rel="prefetch"><link href="css/chunk-72c6e8d8.8d89ed40.css" rel="prefetch"><link href="css/chunk-b2de1140.1bbdaac2.css" rel="prefetch"><link href="css/chunk-d4e16e04.6714eec0.css" rel="prefetch"><link href="css/chunk-dc5178fa.cb4d0868.css" rel="prefetch"><link href="css/chunk-dd03e16c.cb4d0868.css" rel="prefetch"><link href="js/chunk-03454508.24dbacbb.js" rel="prefetch"><link href="js/chunk-07709945.34fde9c6.js" rel="prefetch"><link href="js/chunk-085bcd30.81f15153.js" rel="prefetch"><link href="js/chunk-15fa718e.7a2c6eb5.js" rel="prefetch"><link href="js/chunk-17d492e6.b1715dc7.js" rel="prefetch"><link href="js/chunk-28a3f15f.fd07f95d.js" rel="prefetch"><link href="js/chunk-2c05d556.843edd83.js" rel="prefetch"><link href="js/chunk-2d0aa92c.dd73341b.js" rel="prefetch"><link href="js/chunk-2d212bf1.e78db2a1.js" rel="prefetch"><link href="js/chunk-4a62a958.b5b68579.js" rel="prefetch"><link href="js/chunk-53c4ff2a.bdef909f.js" rel="prefetch"><link href="js/chunk-72c6e8d8.c00175b8.js" rel="prefetch"><link href="js/chunk-b2de1140.60fc56bd.js" rel="prefetch"><link href="js/chunk-d4e16e04.e8847c6e.js" rel="prefetch"><link href="js/chunk-dc5178fa.7e68cc3b.js" rel="prefetch"><link href="js/chunk-dd03e16c.e28faf32.js" rel="prefetch"><link href="css/chunk-vendors.95431e8e.css" rel="preload" as="style"><link href="js/app.34ba2bf7.js" rel="preload" as="script"><link href="js/chunk-vendors.aacf57ae.js" rel="preload" as="script"><link href="css/chunk-vendors.95431e8e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.aacf57ae.js"></script><script src="js/app.34ba2bf7.js"></script></body></html>
+<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><link href="css/chunk-03454508.55c011d2.css" rel="prefetch"><link href="css/chunk-07709945.d4481170.css" rel="prefetch"><link href="css/chunk-085bcd30.01cf6fd8.css" rel="prefetch"><link href="css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="css/chunk-17d492e6.1bbdaac2.css" rel="prefetch"><link href="css/chunk-28a3f15f.fc346ba4.css" rel="prefetch"><link href="css/chunk-2c05d556.cb4d0868.css" rel="prefetch"><link href="css/chunk-4a62a958.b490d9b1.css" rel="prefetch"><link href="css/chunk-53c4ff2a.9398bfa8.css" rel="prefetch"><link href="css/chunk-72c6e8d8.8d89ed40.css" rel="prefetch"><link href="css/chunk-b2de1140.1bbdaac2.css" rel="prefetch"><link href="css/chunk-d4e16e04.6714eec0.css" rel="prefetch"><link href="css/chunk-dc5178fa.cb4d0868.css" rel="prefetch"><link href="css/chunk-dd03e16c.cb4d0868.css" rel="prefetch"><link href="js/chunk-03454508.24dbacbb.js" rel="prefetch"><link href="js/chunk-07709945.34fde9c6.js" rel="prefetch"><link href="js/chunk-085bcd30.81f15153.js" rel="prefetch"><link href="js/chunk-15fa718e.7a2c6eb5.js" rel="prefetch"><link href="js/chunk-17d492e6.b1715dc7.js" rel="prefetch"><link href="js/chunk-28a3f15f.fd07f95d.js" rel="prefetch"><link href="js/chunk-2c05d556.843edd83.js" rel="prefetch"><link href="js/chunk-2d0aa92c.95a28eac.js" rel="prefetch"><link href="js/chunk-2d212bf1.e78db2a1.js" rel="prefetch"><link href="js/chunk-4a62a958.b5b68579.js" rel="prefetch"><link href="js/chunk-53c4ff2a.bdef909f.js" rel="prefetch"><link href="js/chunk-72c6e8d8.c00175b8.js" rel="prefetch"><link href="js/chunk-b2de1140.60fc56bd.js" rel="prefetch"><link href="js/chunk-d4e16e04.e8847c6e.js" rel="prefetch"><link href="js/chunk-dc5178fa.7e68cc3b.js" rel="prefetch"><link href="js/chunk-dd03e16c.da622850.js" rel="prefetch"><link href="css/chunk-vendors.95431e8e.css" rel="preload" as="style"><link href="js/app.074ad9f9.js" rel="preload" as="script"><link href="js/chunk-vendors.aacf57ae.js" rel="preload" as="script"><link href="css/chunk-vendors.95431e8e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.aacf57ae.js"></script><script src="js/app.074ad9f9.js"></script></body></html>