V3.3.3

package.json

@@ -18,20 +18,20 @@
   },
   "homepage": "https://github.com/jemu75/fhemApp#readme",
   "dependencies": {
-    "apexcharts": "^3.25.0",
+    "apexcharts": "^3.26.0",
     "core-js": "^3.9.1",
     "typeface-roboto": "^1.1.13",
     "vue": "^2.6.11",
     "vue-apexcharts": "^1.6.0",
     "vue-router": "^3.5.1",
-    "vuetify": "^2.4.6"
+    "vuetify": "^2.4.8"
   },
   "devDependencies": {
     "@mdi/font": "^5.9.55",
-    "@vue/cli-plugin-babel": "^4.5.11",
-    "@vue/cli-plugin-eslint": "^4.5.11",
-    "@vue/cli-plugin-router": "^4.5.11",
-    "@vue/cli-service": "^4.5.11",
+    "@vue/cli-plugin-babel": "^4.5.12",
+    "@vue/cli-plugin-eslint": "^4.5.12",
+    "@vue/cli-plugin-router": "^4.5.12",
+    "@vue/cli-service": "^4.5.12",
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",

public/cfg/templ_dimmer2.json

@@ -0,0 +1,22 @@
+{
+  "name": "dimmer_fibaro_FGD212",
+  "author": "tomspatz",
+  "date": "2021-03-26",
+  "status": {
+    "bar": ["state:on:100:success","state:off:0:success","state::%n:success"],
+    "error": []
+  },
+  "main": [
+    {
+      "leftBtn": "mdi-lightbulb-off",
+      "leftClick": ["state::off"],
+      "slider": ["state::dim %v:%n:0:100"],
+      "rightBtn": "mdi-lightbulb",
+      "rightClick": ["state::on"]
+    }
+  ],
+  "info": {
+    "left1": ["state:off::mdi-lightbulb-off","state:::mdi-lightbulb"],
+    "left2": ["state:off:::","state:on:::","state::%n%"]
+  }
+}

src/App.vue

@@ -114,7 +114,7 @@
           groupList: []
         }
       },
-      version: 'v3.3.2',
+      version: 'v3.3.3',
       status: {
         color: 'secondary',
         icon: 'mdi-circle',

src/components/TemplDefault.vue

@@ -139,6 +139,7 @@
           text2: '',
           slider: false,
           sliderCurrent: 0,
+          sliderPrevent: false,
           sliderMin: 0,
           sliderMax: 100,
           rightBtn: '',
@@ -262,6 +263,7 @@
         if(action) {
           let param = this.$fhem.handleVals(this.item, action);
           if(param[0]) {
+            this.vals.main.sliderPrevent = true;
             let cmd = param[0].match('set') ? param[0] : 'set ' + this.item.Name + ' ' + param[0];
             cmd = cmd.replace('%v', val);
             this.sendCmd(cmd);
@@ -320,9 +322,17 @@
         this.vals.main.rightMenu = mainRightMenu;
 
         this.vals.main.slider = mainSlider[0] ? true : false;
-        this.vals.main.sliderCurrent = mainSlider[1] || 0;
         this.vals.main.sliderMin = mainSlider[2] || 0;
         this.vals.main.sliderMax = mainSlider[3] || 100;
+
+        if(!this.vals.main.sliderPrevent) {
+          this.vals.main.sliderCurrent = mainSlider[1] || 0;
+        } else {
+          if(this.vals.main.sliderCurrent === mainSlider[1]) {
+            this.vals.main.sliderPrevent = false;
+            this.vals.main.sliderCurrent = mainSlider[1] || 0;
+          }
+        }
       },
 
       setValues() {
@@ -369,10 +379,18 @@
           this.vals.main.text2 = mainText2[0] || '';
 
           this.vals.main.slider = mainSlider[0] ? true : false;
-          this.vals.main.sliderCurrent = mainSlider[1] || 0;
           this.vals.main.sliderMin = mainSlider[2] || 0;
           this.vals.main.sliderMax = mainSlider[3] || 100;
 
+          if(!this.vals.main.sliderPrevent) {
+            this.vals.main.sliderCurrent = mainSlider[1] || 0;
+          } else {
+            if(this.vals.main.sliderCurrent === mainSlider[1]) {
+              this.vals.main.sliderPrevent = false;
+              this.vals.main.sliderCurrent = mainSlider[1] || 0;
+            }
+          }
+
           this.vals.main.leftBtn = mainLeftBtn[0] || '';
           this.vals.main.rightBtn = mainRightBtn[0] || '';
           this.vals.main.leftBtnDisabled = mainLeftBtn[1] ? true : false;

src/plugins/fhem.js

@@ -529,19 +529,20 @@ export default class Fhem extends EventEmitter {
           for(const item of res.Results) {
             if('PossibleSets' in item) delete item.PossibleSets;
             if('PossibleAttrs' in item) delete item.PossibleAttrs;
-
+            let blockItem = false;
             let options = await this.createOptions(item);
 
-            //let setup = await this.createSetup('shellyswitch');
-            //console.log(setup);
-
             if(options) {
               item.Options = options;
               item.Options.order = item.Attributes.sortby || 'zzz';
+
+              if(!fltr.match('options=true') && item.Options.room && !fltr.match('room.:..' + item.Options.room)) blockItem = true;
+              if(!fltr.match('options=true') && item.Options.group && !fltr.match('group.:..' + item.Options.group)) blockItem = true;
+
               this.createConnected(item)
                 .then((connected) => {
                   item.Connected = connected;
-                  target.push(item);
+                  if(!blockItem) target.push(item);
 
                   if(idx === res.Results.length) {
                     target.sort((a,b) => (a.Options.order > b.Options.order) ? 1 : ((b.Options.order > a.Options.order) ? -1 : 0));

src/views/EditDevices.vue

@@ -56,6 +56,7 @@
 export default {
   name: 'EditDevices',
   data: () => ({
+    mytest: 20,
     search: '',
     headers: [
       { text: 'Name', value: 'Name' },

www/fhemapp/cfg/config.json

@@ -1,4 +1,9 @@
 {
+  "connection": {
+    "location": "http://fhem",
+    "port": "8083",
+    "path": "fhem"
+  },
   "options": {
     "maxChartPoints": 100,
     "logBuffer": 500

www/fhemapp/cfg/templ_dimmer2.json

@@ -0,0 +1,22 @@
+{
+  "name": "dimmer_fibaro_FGD212",
+  "author": "tomspatz",
+  "date": "2021-03-26",
+  "status": {
+    "bar": ["state:on:100:success","state:off:0:success","state::%n:success"],
+    "error": []
+  },
+  "main": [
+    {
+      "leftBtn": "mdi-lightbulb-off",
+      "leftClick": ["state::off"],
+      "slider": ["state::dim %v:%n:0:100"],
+      "rightBtn": "mdi-lightbulb",
+      "rightClick": ["state::on"]
+    }
+  ],
+  "info": {
+    "left1": ["state:off::mdi-lightbulb-off","state:::mdi-lightbulb"],
+    "left2": ["state:off:::","state:on:::","state::%n%"]
+  }
+}