From a74c52dc16b8f79f32b088d5db7b034038ef329a Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Mon, 6 Jul 2020 20:40:22 +0200 Subject: [PATCH] Use '?' for lack of data for 7-day values in TXT version too. --- enhance_table.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/enhance_table.py b/enhance_table.py index f442524..e5cf8d3 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -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 -- 2.30.2