Skip to content

Commit

Permalink
V3.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jemu75
jemu75 committed Apr 9, 2021
1 parent ffe68ba commit 919c8ab
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
header: ''
}
},
version: 'v3.8.0', // Datum in Header, Hamburger immer da -> back button ausgebaut
version: 'v3.8.1',
status: {
color: 'secondary',
icon: 'mdi-circle',
Expand Down
8 changes: 5 additions & 3 deletions src/plugins/fhem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ export default class Fhem extends EventEmitter {

// mainfunction, Format Date and Time from FHEM
getDateTime(val) {
let timestamp = val ? val : (new Date);
let timestamp = val ? val : new Date().toISOString();

return new Date(timestamp).toLocaleString('de-DE', { dateStyle: 'short', timeStyle: 'medium' }).replace(',','');
return new Date(timestamp.replace(' ','T')).toLocaleString('de-DE', { dateStyle: 'short', timeStyle: 'medium' }).replace(',','');
}

// mainfunction get element from deep nested objects
Expand Down Expand Up @@ -338,8 +338,10 @@ export default class Fhem extends EventEmitter {
if(defSet[i].match('%i') && chkNum) {
let inc = parseFloat(defSet[i].split('%i')[1]);
if(inc != 'isNaN') {
let isDecimal = inc.toString().split('.')[1] || '';
let decimal = isDecimal.length;
let newVal = parseFloat(state.slice(chkNum.index)) + inc;
val = defSet[i].replace('%i' + inc, newVal);
val = defSet[i].replace('%i' + inc, newVal.toFixed(decimal));
}
}

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-085bcd30.01cf6fd8.css" rel="prefetch"><link href="css/chunk-098d33d4.61e1e199.css" rel="prefetch"><link href="css/chunk-0c00f6a2.460ac60a.css" rel="prefetch"><link href="css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="css/chunk-225a9a68.288ff701.css" rel="prefetch"><link href="css/chunk-27250ed3.55c011d2.css" rel="prefetch"><link href="css/chunk-2c05d556.cb4d0868.css" rel="prefetch"><link href="css/chunk-4034692a.0df12065.css" rel="prefetch"><link href="css/chunk-58038582.55c011d2.css" rel="prefetch"><link href="css/chunk-72c6e8d8.8d89ed40.css" rel="prefetch"><link href="css/chunk-96c51cba.a8205ada.css" rel="prefetch"><link href="css/chunk-d584b056.4c33e4ab.css" rel="prefetch"><link href="js/chunk-03454508.24dbacbb.js" rel="prefetch"><link href="js/chunk-085bcd30.81f15153.js" rel="prefetch"><link href="js/chunk-098d33d4.5726246b.js" rel="prefetch"><link href="js/chunk-0c00f6a2.2f161139.js" rel="prefetch"><link href="js/chunk-15fa718e.7a2c6eb5.js" rel="prefetch"><link href="js/chunk-225a9a68.093a2e75.js" rel="prefetch"><link href="js/chunk-27250ed3.fe26b469.js" rel="prefetch"><link href="js/chunk-2c05d556.843edd83.js" rel="prefetch"><link href="js/chunk-2d212bf1.8735e89e.js" rel="prefetch"><link href="js/chunk-2d22937e.25120a02.js" rel="prefetch"><link href="js/chunk-4034692a.f27c222f.js" rel="prefetch"><link href="js/chunk-58038582.fc7957fc.js" rel="prefetch"><link href="js/chunk-72c6e8d8.c00175b8.js" rel="prefetch"><link href="js/chunk-96c51cba.d799cc05.js" rel="prefetch"><link href="js/chunk-d584b056.82929027.js" rel="prefetch"><link href="css/chunk-vendors.95431e8e.css" rel="preload" as="style"><link href="js/app.44d737f1.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.44d737f1.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-085bcd30.01cf6fd8.css" rel="prefetch"><link href="css/chunk-098d33d4.61e1e199.css" rel="prefetch"><link href="css/chunk-0c00f6a2.460ac60a.css" rel="prefetch"><link href="css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="css/chunk-225a9a68.288ff701.css" rel="prefetch"><link href="css/chunk-27250ed3.55c011d2.css" rel="prefetch"><link href="css/chunk-2c05d556.cb4d0868.css" rel="prefetch"><link href="css/chunk-4034692a.0df12065.css" rel="prefetch"><link href="css/chunk-58038582.55c011d2.css" rel="prefetch"><link href="css/chunk-72c6e8d8.8d89ed40.css" rel="prefetch"><link href="css/chunk-96c51cba.a8205ada.css" rel="prefetch"><link href="css/chunk-d584b056.4c33e4ab.css" rel="prefetch"><link href="js/chunk-03454508.24dbacbb.js" rel="prefetch"><link href="js/chunk-085bcd30.81f15153.js" rel="prefetch"><link href="js/chunk-098d33d4.5726246b.js" rel="prefetch"><link href="js/chunk-0c00f6a2.2f161139.js" rel="prefetch"><link href="js/chunk-15fa718e.7a2c6eb5.js" rel="prefetch"><link href="js/chunk-225a9a68.093a2e75.js" rel="prefetch"><link href="js/chunk-27250ed3.fe26b469.js" rel="prefetch"><link href="js/chunk-2c05d556.843edd83.js" rel="prefetch"><link href="js/chunk-2d212bf1.8735e89e.js" rel="prefetch"><link href="js/chunk-2d22937e.25120a02.js" rel="prefetch"><link href="js/chunk-4034692a.f27c222f.js" rel="prefetch"><link href="js/chunk-58038582.fc7957fc.js" rel="prefetch"><link href="js/chunk-72c6e8d8.c00175b8.js" rel="prefetch"><link href="js/chunk-96c51cba.d799cc05.js" rel="prefetch"><link href="js/chunk-d584b056.82929027.js" rel="prefetch"><link href="css/chunk-vendors.95431e8e.css" rel="preload" as="style"><link href="js/app.40475fc1.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.40475fc1.js"></script></body></html>
1 change: 1 addition & 0 deletions www/fhemapp/js/app.40475fc1.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion www/fhemapp/js/app.44d737f1.js
View file

This file was deleted.

0 comments on commit 919c8ab

Please sign in to comment.