From 5a1ca48f67af46d8145f5993c27ad33e4bf22067 Mon Sep 17 00:00:00 2001 From: jjk1 <37013673+jjk4@users.noreply.github.com> Date: Sun, 20 Jun 2021 09:21:45 +0200 Subject: [PATCH 1/4] =?UTF-8?q?SDM=20630=20hinzugef=C3=BCgt=20und=20Bugfix?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/header.php | 1 + app/visu/header.php | 1 + config.json | 2 +- configuration.php | 57 ++++++++++++++++++++++++++++++++++++++--- header.php | 1 + install.sh | 6 +++++ jquery.js | 2 ++ sdm630.py | 38 +++++++++++++++++++++++++++ submitconfiguration.php | 21 ++++++++++++++- visu/header.php | 1 + 10 files changed, 125 insertions(+), 5 deletions(-) create mode 100644 jquery.js create mode 100644 sdm630.py diff --git a/app/header.php b/app/header.php index 34ea1da..711b22d 100644 --- a/app/header.php +++ b/app/header.php @@ -3,6 +3,7 @@ <?=$site_name?> - Energiezählerapp + diff --git a/app/visu/header.php b/app/visu/header.php index 6130867..028fc49 100644 --- a/app/visu/header.php +++ b/app/visu/header.php @@ -4,6 +4,7 @@ +

- Energiezähler

