Move sum_district to the left, as it's of more interest than others.

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

index c670739eb69c53f2ef9ce2b7e26a9300e9138424..4ce77925c91c985d1bfb177cb0d7ac5694d2d690 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',
  }
@@ -94,6 +94,10 @@ for line in lines[1:]:
          db[district][date] = {'new_infections': int(district_data)}
  sorted_dates.sort()
  
+# Define and move sum_district from end to start.
+sum_district = sorted_districts.pop()
+sorted_districts.insert(0, sum_district)
+
  # In LaGeSo's data, the last "district" is actually the sum of all districts /
  # the whole of Berlin.
  #
@@ -103,9 +107,8 @@ sorted_dates.sort()
  # the table file, since we should have a human look at what mistake was
  # probably made.
  for date in sorted_dates:
-    sum_district = sorted_districts[-1]
      day_sum = 0
-    for district in sorted_districts[:-1]:
+    for district in [d for d in sorted_districts if not d==sum_district]:
          day_sum += db[district][date]['new_infections']
      if day_sum != db[sum_district][date]['new_infections']:
          raise Exception('Questionable district infection sum in %s' % date)
@@ -135,6 +138,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 +153,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,14 +170,14 @@ 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]
-            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']
@@ -211,7 +211,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 +219,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.