X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/5c7ebd0e18a0d09e517518f15a283dc0ac8cd3ef..7c05a3e46921f5dfb74a337d66f469d13b6ad3a2:/web/seepark_web.py

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 131489b..b899a17 100644
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -30,6 +30,15 @@ MONTH_DE = [
     'November',
     'Dezember']
 
+DAY_OF_WEEK_DE = [
+    'Montag',
+    'Dienstag',
+    'Mittwoch',
+    'Donnerstag',
+    'Freitag',
+    'Samstag',
+    'Sonntag']
+
 
 # https://stackoverflow.com/a/37350445
 def sqlalchemy_model_to_dict(model):
@@ -305,29 +314,56 @@ def report(year, month):
 
     begin = datetime.datetime(year, month, 1)
     end = add_month(begin)
-    data = list(select_sensordata_grouped(mainsensor, 'Wassertemperatur', begin, end))
-    x = [d.timestamp for d in data]
-    y = [d.value for d in data]
+    data = list(select_sensordata(mainsensor, 'Wassertemperatur', begin, end))
+    x = np.array([d.timestamp for d in data])
+    y = np.array([d.value for d in data])
 
     days_datetime = []
     d = begin
     while d < end:
         days_datetime.append(d)
         d = d + datetime.timedelta(1)
-    days_str = [d.strftime('%d') for d in days_datetime]
 
     binary_pdf = io.BytesIO()
     with PdfPages(binary_pdf) as pdf:
-        a4 = (21./2.54, 29.7/2.54)
+        a4 = (29.7/2.54, 21./2.54)
+        title = 'Seepark Wassertemperatur {} {}'.format(MONTH_DE[begin.month-1], begin.year)
+        report_times = [datetime.time(10), datetime.time(15)]
+
+        # graphic
         plt.figure(figsize=a4)
         plt.plot(x, y)
-        plt.xticks(days_datetime, days_str, rotation='vertical')
-        plt.xlabel('Tag')
-        plt.ylabel('Temparatur in °C')
+        plt.xticks(days_datetime, [''] * len(days_datetime))
+        plt.ylabel('Temperatur in °C')
         plt.axis(xmin=begin, xmax=end)
         plt.grid()
-        title = 'Seepark Wassertemperatur {} {}'.format(MONTH_DE[begin.month-1], begin.year)
         plt.title(title)
+
+        # table
+        columns = []
+        for d in days_datetime:
+            columns.append('{}.'.format(d.day))
+        rows = []
+        for t in report_times:
+            rows.append('Wasser {:02d}:{:02d} °C'.format(t.hour, t.minute))
+        cells = []
+        for t in report_times:
+            columns.append('{}.'.format(d.day))
+            row_cells = []
+            for d in days_datetime:
+                report_datetime = datetime.datetime.combine(d.date(), t)
+                closest_index = np.argmin(np.abs(x - report_datetime))
+                if abs(x[closest_index] - report_datetime) > datetime.timedelta(hours=1):
+                    cell = 'N/A'
+                else:
+                    value = y[closest_index]
+                    cell = '{:.1f}'.format(value)
+                row_cells.append(cell)
+            cells.append(row_cells)
+        table = plt.table(cellText=cells, colLabels=columns, rowLabels=rows, loc='bottom')
+        table.scale(xscale=1, yscale=2)
+        plt.title(title)
+        plt.subplots_adjust(left=0.15, right=0.97, bottom=0.3)  # do not cut row labels
         pdf.savefig()
 
         pdf_info = pdf.infodict()