diff --git a/config.json b/config.json index 41f7c52..509cb83 100644 --- a/config.json +++ b/config.json @@ -1 +1 @@ -{"host":"192.168.178.198","port":"8086","database":"energietest","zaehler":{"pv_garage":{"displayname":"PV Garage","unit":"kWh","type":"manual"},"wasser":{"displayname":"Wasser","unit":"m\u00b3","type":"manual"},"strom":{"displayname":"Strom","unit":"kWh","type":"manual"},"heizung":{"displayname":"Heizung","unit":"kWh","type":"manual"},"garten":{"displayname":"Garten","unit":"kWh","type":"manual"},"lueftung_heizraum":{"displayname":"L\u00fcftung Heizraum","unit":"kWh","type":"manual"},"display_flur":{"displayname":"Display Flur","unit":"kWh","type":"manual"},"pv_haus":{"displayname":"PV Haus","unit":"kWh","type":"manual"}}} \ No newline at end of file +{"host":"192.168.178.198","port":"8086","database":"energietest","installationpath":"\/var\/www\/energie","zaehler":{"pv_garage":{"displayname":"PV Garage","unit":"kWh","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"l1"},"wasser":{"displayname":"Wasser","unit":"m\u00b3","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"l1"},"strom":{"displayname":"Strom","unit":"kWh","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"l1"},"heizung":{"displayname":"Heizung","unit":"kWh","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"l1"},"garten":{"displayname":"Garten","unit":"kWh","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"l1"},"lueftung_heizraum":{"displayname":"L\u00fcftung Heizraum","unit":"kWh","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"l1"},"display_flur":{"displayname":"Display Flur","unit":"kWh","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"l1"},"pv_haus":{"displayname":"PV Haus","unit":"kWh","type":"manual","sdm630_usb":"","sdm630_id":"","sdm630_counter":"all"},"heizung_modbus":{"displayname":"Heizung Modbus","unit":"kWh","type":"sdm630","sdm630_usb":"\/dev\/ttyUSB0","sdm630_id":"1","sdm630_counter":"all"}}} \ No newline at end of file diff --git a/configuration.php b/configuration.php index f8d8f9e..e12a65d 100644 --- a/configuration.php +++ b/configuration.php @@ -22,6 +22,10 @@

+

Energiezählereinstellungen

+

Zählereinstellungen

@@ -31,6 +35,10 @@ foreach ($config['zaehler'] as $key => $value) { $displayname = $value['displayname']; $unit = $value['unit']; + $type = $value['type']; + $sdm630_usb = $value['sdm630_usb']; + $sdm630_id = $value['sdm630_id']; + $sdm630_counter = $value['sdm630_counter']; echo "
@@ -43,9 +51,27 @@ - + + +
+
+
+
+ +
@@ -66,7 +92,32 @@ function addCounter() { document.getElementById("neu").style.display = 'block'; document.getElementById("add").style.display = 'none'; - } + }; + $( document ).ready(function() { + $value) { + echo " + if (document.getElementById('" . $key . "_type').value == 'sdm630'){ + $(\"." . $key . "_sdm630\").show(); + } else if (this.value == 'manual'){ + $(\"." . $key . "_sdm630\").hide(); + }"; + } + ?> + }); + $value) { + echo "$(\"." . $key . "_sdm630\").hide(); + let sel_" . $key . " = document.getElementById('" . $key . "_type'); + sel_" . $key . ".addEventListener ('change', function () { + if (this.value == 'sdm630'){ + $(\"." . $key . "_sdm630\").show(); + } else if (this.value == 'manual'){ + $(\"." . $key . "_sdm630\").hide(); + } + });"; + } + ?> diff --git a/header.php b/header.php index fd0fd02..5006f98 100644 --- a/header.php +++ b/header.php @@ -3,6 +3,7 @@ <?=$site_name?> - Energiezähler + diff --git a/install.sh b/install.sh index 22e25b2..f74ec8a 100644 --- a/install.sh +++ b/install.sh @@ -55,6 +55,8 @@ fi #Installation starten echo -e "${GREEN}Installiere Abhängigkeiten...${NC}" apt-get install git sudo python3-pip +pip3 install minimalmodbus +pip3 install influxdb echo -e "${GREEN}Installiere Webserver...${NC}" apt-get install apache2 php -y echo -e "${GREEN}Lade Energiezähler herunter...${NC}" @@ -62,6 +64,10 @@ git clone https://github.com/jjk4/energiezaehler.git /var/www/html$installationp echo -e "${GREEN}Richte Energiezähler ein...${NC}" chown -R www-data:www-data /var/www/html$installationpath chmod 775 -R /var/www/html$installationpath +touch /etc/cron.d/energiezaehler +chown root:root /etc/cron.d/energiezaehler +chmod 755 /etc/cron.d/energiezaehler +usermod -a -G dialout www-data if [ $databasetype != 'entfernt' ] then echo -e "${GREEN}Installiere Datenbank...${NC}" diff --git a/jquery.js b/jquery.js new file mode 100644 index 0000000..c4c6022 --- /dev/null +++ b/jquery.js @@ -0,0 +1,2 @@ +/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="
",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 $value) { - $new_configuration["zaehler"][$key] = array('displayname' => $_GET[$key . "_displayname"], 'unit' => $_GET[$key . "_unit"], 'type' => $_GET[$key . "_type"]); + $new_configuration["zaehler"][$key] = array( 'displayname' => $_GET[$key . "_displayname"], + 'unit' => $_GET[$key . "_unit"], + 'type' => $_GET[$key . "_type"], + 'sdm630_usb' => $_GET[$key . "_sdm630_usb"], + 'sdm630_id' => $_GET[$key . "_sdm630_id"], + 'sdm630_counter' => $_GET[$key . "_sdm630_counter"], + ); if ($_GET[$key . "_delete"] == "on") unset($new_configuration["zaehler"][$key]); }; @@ -18,6 +26,17 @@ //var_dump($new_configuration); exec ("mv config.json config.json.old"); file_put_contents("config.json",json_encode($new_configuration)); + #Crontab erstellen + fwrite( $crontab, "00 12 * * * www-data php " . $new_configuration["installationpath"] . "/add_values.php\n" ); #Zwischenberechnungen + #auszulesende Zähler: + foreach ($new_configuration['zaehler'] as $key => $value) { + if ($value["type"] == "sdm630") { + fwrite( $crontab, "* 00 * * * www-data python3 " . $new_configuration["installationpath"] . "/sdm630.py " . $new_configuration['host'] . " " . $new_configuration['port'] . " " . $new_configuration['database'] . " " . $key . " " . $value['sdm630_counter'] . " " . $value['sdm630_usb'] . " " . $value['sdm630_id'] . "\n"); + }; + + }; + + fclose( $crontab ); ?>
Die Einstellungen wurden gespeichert. Zurück diff --git a/visu/header.php b/visu/header.php index 500f00d..1cf0d9e 100644 --- a/visu/header.php +++ b/visu/header.php @@ -3,6 +3,7 @@ <?=$site_name?> - Energiezähler + From 07952c97011ecf936c631faf5525db89e6dcc060 Mon Sep 17 00:00:00 2001 From: jjk1 <37013673+jjk4@users.noreply.github.com> Date: Sun, 20 Jun 2021 09:25:30 +0200 Subject: [PATCH 2/4] kleiner fix --- install.sh | 4 +--- installation.php | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index f74ec8a..102d2ca 100644 --- a/install.sh +++ b/install.sh @@ -75,7 +75,5 @@ then fi echo -e "${GREEN}Richte Datenbank ein...${NC}" cd /var/www/html$installationpath/ -sudo -u www-data php installation.php $host $port $database -echo -e "${GREEN}Bitte füge die nachfolgende Zeile noch in die Datei /etc/crontab ein${NC}" -echo -e "${GREEN}00 12 * * * pi php /var/www/html$installationpath/add_values.php${NC}" +sudo -u www-data php installation.php $host $port $database "/var/www/html$installationpath" echo -e "${GREEN}Das wars. Dein Energiezähler ist jetzt betriebsbereit. Schau dir doch vor der Nutzung noch das Wiki unter https://github.com/jjk4/energiezaehler/wiki an. Bei Problemen kannst du gerne einen Issue unter https://github.com/jjk4/energiezaehler/issues erstellen. Viel Spaß!${NC}" diff --git a/installation.php b/installation.php index 0a72f5f..2ba9df8 100644 --- a/installation.php +++ b/installation.php @@ -3,6 +3,7 @@ $new_configuration['host'] = $argv[1]; $new_configuration['port'] = $argv[2]; $new_configuration['database'] = $argv[3]; + $new_configuration['installationpath'] = $argv[4]; $new_configuration['zaehler'] = $config['zaehler']; file_put_contents("config.json",json_encode($new_configuration)); ?> From 088ce61d7ac339a568283561908d1888c2d308d4 Mon Sep 17 00:00:00 2001 From: jjk1 <37013673+jjk4@users.noreply.github.com> Date: Sun, 20 Jun 2021 10:44:38 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Passwortschutz=20f=C3=BCr=20Datenbanken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Notizzettel.txt | 2 +- add_values.php | 4 +++- add_values.py | 4 ++-- app/submitinput.php | 4 +++- app/submitquery.php | 4 +++- app/visu/months.py | 6 +++--- app/visu/months_submit.php | 4 +++- app/visu/years.py | 6 +++--- app/visu/years_submit.php | 4 +++- config.json | 2 +- configuration.php | 6 ++++++ downloads/config-2021-06-20_10:13.json | 1 + energiesparkonto.py | 8 ++++---- input.py | 8 ++++---- install.sh | 1 + query.py | 8 ++++---- sdm630.py | 14 +++++++------- style.css | 7 +++++++ submitconfiguration.php | 14 ++++++++++---- submitinput.php | 4 +++- submitquery.php | 4 +++- visu/months.py | 6 +++--- visu/months_submit.php | 4 +++- visu/years.py | 6 +++--- visu/years_submit.php | 4 +++- zaehler_auslesen.sh | 1 + 26 files changed, 88 insertions(+), 48 deletions(-) create mode 100644 downloads/config-2021-06-20_10:13.json create mode 100644 zaehler_auslesen.sh diff --git a/Notizzettel.txt b/Notizzettel.txt index b136d21..243dd01 100644 --- a/Notizzettel.txt +++ b/Notizzettel.txt @@ -1,5 +1,5 @@ Python Skripte werden aufgerufen mit: -python3 file.py host port datenbank zaehler +python3 file.py host port datenbank benutzer passwort zaehler Haupt Datenbank in dev Datenbank kopieren: DROP DATABASE energietest diff --git a/add_values.php b/add_values.php index 84bd2a9..3ac7c00 100644 --- a/add_values.php +++ b/add_values.php @@ -2,8 +2,10 @@ $config = json_decode(file_get_contents('config.json'), true); $host = $config['host']; $port = $config['port']; + $username = $config['username']; + $password = $config['password']; $database = $config['database']; foreach ($config['zaehler'] as $key => $value) { - exec ("python3 add_values.py $host $port $database $key"); + exec ("python3 add_values.py $host $port $database $username $password $key"); }; ?> diff --git a/add_values.py b/add_values.py index 639979f..8a90960 100644 --- a/add_values.py +++ b/add_values.py @@ -8,10 +8,10 @@ #command = "touch \"" + str(sys.argv) + "\"" #os.system(command) maxdays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] -client = InfluxDBClient(host=str(sys.argv[1]), port=int(sys.argv[2])) +client = InfluxDBClient(host=str(sys.argv[1]), port=int(sys.argv[2]), username=str(sys.argv[4]), password=str(sys.argv[5])) client.switch_database(str(sys.argv[3])) -database = str(sys.argv[4]) +database = str(sys.argv[6]) month = 1 year = 2015 diff --git a/app/submitinput.php b/app/submitinput.php index 3220bf2..92b610d 100644 --- a/app/submitinput.php +++ b/app/submitinput.php @@ -14,10 +14,12 @@ $database = $config['database']; $host = $config['host']; $port = $config['port']; + $username = $config['username']; + $password = $config['password']; $zaehler = $_GET["zaehler"]; $datum = $_GET["datum"]; $wert = $_GET["wert"]; - exec ("python3 ../input.py $host $port $database $zaehler $datum $wert", $output); + exec ("python3 ../input.py $host $port $database $username $password $zaehler $datum $wert", $output); ?> diff --git a/app/submitquery.php b/app/submitquery.php index f4cef24..c37d868 100644 --- a/app/submitquery.php +++ b/app/submitquery.php @@ -14,10 +14,12 @@ $database = $config['database']; $host = $config['host']; $port = $config['port']; + $username = $config['username']; + $password = $config['password']; $zaehler = $_GET["zaehler"]; $startdatum = $_GET["startdatum"] . ":00Z"; $enddatum = $_GET["enddatum"] . ":00Z"; - echo shell_exec("python3 ../query.py $host $port $database $zaehler $startdatum $enddatum"); + echo shell_exec("python3 ../query.py $host $port $database $username $password $zaehler $startdatum $enddatum"); ?>
diff --git a/app/visu/months.py b/app/visu/months.py index a80a134..918a46c 100644 --- a/app/visu/months.py +++ b/app/visu/months.py @@ -5,13 +5,13 @@ from influxdb import InfluxDBClient import datetime -client = InfluxDBClient(host=str(sys.argv[1]), port=int(sys.argv[2])) +client = InfluxDBClient(host=str(sys.argv[1]), port=int(sys.argv[2]), username=str(sys.argv[4]), password=str(sys.argv[5])) client.switch_database(str(sys.argv[3])) dt = datetime.datetime.today() maxdays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] -database = str(sys.argv[5]) -year = sys.argv[4] +database = str(sys.argv[7]) +year = sys.argv[6] month = 1 all_values = [] diff --git a/app/visu/months_submit.php b/app/visu/months_submit.php index 1611dea..9c9fab0 100644 --- a/app/visu/months_submit.php +++ b/app/visu/months_submit.php @@ -3,6 +3,8 @@ $database = $config['database']; $host = $config['host']; $port = $config['port']; +$username = $config['username']; +$password = $config['password']; $zaehler = $_GET["database"]; ?> Zurück @@ -16,7 +18,7 @@ = '" + str(year) + "-01-01T00:00:00Z' and time <= '" + str(year) + "-12-31T23:59:59Z' tz('Europe/Berlin')") points = results.get_points diff --git a/app/visu/years_submit.php b/app/visu/years_submit.php index 5e147ce..38623e6 100644 --- a/app/visu/years_submit.php +++ b/app/visu/years_submit.php @@ -3,6 +3,8 @@ $database = $config['database']; $host = $config['host']; $port = $config['port']; +$username = $config['username']; +$password = $config['password']; $zaehler = $_GET["database"]; ?> Zurück @@ -19,7 +21,7 @@ Datenbank

+

+

Energiezählereinstellungen