Fix n-th child misalignment after thead causing confusion there.

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

index 03382554e2dbfc538aca8107777ed15ee789546c..5926db0c1cc6a61bd445b6d482dd549057bcee23 100755 (executable)
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -131,16 +131,24 @@ for i in range(len(sorted_dates)):
  
  # Optimized for web browser viewing.
  if output_type == 'html':
-    print("""<html>
+    print("""<!DOCTYPE html>
+<html>
+<head>
  <style>
-table, tr, th, td { border: 1px solid black; }
-.day_row:nth-child(7n+2) { background-color: yellow; }
+table, tr, th, td { border: 1px solid black; text-align: center; }
+.day_row:nth-child(7n+1) { background-color: yellow; }
  .district_name { writing-mode: vertical-rl; transform: rotate(180deg); }
+.bonus_data th { font-weight: normal; }
+.new_infections { font-weight: bold; }
+thead th { position: sticky; top: 0; background-color: white; }
  </style>
-<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>
+<title>Berlin's Corona infection numbers, development by districts</title>
+</head>
+<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>
+<thead>
  <tr>
  <th>date</th>""")
      sorted_dates.reverse()
@@ -150,8 +158,11 @@ table, tr, th, td { border: 1px solid black; }
          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="district_name">%s</div></th>' % long_form)
      print('</tr>')
+    print('</thead>')
      for date in sorted_dates:
          print('<tr class="day_row">')
          print('<td>%s</td>' % date)
@@ -160,7 +171,7 @@ table, tr, th, td { border: 1px solid black; }
          long_winc = translate['winc']
          for district in sorted_districts:
              district_data = db[district][date]
-            week_sum = week_avg = week_inc = ''
+            week_sum = week_avg = week_inc = '(not enough data)'
              new_infections = district_data['new_infections']
              if 'week_sum' in district_data:
                  week_sum = '%s' % district_data['week_sum']
@@ -169,15 +180,16 @@ 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 open><summary></summary><table>')
-            else:
-                print('<details><summary></summary><table>')
+            print('<span class="new_infections">%s</span>' % new_infections)
+            if district != sum_district:
+                print('<details><summary></summary>')
+            print('<table class="bonus_data">')
              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('</table>')
+            if district != sum_district:
+                print('</details>')
              print('</td>')
          print('</tr>')
      print('</table>')
@@ -189,7 +201,7 @@ elif output_type == 'txt':
      # Explain what this is.
      intro = \
  """Table of Berlin's Corona infection number development by districts.
-Updated daily around 9pm.
+Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
  
  Abbrevations/explanations:
  """