X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=enhance_table.py;h=4a060a4b758a654ee5593662cf0f66386e037bf1;hb=fca28d3ad3def405de5853c253e0ef130eb41fdc;hp=f8add4efe2bcfaca4989785621323042b0f22982;hpb=671f45cc4eb274e3d102bce10985134988003323;p=berlin-corona-table

diff --git a/enhance_table.py b/enhance_table.py
index f8add4e..4a060a4 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -95,13 +95,13 @@ 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.
+# In LaGeSo's data, the last "district" is actually the sum of all districts /
+# the whole of Berlin.  For our district order, move it in front of the other
+# districts, as its numbers are the most interesting, so in the table views
+# we want to see it first.
 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.
-#
 # Fail on any day where the "sum" district's new infections are not the proper
 # sum of the individual districts new infections.  Yes, sometimes Lageso sends
 # data that is troubled in this way.  It will then have to be fixed manually in
@@ -140,16 +140,15 @@ if output_type == '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; }
+.repeated_head th { padding-top: 0.5em; border-bottom: 1px solid black; }
 .bold { font-weight: bold }
 </style>
 <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>
+<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">Plain text view (optimized for terminal curl)</a>.</p>
 <table>
 <tr>
 <th colspan=2></th>""")
@@ -160,15 +159,16 @@ th { text-align: left; vertical-align: bottom; }
         print('<th><div class="vertical_header">%s</div></th>' %
               translate[district])
     print('</tr>')
-    print('<tr class="fixed_head">')
-    # In Chromium, the th only stay fixed if also given this class.
-    print('<th class="fixed_head">date</th>')
-    print('<th class="fixed_head"><a href="#symbols">?</a></th>')
-    for district in sorted_districts:
-        print('<th class="fixed_head"><abbr title="%s">%s</abbr></th>' %
-              (translate[district], district))
-    print('</tr>')
+    weekday_count = 0
     for date in sorted_dates:
+        if weekday_count == 0:
+            print('<tr class="repeated_head">')
+            print('<th>date</th>')
+            print('<th><a href="#symbols">?</a></th>')
+            for district in sorted_districts:
+                print('<th><abbr title="%s">%s</abbr></th>' %
+                      (translate[district], district))
+            print('</tr>')
         print('<tr class="day_row">')
         print('<td>%s</td>' % date)
         print('<td><table>')
@@ -195,6 +195,10 @@ th { text-align: left; vertical-align: bottom; }
             print('</table>')
             print('</td>')
         print('</tr>')
+        weekday_count += 1
+        if weekday_count != 7:
+            continue
+        weekday_count = 0
     print('</table>')
     print('<h3 id="symbols">Symbols</h3>')
     print('<dl>')
@@ -239,10 +243,14 @@ HTML view: https://plomlompom.com/berlin_corona.html"""
         weekly_avgs = []
         weekly_incs = []
         for district in sorted_districts:
-            new_infections += [db[district][date]['new_infections']]
-            weekly_sums += [db[district][date]['week_sum']]
-            weekly_avgs += [db[district][date]['week_average']]
-            weekly_incs += [db[district][date]['week_incidence']]
+            district_day_data = db[district][date]
+            new_infections += [district_day_data['new_infections']]
+            if 'week_sum' in district_day_data:
+                weekly_sums += [district_day_data['week_sum']]
+            if 'week_average' in district_day_data:
+                weekly_avgs += [district_day_data['week_average']]
+            if 'week_incidence' in district_day_data:
+                weekly_incs += [district_day_data['week_incidence']]
         print('+', ' '*11, '  '.join(['%3s' % i for i in new_infections]))
         print('Î£', ' '*10, ' '.join(['%4s' % wsum for wsum in weekly_sums]))
         print('Ã', ' '*9, ''.join(['%5.1f' % wavg for wavg in weekly_avgs]))
