Skip to content

Commit

Permalink
v3.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jemu75
jemu75 committed Apr 26, 2021
1 parent 3c13e30 commit 033dcf8
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 15 deletions.
14 changes: 11 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ In den Template-Dateien können folgende Eigenschaften definiert werden. Die Zuw
"size": "col-12 col-sm-6 col-md-4 col-lg-4",
"status": {
"bar": ["reading:value:level:color:invert"],
"error": ["reading:value:level:color:text"]
"error": ["reading:value:level:color:text"],
"min": 0,
"max": 100
},
"main": [
{
Expand Down Expand Up @@ -245,6 +247,8 @@ Beispiele:
|-------|-------|-----|-------------|
|status|bar|reading:wert:level:color:invert|definiert mit welcher **Farbe** und mit welchem **Level** der Status angezeigt wird. Bei Angabe von invert wird *level* invertiert|
|status|error|reading:wert:level:color:text|definiert mit welcher **Farbe** und mit welchem **Level** Fehler angezeigt werden. Weiterhin wird die **Fehlermeldung** definiert.|
|status|min|number|(optional) legt den minimalen Wert für **Level** fest. *Standard: 0* |
|status|max|number|(optional) legt den maximalen Wert für **Level** fest. *Standard: 100* |
|main|leftBtn|reading:wert:icon:disabled (alternativ: icon)|definiert welches *Icon* auf der linken Taste angezeigt wird. Optional kann das Flag *disabled* gesetzt werden. Icon Bibliothek [siehe](https://materialdesignicons.com/)|
|main|leftClick|reading:wert:cmd|defniert welches FHEM-Kommando bei Klick auf die linke Taste abgesendet wird. [siehe auch](#hinweis-zur-definition-von-fhem-Kommandos)|
|main|leftLong|reading:wert:cmd|defniert welches FHEM-Kommando bei langem Halten der linken Taste abgesendet wird. [siehe auch](#hinweis-zur-definition-von-fhem-Kommandos)|
Expand Down Expand Up @@ -685,7 +689,9 @@ Nachdem ihr ein Panel defniert und die *panelItems* zugewiesen habt, müsst ihr
```
{
"panel": {
"status": ["reading:wert:text:level:color"],
"status": ["reading:wert:text:level:color:invert"],
"min": 0,
"max": 100,
"btn": ["reading:wert:icon"],
"click": ["reading:wert:cmd"],
"link": "string",
Expand All @@ -695,7 +701,9 @@ Nachdem ihr ein Panel defniert und die *panelItems* zugewiesen habt, müsst ihr
```
|Element|Zuweisung|Beschreibung|
|-------|---------|------------|
|status|reading:wert:text:level:color|definiert welcher **Statustext** im PanelItem angezeigt wird. Weiterhin mit welcher **Farbe** und mit welchem **Level** der Status in dem *Kreis* angezeigt wird.|
|status|reading:wert:text:level:color:invert|definiert welcher **Statustext** im PanelItem angezeigt wird. Weiterhin mit welcher **Farbe** und mit welchem **Level** der Status in dem *Kreis* angezeigt wird. Bei Angabe von invert wird *level* invertiert|
|min|number|(optional) legt den minimalen Wert für **Level** fest. *Standard: 0* |
|max|number|(optional) legt den maximalen Wert für **Level** fest. *Standard: 100* |
|btn|reading:wert:icon (alternativ: icon)|definiert welches *Icon* auf der Taste im PanelItem angezeigt wird. Icon Bibliothek [siehe](https://materialdesignicons.com/)|
|click|reading:wert:cmd|defniert welches FHEM-Kommando bei Klick auf die Taste abgesendet wird. *Hinweis:* `set <devicename>` kann weggelassen werden|
|link|<route>|link kann alternativ zu click verwendet werden. In diesem Fall wird kein FHEM-Kommando gesendet sondern man kann auf einen anderen Screen in **FHEMApp** wechseln. Die *route* muss mit **/devices/** beginnen. Am besten schaut ihr euch dazu vorher die URL in **FHEMApp** auf den gewünschten Screen an.|
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fhemapp",
"version": "3.13.5",
"version": "3.14.0",
"private": true,
"author": "jemu75",
"scripts": {
Expand Down
9 changes: 7 additions & 2 deletions src/components/TemplDefault.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,9 @@
size: 'col-12 col-sm-6 col-md-4 col-lg-4',
status: {
bar: [],
error: []
error: [],
min: 0,
max: 100
},
main: [
{
Expand Down Expand Up @@ -336,7 +338,10 @@
computed: {
getLevel() {
return this.vals.status.invert ? 100 - this.vals.status.level : this.vals.status.level;
let steps = 100 / (this.setup.status.max - this.setup.status.min);
let level = (this.vals.status.level - this.setup.status.min) * steps;
return this.vals.status.invert ? 100 - level : level;
}
},
Expand Down
15 changes: 12 additions & 3 deletions src/components/TemplPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@
size: 'col-12 col-sm-6 col-md-6 col-lg-6',
status: {
bar: [],
error: []
error: [],
min: 0,
max: 100
},
info: {
left1: [],
Expand Down Expand Up @@ -190,7 +192,10 @@
computed: {
getLevel() {
return this.vals.status.invert ? 100 - this.vals.status.level : this.vals.status.level;
let steps = 100 / (this.setup.status.max - this.setup.status.min);
let level = (this.vals.status.level - this.setup.status.min) * steps;
return this.vals.status.invert ? 100 - level : level;
}
},
Expand Down Expand Up @@ -282,6 +287,10 @@
let btn = this.$fhem.handleVals(obj, this.$fhem.getEl(obj, 'Options', 'panel', 'btn')) || [];
let cmd = this.$fhem.handleVals(obj, this.$fhem.getEl(obj, 'Options', 'panel', 'click')) || [];
let menu = this.$fhem.getEl(obj, 'Options', 'panel', 'menu') || [];
let min = this.$fhem.getEl(obj, 'Options', 'panel', 'min') || 0;
let max = this.$fhem.getEl(obj, 'Options', 'panel', 'max') || 100;
let steps = 100 / (max - min);
let level = ((state[1] || 0) - min) * steps;
let menuItems = [];
if(menu.length > 0) {
Expand All @@ -295,7 +304,7 @@
device: device,
title: title,
text: state[0] || '',
level: state[1] || 0,
level: state[3] ? 100 - level : level,
color: state[2] || 'success',
icon: btn[0] || '',
route: route,
Expand Down
13 changes: 12 additions & 1 deletion src/components/TemplSysmon.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
>
<v-progress-linear
height="7"
:value="vals.status.level"
:value="getLevel"
:color="vals.status.color"
background-color="secondary darken-1"
/>
Expand Down Expand Up @@ -149,6 +149,8 @@
status: {
bar: [],
error: [],
min: 0,
max: 100
},
subTitle: [],
main: [],
Expand Down Expand Up @@ -191,6 +193,15 @@
updateDialog: false
}),
computed: {
getLevel() {
let steps = 100 / (this.setup.status.max - this.setup.status.min);
let level = (this.vals.status.level - this.setup.status.min) * steps;
return this.vals.status.invert ? 100 - level : level;
}
},
watch: {
item: {
immediate: true,
Expand Down
2 changes: 1 addition & 1 deletion www/fhemapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -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-28a3f15f.fc346ba4.css" rel="prefetch"><link href="css/chunk-3c9d184f.1bbdaac2.css" rel="prefetch"><link href="css/chunk-46bea2ee.1bbdaac2.css" rel="prefetch"><link href="css/chunk-50f89d12.b490d9b1.css" rel="prefetch"><link href="css/chunk-53c4ff2a.9398bfa8.css" rel="prefetch"><link href="css/chunk-72c6e8d8.d4bef30a.css" rel="prefetch"><link href="css/chunk-dc5178fa.cb4d0868.css" rel="prefetch"><link href="css/chunk-dd03e16c.cb4d0868.css" rel="prefetch"><link href="css/chunk-ecd3142c.86805334.css" rel="prefetch"><link href="js/chunk-03454508.94b22464.js" rel="prefetch"><link href="js/chunk-07709945.536f8338.js" rel="prefetch"><link href="js/chunk-085bcd30.fce1ca94.js" rel="prefetch"><link href="js/chunk-15fa718e.8e403831.js" rel="prefetch"><link href="js/chunk-21b07e80.b3f882b2.js" rel="prefetch"><link href="js/chunk-28a3f15f.fd07f95d.js" rel="prefetch"><link href="js/chunk-2d0aa92c.855dd2bf.js" rel="prefetch"><link href="js/chunk-2d212bf1.e377c778.js" rel="prefetch"><link href="js/chunk-3c9d184f.28dc459c.js" rel="prefetch"><link href="js/chunk-46bea2ee.99e1909a.js" rel="prefetch"><link href="js/chunk-50f89d12.d065ef66.js" rel="prefetch"><link href="js/chunk-53c4ff2a.a3ca272e.js" rel="prefetch"><link href="js/chunk-72c6e8d8.c00175b8.js" rel="prefetch"><link href="js/chunk-dc5178fa.4891b2bc.js" rel="prefetch"><link href="js/chunk-dd03e16c.f4db6a88.js" rel="prefetch"><link href="js/chunk-ecd3142c.0688a723.js" rel="prefetch"><link href="css/chunk-vendors.95431e8e.css" rel="preload" as="style"><link href="js/app.c5a09590.js" rel="preload" as="script"><link href="js/chunk-vendors.b9a283db.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.b9a283db.js"></script><script src="js/app.c5a09590.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-28a3f15f.fc346ba4.css" rel="prefetch"><link href="css/chunk-3c9d184f.1bbdaac2.css" rel="prefetch"><link href="css/chunk-46bea2ee.1bbdaac2.css" rel="prefetch"><link href="css/chunk-50f89d12.b490d9b1.css" rel="prefetch"><link href="css/chunk-53c4ff2a.9398bfa8.css" rel="prefetch"><link href="css/chunk-72c6e8d8.d4bef30a.css" rel="prefetch"><link href="css/chunk-dc5178fa.cb4d0868.css" rel="prefetch"><link href="css/chunk-dd03e16c.cb4d0868.css" rel="prefetch"><link href="css/chunk-ecd3142c.86805334.css" rel="prefetch"><link href="js/chunk-03454508.94b22464.js" rel="prefetch"><link href="js/chunk-07709945.536f8338.js" rel="prefetch"><link href="js/chunk-085bcd30.fce1ca94.js" rel="prefetch"><link href="js/chunk-15fa718e.8e403831.js" rel="prefetch"><link href="js/chunk-21b07e80.b3f882b2.js" rel="prefetch"><link href="js/chunk-28a3f15f.fd07f95d.js" rel="prefetch"><link href="js/chunk-2d0aa92c.7d33fe93.js" rel="prefetch"><link href="js/chunk-2d212bf1.e377c778.js" rel="prefetch"><link href="js/chunk-3c9d184f.28dc459c.js" rel="prefetch"><link href="js/chunk-46bea2ee.6683ba22.js" rel="prefetch"><link href="js/chunk-50f89d12.d065ef66.js" rel="prefetch"><link href="js/chunk-53c4ff2a.a3ca272e.js" rel="prefetch"><link href="js/chunk-72c6e8d8.c00175b8.js" rel="prefetch"><link href="js/chunk-dc5178fa.a575fd7b.js" rel="prefetch"><link href="js/chunk-dd03e16c.f4db6a88.js" rel="prefetch"><link href="js/chunk-ecd3142c.0688a723.js" rel="prefetch"><link href="css/chunk-vendors.95431e8e.css" rel="preload" as="style"><link href="js/app.403e4342.js" rel="preload" as="script"><link href="js/chunk-vendors.b9a283db.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.b9a283db.js"></script><script src="js/app.403e4342.js"></script></body></html>
2 changes: 1 addition & 1 deletion www/fhemapp/js/app.c5a09590.js → www/fhemapp/js/app.403e4342.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 033dcf8

Please sign in to comment.