From e6be25b3405089e7e2d905c906f172e7d7e02442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Runden?= <br@runden.net>
Date: Wed, 21 Dec 2022 23:25:24 +0100
Subject: [PATCH] =?UTF-8?q?db=20update=20f=C3=BCr=20KW=20Zahlen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore             |  1 +
 exportwochensummen.sql | 12 ++++++++
 mailCSVDump.sh         |  7 +++++
 viewcreate.sql         | 67 ++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 exportwochensummen.sql

diff --git a/.gitignore b/.gitignore
index f050136..766faa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ energiemon_*.csv
 energiemon_*.csv.utf
 csv/*
 energiemon.db--
+energiemon.BAK.db
diff --git a/exportwochensummen.sql b/exportwochensummen.sql
new file mode 100644
index 0000000..ecb31b3
--- /dev/null
+++ b/exportwochensummen.sql
@@ -0,0 +1,12 @@
+/*.open energiemon.db*/
+.mode csv
+.separator ';'
+.header on
+
+select KW
+    ,   replace (gasKWhSum,'.',',') as gasKWhSum
+    ,   replace (stromKWhSum,'.',',') as stromKWhSum
+    ,   replace (wasserQmSum,'.',',') as wasserQmSum
+    ,   replace (gasfaktor,'.',',') as gasfaktor
+from vwochensummen ;
+
diff --git a/mailCSVDump.sh b/mailCSVDump.sh
index bf58b55..fd1bba7 100755
--- a/mailCSVDump.sh
+++ b/mailCSVDump.sh
@@ -53,6 +53,13 @@ CSVDUMP=$CSVSUBDIR/${DATEN}_${TODAY}.csv
 $SQLITE3 $DATABQL < $SQLTXTFILE > $CSVDUMP
 toWin $CSVDUMP
 
+#wochensummen
+DATEN=wochensummen
+SQLTXTFILE=$CWD/export${DATEN}.sql
+CSVDUMP=$CSVSUBDIR/${DATEN}_${TODAY}.csv
+$SQLITE3 $DATABQL < $SQLTXTFILE > $CSVDUMP
+toWin $CSVDUMP
+
 echo -en "Hallo zusammen, \nAnbei die Zählerdaten \n" \
         "von https://enermon.chmln.de \n\n"\
         "Viele Grüße von der ChamäleonCloud \n\n" | \
diff --git a/viewcreate.sql b/viewcreate.sql
index 9c58382..3f81447 100644
--- a/viewcreate.sql
+++ b/viewcreate.sql
@@ -188,7 +188,6 @@ from vwasserroh
 group by mon
 ;
 
-
 -- ------------------------------------------------------------------------------
 -- ------------------------------------------------------------------------------
 -- ------------------------------------------------------------------------------
@@ -203,4 +202,68 @@ SELECT w.mon, w.wasserQmSum, s.stromKWhSum, g.gasKWhSum
 FROM vwassersum as w
 left join vstromsum as s on w.mon = s.mon
 left join vgassum as g on w.mon = g.mon
-; 
\ No newline at end of file
+; 
+
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+DROP VIEW if EXISTS vgasweeksum ;
+CREATE VIEW vgasweeksum as
+
+select 
+cast ( strftime('%Y%W' ,zeitpunkt) as INTEGER )  as KW
+,round ( sum(gasvolumen  ),3) * max(gasfaktor) as gasKWhSum
+,max(gasfaktor) as gasfaktor
+from vgasroh
+group by KW;
+
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+DROP VIEW if EXISTS vstromweeksum ;
+CREATE VIEW vstromweeksum as
+
+select 
+cast ( strftime('%Y%W' ,zeitpunkt) as INTEGER )  as KW
+,round ( sum(stromverzehr ),3) as stromKWhSum
+
+from vstromroh
+group by KW;
+
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+
+DROP VIEW if exists "main"."vwasserweeksum";
+CREATE VIEW vwasserweeksum as
+
+select 
+cast ( strftime('%Y%W' ,zeitpunkt) as INTEGER )  as KW
+
+,round ( sum(wasserverbrauch ),3) as wasserQmSum
+
+from vwasserroh
+group by KW
+
+
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+-- ------------------------------------------------------------------------------
+
+
+DROP VIEW if EXISTS "main"."vwochensummen";
+CREATE VIEW vwochensummen as 
+
+SELECT w.KW, w.wasserQmSum, s.stromKWhSum, g.gasKWhSum, g.gasfaktor
+
+FROM vwasserweeksum as w
+left join vstromweeksum as s on w.KW = s.KW
+left join vgasweeksum as g on w.KW = g.KW
\ No newline at end of file