Remove summary string from HTML table.

[berlin-corona-table] / enhance_table.py
diff --git a/enhance_table.py b/enhance_table.py

index 0482bdfbffbf8fe0e89bb174454b04f561318a92..0b30d216f5105d66391251659427caa7903f316a 100755 (executable)
--- 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,17 +134,23 @@ if output_type == 'html':
      print('<html>')
      print('<style>')
      print('table, tr, th, td { border: 1px solid black; }')
+    print('tr:nth-child(7n+2) td { background-color: yellow; }')
      print('</style>')
      print('<table>')
      print('<tr>')
      print('<th>date</th>')
      for district in sorted_districts:
-        print('<th>%s</th>' % district)
+        long_form = translate[district]
+        print('<th style="writing-mode: vertical-rl; '
+              'transform: rotate(180deg);">%s</th>' % long_form)
      print('</tr>')
      sorted_dates.reverse()
      for date in sorted_dates:
          print('<tr>')
          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 = ''
@@ -153,12 +162,12 @@ 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)
+            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>')
@@ -176,10 +185,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)