v.3.30.3

jemu75 · Mar 18, 2022 · c091d7c · c091d7c
1 parent 91c8b0d
commit c091d7c
Show file tree

Hide file tree

Showing 14 changed files with 122 additions and 55 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhemapp",
-  "version": "3.30.2",
+  "version": "3.30.3",
   "private": true,
   "author": "jemu75",
   "scripts": {

diff --git a/public/cfg/templ_shellyswitch_mqtt.json b/public/cfg/templ_shellyswitch_mqtt.json
@@ -0,0 +1,25 @@
+{
+  "name": "shellyswitch_mqtt",
+  "author": "jemu75",
+  "date": "2022-03-18",
+  "status": {
+    "bar": ["state:on:100:success","state:off:0:success"],
+    "error": ["network:^(?!<html>connected):100:error:keine Verbindung"]
+  },
+  "main": [
+    {
+      "leftBtn": "mdi-power-off",
+      "leftClick": ["state::off"],
+      "text": ["state:on:an","state:off:aus"],
+      "rightBtn": "mdi-power-on",
+      "rightClick": ["state::on"]
+    }
+  ],
+  "info": {
+    "left1": ["state:on::mdi-power-plug","state:::mdi-power-plug-off"],
+    "left2": ["relay_0_power:0.1:%n.2w"],
+    "mid1": ["tmp_tC::%n.1°C"],
+    "right1": ["new_fw:true::mdi-cloud-download"],
+    "right2": ["wifi_sta_connected:true::mdi-wifi","network:::mdi-wifi-off"]
+  }
+}
diff --git a/src/components/TemplSysmon.vue b/src/components/TemplSysmon.vue
@@ -20,54 +20,71 @@
         />
       </v-card-title>
       <v-divider />
-      <v-card-subtitle>
-        {{ vals.subTitle }}
-      </v-card-subtitle>
-
-      <v-card-text>
-        <v-row>
-          <v-col
-            v-for="itm of vals.list"
-            :key="itm.name"
-            class="col-12 col-md-4 col-lg-4"
+
+      <div v-if="!item.Options.status.isActive">
+        <v-card-text>
+          <v-row align="center">
+            <v-col align="center">
+              <div class="headline font-weight-bold">
+                {{ item.Options.status.error }}
+              </div>
+            </v-col>
+          </v-row>
+        </v-card-text>
+        <v-divider />
+      </div>
+
+      <div v-if="item.Options.status.isActive">
+        <v-card-subtitle>
+          {{ vals.subTitle }}
+        </v-card-subtitle>
+
+        <v-card-text>
+          <v-row>
+            <v-col
+              v-for="itm of vals.list"
+              :key="itm.name"
+              class="col-12 col-md-4 col-lg-4"
+            >
+              <div class="text-truncate">
+                {{ itm.name }}
+              </div>
+              <v-progress-linear
+                v-if="itm.isBar"
+                height="7"
+                :value="itm.value"
+                :color="itm.color"
+                :min="itm.min"
+                :max="itm.max"
+                background-color="secondary lighten-4"
+              />
+              <div>{{ itm.subText }}</div>
+            </v-col>
+          </v-row>
+        </v-card-text>
+        <v-card-actions v-if="setup.fhemBtns">
+          <v-btn
+            class="mr-2"
+            @click="goTo()"
           >
-            <div class="text-truncate">
-              {{ itm.name }}
-            </div>
-            <v-progress-linear
-              v-if="itm.isBar"
-              height="7"
-              :value="itm.value"
-              :color="itm.color"
-              :min="itm.min"
-              :max="itm.max"
-              background-color="secondary lighten-4"
-            />
-            <div>{{ itm.subText }}</div>
-          </v-col>
-        </v-row>
-      </v-card-text>
-      <v-card-actions v-if="setup.fhemBtns">
-        <v-btn
-          class="mr-2"
-          @click="goTo()"
-        >
-          <v-icon>mdi-format-list-bulleted</v-icon>
-        </v-btn>
-        <v-spacer />
-        <v-btn
-          :disabled="!update"
-          @click="fhemUpdate"
-        >
-          {{ updateText }}
-        </v-btn>
-        <v-btn
-          :disabled="!restart"
-          @click="fhemRestart"
-        >
-          {{ $t('templates.sysmon.restartBtn') }}
-        </v-btn>
-      </v-card-actions>
+            <v-icon>mdi-format-list-bulleted</v-icon>
+          </v-btn>
+          <v-spacer />
+          <v-btn
+            :disabled="!update"
+            @click="fhemUpdate"
+          >
+            {{ updateText }}
+          </v-btn>
+          <v-btn
+            :disabled="!restart"
+            @click="fhemRestart"
+          >
+            {{ $t('templates.sysmon.restartBtn') }}
+          </v-btn>
+        </v-card-actions>
+      </div>
+
       <v-divider />
       <v-system-bar color="secondary darken-1">
         <v-icon class="ml-0">

diff --git a/www/fhemapp/cfg/templ_shellyswitch_mqtt.json b/www/fhemapp/cfg/templ_shellyswitch_mqtt.json
@@ -0,0 +1,25 @@
+{
+  "name": "shellyswitch_mqtt",
+  "author": "jemu75",
+  "date": "2022-03-18",
+  "status": {
+    "bar": ["state:on:100:success","state:off:0:success"],
+    "error": ["network:^(?!<html>connected):100:error:keine Verbindung"]
+  },
+  "main": [
+    {
+      "leftBtn": "mdi-power-off",
+      "leftClick": ["state::off"],
+      "text": ["state:on:an","state:off:aus"],
+      "rightBtn": "mdi-power-on",
+      "rightClick": ["state::on"]
+    }
+  ],
+  "info": {
+    "left1": ["state:on::mdi-power-plug","state:::mdi-power-plug-off"],
+    "left2": ["relay_0_power:0.1:%n.2w"],
+    "mid1": ["tmp_tC::%n.1°C"],
+    "right1": ["new_fw:true::mdi-cloud-download"],
+    "right2": ["wifi_sta_connected:true::mdi-wifi","network:::mdi-wifi-off"]
+  }
+}
diff --git a/www/fhemapp/css/524.8ecd64f4.css → www/fhemapp/css/997.8ecd64f4.css b/www/fhemapp/css/524.8ecd64f4.css → www/fhemapp/css/997.8ecd64f4.css
diff --git a/www/fhemapp/index.html b/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><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.0ed506fb.js"></script><link href="css/chunk-vendors.9d4b34aa.css" rel="stylesheet"><link href="css/app.3de6559d.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.99ac0801.js" nomodule></script></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></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><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.027d1bd1.js"></script><link href="css/chunk-vendors.9d4b34aa.css" rel="stylesheet"><link href="css/app.3de6559d.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.b6a92ef8.js" nomodule></script></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></body></html>
diff --git a/www/fhemapp/js/320-legacy.363319ed.js → www/fhemapp/js/320-legacy.be5fa758.js b/www/fhemapp/js/320-legacy.363319ed.js → www/fhemapp/js/320-legacy.be5fa758.js
diff --git a/www/fhemapp/js/320.14e9d509.js → www/fhemapp/js/320.2ba04f2e.js b/www/fhemapp/js/320.14e9d509.js → www/fhemapp/js/320.2ba04f2e.js
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><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.0ed506fb.js"></script><link href="css/chunk-vendors.9d4b34aa.css" rel="stylesheet"><link href="css/app.3de6559d.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.99ac0801.js" nomodule></script></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></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><script defer="defer" type="module" src="js/chunk-vendors.38de9a7d.js"></script><script defer="defer" type="module" src="js/app.027d1bd1.js"></script><link href="css/chunk-vendors.9d4b34aa.css" rel="stylesheet"><link href="css/app.3de6559d.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.bb1050dc.js" nomodule></script><script defer="defer" src="js/app-legacy.b6a92ef8.js" nomodule></script></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></body></html>