Changeset 9125727

Timestamp:

Nov 20, 2014, 10:51:40 PM (9 years ago)

Author:

njw <njw@…>

Branches:

master

Children:

adb0f52

Parents:

4fd0ab9

Message:

Corrected calculation of year consumption

File:

• de.wigbels.ruby/hothotwrite/hhw.rb (modified) (4 diffs)

de.wigbels.ruby/hothotwrite/hhw.rb

@@ -53 +53 @@
     log.info("Inserted sensor: #{sensorid} with data: #{data}")
   else
+    years = dbh.query( %Q"select count(distinct year(measuredat)) FROM sensor" )
+    put years
     # Auswertung Gesamtes Jahr, Monat, Vergleich Vorjahr
     myquery = %Q{ select sum(data), 'Liter Verbrauch in #{month}-#{logyear}' \
@@ -70 +72 @@
                   where year(measuredat) = '#{yearbefore}'
                   union
-                  select truncate(avg(data),2), 'Durchschnittsverbrauch Gesamtjahr Liter/Tag' \
+                  select truncate(avg(data)/#{years},2), 'Durchschnittsverbrauch Gesamtjahr Liter/Tag' \
                   from \
                     (select sum(data) as data from sensor \
@@ -76 +78 @@
                   as foo
                   union
-                  select truncate(avg(data),2), 'Durchschnittsverbrauch Sommmer Liter/Tag' \
+                  select truncate(avg(data)/#{years},2), 'Durchschnittsverbrauch Sommmer Liter/Tag' \
                   from \
                     (select sum(data) as data from sensor \
@@ -83 +85 @@
                   as foo
                   union
-                  select truncate(avg(data),2), 'Durchschnittsverbrauch Winter Liter/Tag' \
+                  select truncate(avg(data)/#{years},2), 'Durchschnittsverbrauch Winter Liter/Tag' \
                   from \
                     (select sum(data) as data from sensor \