X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=enhance_table.py;h=25fcd08048705eab18309283ec51d39a5d716a91;hb=8b643b326d04387f4903008cbeab89b3a9a6adb7;hp=8d0fd335ec2c62e077bb3b34fcd47f10920adb30;hpb=7c0bea9a26a3e3a5466f1a75d41f4a48d2106ac2;p=berlin-corona-table

diff --git a/enhance_table.py b/enhance_table.py
index 8d0fd33..25fcd08 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -135,35 +135,49 @@ if output_type == 'html':
 <html>
 <head>
 <style>
-table, tr, th, td { border: 1px solid black; }
-.day_row:nth-child(7n+2) { background-color: yellow; }
-.district_name { writing-mode: vertical-rl; transform: rotate(180deg); }
+.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>Table of Berlin's Corona infection number development by districts</title>
+<title>Berlin's Corona infection numbers, development by districts</title>
 </head>
-<h1>Table of Berlin's Corona infection number development by districts</h1>
-<p>Updated daily at 9pm. <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>
+<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>date</th>""")
+<th colspan=2></th>""")
     sorted_dates.reverse()
+    long_wsum = translate['wsum']
+    long_wavg = translate['wavg']
+    long_winc = translate['winc']
     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:
-            print('<th class="district_name">%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>')
     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">+</abbr></th></tr>')
+        print('<tr><th><abbr title="%s">Î£</abbr></th></tr>' % long_wsum)
+        print('<tr><th><abbr title="%s">Ã</abbr></th></tr>' % long_wavg)
+        print('<tr><th><abbr title="%s">i</abbr></th></tr>' % long_winc)
+        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']
@@ -172,16 +186,12 @@ table, tr, th, td { border: 1px solid black; }
             if 'week_incidence' in district_data:
                 week_inc = '%.1f' % district_data['week_incidence']
             print('<td>')
-            print(new_infections)
-            if district != sum_district:
-                print('<details><summary></summary>')
             print('<table>')
-            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('<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>')
@@ -193,7 +203,7 @@ elif output_type == 'txt':
     # Explain what this is.
     intro = \
 """Table of Berlin's Corona infection number development by districts.
-Updated daily at 9pm.
+Updated daily at 9pm based on data from the "Senatsverwaltung fÃ¼r Gesundheit, Pflege und Gleichstellung".
 
 Abbrevations/explanations:
 """
