stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some small changes for sensor consmuption (closes #72)

Browse source
This commit is contained in:
Steffen Vogel 2011-06-26 22:08:53 +02:00
parent 50d8ef16b6
commit 5e2950a455
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
htdocs/frontend/index.html
View file

@ -20,12 +20,13 @@
<script type="text/javascript" src="javascripts/flot/jquery.flot.crosshair.js"></script> <script type="text/javascript" src="javascripts/flot/jquery.flot.crosshair.js"></script>
<script type="text/javascript" src="javascripts/flot/jquery.flot.selection.js"></script> <script type="text/javascript" src="javascripts/flot/jquery.flot.selection.js"></script>
<script type="text/javascript" src="javascripts/helper.js"></script>
<script type="text/javascript" src="javascripts/init.js"></script> <script type="text/javascript" src="javascripts/init.js"></script>
<script type="text/javascript" src="javascripts/entity.js"></script> <script type="text/javascript" src="javascripts/options.js"></script>
<script type="text/javascript" src="javascripts/functions.js"></script>
<script type="text/javascript" src="javascripts/entities.js"></script> <script type="text/javascript" src="javascripts/entities.js"></script>
<script type="text/javascript" src="javascripts/wui.js"></script> <script type="text/javascript" src="javascripts/wui.js"></script>
<script type="text/javascript" src="javascripts/helper.js"></script> <script type="text/javascript" src="javascripts/entity.js"></script>
<script type="text/javascript" src="javascripts/functions.js"></script>
<link rel="stylesheet" type="text/css" href="stylesheets/ui-lightness/jquery-ui-1.8.10.css" /> <link rel="stylesheet" type="text/css" href="stylesheets/ui-lightness/jquery-ui-1.8.10.css" />
<link rel="stylesheet" type="text/css" href="stylesheets/jquery.treeTable.css"> <link rel="stylesheet" type="text/css" href="stylesheets/jquery.treeTable.css">

10
htdocs/frontend/javascripts/entity.js
View file

@ -218,7 +218,7 @@ Entity.prototype.getDOMRow = function(parent) {
$('#entity-' + entity.uuid + ((parent) ? '.child-of-entity-' + parent.uuid : '') + ' input[type=checkbox]') $('#entity-' + entity.uuid + ((parent) ? '.child-of-entity-' + parent.uuid : '') + ' input[type=checkbox]')
.attr('checked', state); .attr('checked', state);
entity.active = state; entity.active = state;
}); }, true); // recursive!
vz.wui.drawPlot(); vz.wui.drawPlot();
}) })
@ -287,11 +287,9 @@ Entity.prototype.updateDOMRow = function() {
$('.last', row) $('.last', row)
.text(vz.wui.formatNumber(this.data.tuples.last()[1], true) + this.definition.unit); .text(vz.wui.formatNumber(this.data.tuples.last()[1], true) + this.definition.unit);
if (this.definition.interpreter == 'Volkszaehler\\Interpreter\\MeterInterpreter') { // sensors have no consumption $('.consumption', row)
$('.consumption', row) .text(vz.wui.formatNumber(this.data.consumption, true) + this.definition.unit + 'h')
.text(vz.wui.formatNumber(this.data.consumption, true) + this.definition.unit + 'h') .attr('title', vz.wui.formatNumber(this.data.consumption * (year/delta), true) + this.definition.unit + 'h' + '/Jahr');
.attr('title', vz.wui.formatNumber(this.data.consumption * (year/delta), true) + this.definition.unit + 'h' + '/Jahr');
}
if (this.cost) { if (this.cost) {
$('.cost', row) $('.cost', row)

2
htdocs/frontend/javascripts/options.js
View file

@ -66,7 +66,7 @@ vz.options.plot = {
hoverable: true, hoverable: true,
autoHighlight: false autoHighlight: false
} }
} };
vz.options.saveCookies = function() { vz.options.saveCookies = function() {
for (var key in vz.options) { for (var key in vz.options) {

6
lib/Interpreter/SensorInterpreter.php
View file

@ -73,7 +73,8 @@ class SensorInterpreter extends Interpreter {
*/ */
public function getAverage() { public function getAverage() {
if ($consumption = $this->getConsumption()) { if ($consumption = $this->getConsumption()) {
return (3600 * 1000 * $consumption) / ($this->last[0] - $this->first[0]); $delta = $this->last[0] - $this->first[0];
return (3600 * 1000 * $consumption) / $delta;
} }
else { // prevents division by zero else { // prevents division by zero
return 0; return 0;
@ -108,6 +109,9 @@ class SensorInterpreter extends Interpreter {
$last = $next; $last = $next;
$next = $data->next(); $next = $data->next();
} }
$this->first = reset($tuples);
$this->last = end($tuples);
return $tuples; return $tuples;
} }