X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=enhance_table.py;h=7da699dfdee9cc1feab083c05113942085aa1d08;hb=707cfa7c1b642936ba94feb1be2d7a071bc0cdcf;hp=6dbee7c1ceff06c04bb683852b751c26b7d616dd;hpb=26542fd87e874aa487752ae92395c68053b8e8b7;p=berlin-corona-table

diff --git a/enhance_table.py b/enhance_table.py
index 6dbee7c..7da699d 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,7 +32,7 @@ translate = {
   'TS': 'Tempelhof-SchÃ¶neberg',
   'TK': 'Treptow-KÃ¶penick',
   'sum': 'all of Berlin',
-  'wsum': 'sum for last 7 days',
+  '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',
 }
@@ -135,12 +135,11 @@ if output_type == 'html':
 <html>
 <head>
 <style>
-table, tr, th, td { border: 1px solid black; text-align: center; }
-.day_row:nth-child(7n+2) { background-color: yellow; }
-.district_name { writing-mode: vertical-rl; transform: rotate(180deg); }
-.bonus_data th { font-weight: normal; }
-.new_infections { font-weight: bold; }
-thead th { position: sticky; top: 0; background-color: white; }
+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>
@@ -148,30 +147,35 @@ thead th { position: sticky; top: 0; background-color: white; }
 <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>
-<thead>
 <tr>
-<th>date</th>""")
+<th colspan=2></th>""")
     sorted_dates.reverse()
     sum_district = sorted_districts[-1]
     for district in sorted_districts:
         long_form = translate[district]
-        if sum_district == district:
-            print('<th>%s</th>' % long_form)
-        else:
-            # Wrap in div because the vertical orientation otherwise fails
-            # in Chromium.
-            print('<th><div class="district_name">%s</div></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>')
-    print('</thead>')
     for date in sorted_dates:
         print('<tr class="day_row">')
         print('<td>%s</td>' % date)
-        long_wsum = translate['wsum']
-        long_wavg = translate['wavg']
-        long_winc = translate['winc']
+        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 = '(not enough data)'
+            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']
@@ -180,16 +184,12 @@ thead th { position: sticky; top: 0; background-color: white; }
             if 'week_incidence' in district_data:
                 week_inc = '%.1f' % district_data['week_incidence']
             print('<td>')
-            print('<span class="new_infections">%s</span>' % new_infections)
-            if district != sum_district:
-                print('<details><summary></summary>')
-            print('<table class="bonus_data">')
-            print('<tr><th>%s</th><td>%s</td></tr>' % (long_wsum, week_sum))
-            print('<tr><th>%s</th><td>%s</td></tr>' % (long_wavg, week_avg))
-            print('<tr><th>%s</th><td>%s</td></tr>' % (long_winc, week_inc))
+            print('<table>')
+            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>')
-            if district != sum_district:
-                print('</details>')
             print('</td>')
         print('</tr>')
     print('</table>')
@@ -209,7 +209,6 @@ Abbrevations/explanations:
         intro += "%s: %s\n" % (k, translate[k])
     intro += """
 Source code: https://plomlompom.com/repos/?p=berlin-corona-table
-
 HTML view: https://plomlompom.com/berlin_corona.html
 """
     print(intro)
