X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=7be6b2986cd361d104c6526e1a5e60cd7927cefe;hp=c5c11c22bfe1d52518243e13a279ad800c77301d;hb=4b3850e78196c23f4d361ea65dc8346ff578bc52;hpb=dc7fd6818afda18eb8e2d0c8c99af29ccf3655c1

diff --git a/enhance_table.py b/enhance_table.py
index c5c11c2..7be6b29 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -134,22 +134,24 @@ for i in range(len(sorted_dates)):
         db[district][date]['week_incidence'] = (week_sum / district_pop) * 100000
 
 # Optimized for web browser viewing.
+import calendar
 if output_type == 'html':
     print("""<!DOCTYPE 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; }
+.repeated_head th { padding-top: 0.5em; border-bottom: 1px solid black; }
 .bold { font-weight: bold }
+.date { vertical-align: top; padding-top: 0.5em; }
 </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><del>Updated daily at 7pm based on data from the "Senatsverwaltung fÃ¼r Gesundheit, Pflege und Gleichstellung".</del> Updates currently inactive â check out <a href="https://www.berlin.de/corona/lagebericht/desktop/corona.html#bezirke">the new dashboard</a> instead that they offer by themselves.</p>
+<p><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,17 +162,19 @@ 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)
+        weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+        print('<td class="date">%s<br />%s</td>' % (date, weekday))
         print('<td><table>')
         for abbr in ['+', 'Î£', 'Ã', 'i']:
             print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
@@ -195,6 +199,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>')
@@ -209,7 +217,8 @@ elif output_type == 'txt':
     # Explain what this is.
     intro = \
 """Table of Berlin's Corona infection number development by districts.
-Updated daily at 9pm based on data from the "Senatsverwaltung fÃ¼r Gesundheit, Pflege und Gleichstellung".
+NO LONGER Updated daily at 7pm based on data from the "Senatsverwaltung fÃ¼r Gesundheit, Pflege und Gleichstellung".
+Currently inactive. Instead check out the new dashboard they offer: https://www.berlin.de/corona/lagebericht/desktop/corona.html#bezirke
 
 Abbrevations/explanations:
 """
@@ -233,24 +242,30 @@ HTML view: https://plomlompom.com/berlin_corona.html"""
             print('-'*77)
 
         # Day table.
-        print(date)
+        weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+        print('%s (%s)' % (date, weekday))
         new_infections = []
-        weekly_sums = []
-        weekly_avgs = []
-        weekly_incs = []
+        weekly_sum_strings = []
+        weekly_avg_strings = []
+        weekly_inc_strings = []
         for district in sorted_districts:
             district_day_data = db[district][date]
             new_infections += [district_day_data['new_infections']]
+            wsum_string = ' '*3 + '?'
+            wavg_string = winc_string = ' '*4 + '?'
             if 'week_sum' in district_day_data:
-                weekly_sums += [district_day_data['week_sum']]
+                wsum_string = '%4s' % district_day_data['week_sum']
+            weekly_sum_strings += [wsum_string]
             if 'week_average' in district_day_data:
-                weekly_avgs += [district_day_data['week_average']]
+                wavg_string = '%5.1f' % district_day_data['week_average']
+            weekly_avg_strings += [wavg_string]
             if 'week_incidence' in district_day_data:
-                weekly_incs += [district_day_data['week_incidence']]
+                winc_string = '%5.1f' % district_day_data['week_incidence']
+            weekly_inc_strings += [winc_string]
         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]))
-        print('i', ' '*9, ''.join(['%5.1f' % winc for winc in weekly_incs]))
+        print('Î£', ' '*10, ' '.join(weekly_sum_strings))
+        print('Ã', ' '*9, ''.join(weekly_avg_strings))
+        print('i', ' '*9, ''.join(weekly_inc_strings))
         weekday_count += 1
         if weekday_count != 7:
             continue
