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

diff --git a/enhance_table.py b/enhance_table.py
index acbebc6..66614c3 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 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.
@@ -131,19 +134,28 @@ if output_type == 'html':
     print('<html>')
     print('<style>')
     print('table, tr, th, td { border: 1px solid black; }')
+    print('.day_row:nth-child(7n+2) { background-color: yellow; }')
+    print('.district_name { writing-mode: vertical-rl; '
+          'transform: rotate(180deg); }')
     print('</style>')
     print('<table>')
     print('<tr>')
     print('<th>date</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)
+        if sum_district == district:
+            print('<th>%s</th>' % long_form)
+        else:
+            print('<th class="district_name">%s</th>' % long_form)
     print('</tr>')
-    sorted_dates.reverse()
     for date in sorted_dates:
-        print('<tr>')
+        print('<tr class="day_row">')
         print('<td>%s</td>' % date)
+        long_wsum = translate['wsum']
+        long_wavg = translate['wavg']
+        long_winc = translate['winc']
         for district in sorted_districts:
             district_data = db[district][date]
             week_sum = week_avg = week_inc = ''
@@ -155,12 +167,15 @@ if output_type == 'html':
             if 'week_incidence' in district_data:
                 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('</table>')
+            print(new_infections)
+            if district == sum_district:
+                print('<details open><summary></summary><table>')
+            else:
+                print('<details><summary></summary><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('</table></details>')
             print('</td>')
         print('</tr>')
     print('</table>')
@@ -178,10 +193,7 @@ 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
 """
     print(intro)
