Use '?' for lack of data for 7-day values in TXT version too.

[berlin-corona-table] / enhance_table.py

diff --git a/enhance_table.py b/enhance_table.py
index 7fe22b3cf04195dff574a14084b6f71b165c7ce6..e5cf8d39828bd5d94ae9f1a51960f0bb3613fcd9 100755 (executable)
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -144,6 +144,7 @@ th { text-align: left; vertical-align: bottom; }
 .vertical_header { writing-mode: vertical-rl; transform: rotate(180deg); font-weight: normal; }
 .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>
@@ -172,7 +173,7 @@ th { text-align: left; vertical-align: bottom; }
             print('</tr>')
         print('<tr class="day_row">')
         weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
-        print('<td>%s<br />%s</td>' % (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>' %
@@ -242,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