X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=enhance_table.py;h=7da699dfdee9cc1feab083c05113942085aa1d08;hb=707cfa7c1b642936ba94feb1be2d7a071bc0cdcf;hp=acbebc6b950905cab22a247a42010b69a15c166a;hpb=5ece867536877574b33064933504740484e08797;p=berlin-corona-table

diff --git a/enhance_table.py b/enhance_table.py
index acbebc6..7da699d 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,6 +32,9 @@ translate = {
   'TS': 'Tempelhof-SchÃ¶neberg',
   'TK': 'Treptow-KÃ¶penick',
   'sum': 'all of Berlin',
+  'wsum': 'sum of new infections for last 7 days',
+  'wavg': 'per-day average of new infections for last 7 days',
+  'winc': 'incidence (x per 100k inhabitants) of new infections for last 7 days',
 }
 
 # Read infections table path and output type.
@@ -128,25 +131,51 @@ for i in range(len(sorted_dates)):
 
 # Optimized for web browser viewing.
 if output_type == 'html':
-    print('<html>')
-    print('<style>')
-    print('table, tr, th, td { border: 1px solid black; }')
-    print('</style>')
-    print('<table>')
-    print('<tr>')
-    print('<th>date</th>')
+    print("""<!DOCTYPE html>
+<html>
+<head>
+<style>
+th { text-align: left; vertical-align: bottom; }
+.day_row:nth-child(7n+3) > td { border-top: 1px solid black; }
+.vertical_header { writing-mode: vertical-rl; transform: rotate(180deg); font-weight: normal; }
+.fixed_head { position: sticky; top: 0; background-color: white; }
+.bold { font-weight: bold }
+</style>
+<title>Berlin's Corona infection numbers, development by districts</title>
+</head>
+<a href="/">home</a> Â· <a href="/contact.html">contact</a> Â· <a href="/privacy.html">privacy</a>
+<h1>Berlin's Corona infection numbers, development by districts</h1>
+<p>Updated daily at 9pm based on data from the "Senatsverwaltung fÃ¼r Gesundheit, Pflege und Gleichstellung". <a href="https://plomlompom.com/repos/?p=berlin-corona-table">Source code</a>. <a href="berlin_corona.txt">Text view optimized for terminal curl</a>.</p>
+<table>
+<tr>
+<th colspan=2></th>""")
+    sorted_dates.reverse()
+    sum_district = sorted_districts[-1]
     for district in sorted_districts:
         long_form = translate[district]
-        print('<th style="writing-mode: vertical-rl; '
-              'transform: rotate(180deg);">%s</th>' % long_form)
+        # Wrap in div because the vertical orientation otherwise fails
+        # in Chromium.
+        print('<th><div class="vertical_header">%s</div></th>' % long_form)
+    print('</tr>')
+    print('<tr class="fixed_head">')
+    # In Chromium, the th only stay fixed if also given this class.
+    print('<th class="fixed_head">date</th>')
+    print('<th class="fixed_head"></th>')
+    for district in sorted_districts:
+        print('<th class="fixed_head">%s</th>' % district)
     print('</tr>')
-    sorted_dates.reverse()
     for date in sorted_dates:
-        print('<tr>')
+        print('<tr class="day_row">')
         print('<td>%s</td>' % date)
+        print('<td><table>')
+        print('<tr><th><abbr title="new infections counted">new</abbr></th></tr>')
+        for abbr in ['wsum', 'wavg', 'winc']:
+            print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
+                  (translate[abbr], abbr))
+        print('</table></td>')
         for district in sorted_districts:
             district_data = db[district][date]
-            week_sum = week_avg = week_inc = ''
+            week_sum = week_avg = week_inc = '?'
             new_infections = district_data['new_infections']
             if 'week_sum' in district_data:
                 week_sum = '%s' % district_data['week_sum']
@@ -156,10 +185,10 @@ if output_type == 'html':
                 week_inc = '%.1f' % district_data['week_incidence']
             print('<td>')
             print('<table>')
-            print('<tr><th>new</th><td>%s</td></tr>' % new_infections)
-            print('<tr><th>wsum</th><td>%s</td></tr>' % week_sum)
-            print('<tr><th>wavg</th><td>%s</td></tr>' % week_avg)
-            print('<tr><th>winc</th><td>%s</td></tr>' % week_inc)
+            print('<tr><td class="bold">%s</td></tr>' % new_infections)
+            print('<tr><td>%s</td></tr>' % week_sum)
+            print('<tr><td>%s</td></tr>' % week_avg)
+            print('<tr><td>%s</td></tr>' % week_inc)
             print('</table>')
             print('</td>')
         print('</tr>')
@@ -172,17 +201,15 @@ elif output_type == 'txt':
     # Explain what this is.
     intro = \
 """Table of Berlin's Corona infection number development by districts.
-Updated daily around 9pm.
+Updated daily at 9pm based on data from the "Senatsverwaltung fÃ¼r Gesundheit, Pflege und Gleichstellung".
 
 Abbrevations/explanations:
 """
     for k in translate:
         intro += "%s: %s\n" % (k, translate[k])
-    intro += """wsum: sum for last 7 days
-wavg: per-day average of new infections for last 7 days
-winc: incidence (x per 100k inhabitants) of new infections for last 7 days
-
+    intro += """
 Source code: https://plomlompom.com/repos/?p=berlin-corona-table
+HTML view: https://plomlompom.com/berlin_corona.html
 """
     print(intro)
 
