Remove redundant sum_district assignments.

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

index c2ea18d658abfa5e764d7f1c59d38e2448e7609c..2410099c2e3c72a07acb450a1e441ec47b980c46 100755 (executable)
--- 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,6 +135,7 @@ if output_type == '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; }
@@ -149,10 +150,6 @@ if output_type == 'html':
  <tr>
  <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]
          # Wrap in div because the vertical orientation otherwise fails
@@ -170,10 +167,10 @@ if output_type == 'html':
          print('<tr class="day_row">')
          print('<td>%s</td>' % date)
          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('<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]
@@ -211,7 +208,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)
@@ -220,7 +216,6 @@ HTML view: https://plomlompom.com/berlin_corona.html
      # separated into 7-day units.
      sorted_dates.reverse()
      weekday_count = 0
-    sum_district = sorted_districts[-1]
      for date in sorted_dates:
  
          # Week table header.