X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=28c472eeeda95650488700c8b4384c3cae7e4d44;hp=f44252463130075d456b6faf0d593b8144528c10;hb=a2f73f130d45247e0097278f0c1388583bf18986;hpb=3cde66c0f3ccba038fb9098a5552f79e0e75ea15

diff --git a/enhance_table.py b/enhance_table.py
index f442524..28c472e 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -150,7 +150,7 @@ th { text-align: left; vertical-align: bottom; }
 </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">Plain text view (optimized for terminal curl)</a>.</p>
+<p>Updated daily at 7pm 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>""")
@@ -216,7 +216,7 @@ 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".
+Updated daily at 7pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
 
 Abbrevations/explanations:
 """
@@ -243,22 +243,27 @@ HTML view: https://plomlompom.com/berlin_corona.html"""
         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