From 15078e431bc826110aa93dd78af7b60f132671ab Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sat, 4 Jul 2020 02:15:59 +0200 Subject: [PATCH] Use single-digit symbols in both HTML and TXT versions. --- enhance_table.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/enhance_table.py b/enhance_table.py index 5287c03..07ad84b 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -32,9 +32,9 @@ translate = { 'TS': 'Tempelhof-Schöneberg', 'TK': 'Treptow-Köpenick', 'sum': 'all of Berlin', - 'wsum': 'sum of new infections for last 7 days', - 'wavg': 'per-day average of new infections for last 7 days', - 'winc': 'incidence (x per 100k inhabitants) of new infections for last 7 days', + 'Σ': 'sum of new infections for last 7 days', + 'Ø': 'per-day average of new infections for last 7 days', + 'i': 'incidence (x per 100k inhabitants) of new infections for last 7 days', } # Read infections table path and output type. @@ -170,8 +170,8 @@ th { text-align: left; vertical-align: bottom; } print('') print('%s' % date) print('') - print('') - for abbr in ['wsum', 'wavg', 'winc']: + print('') + for abbr in ['Σ', 'Ø', 'i']: print('' % (translate[abbr], abbr)) print('
new
+
%s
') @@ -224,7 +224,7 @@ HTML view: https://plomlompom.com/berlin_corona.html # Week table header. if weekday_count == 0: print(' '*10, ' '.join(sorted_districts), - 'wsum', ' wavg', 'winc') + ' Σ', ' Ø', ' i') week_start_date = date # Day data line. @@ -259,8 +259,8 @@ HTML view: https://plomlompom.com/berlin_corona.html weekly_incs += [db[district][week_start_date]['week_incidence']] print() print('district stats for week from %s to %s:' % (date, week_start_date)) - print(' '*7, ' '.join(sorted_districts[1:])) - print('wsum', ' '.join(['%5.1f' % wsum for wsum in weekly_sums])) - print('wavg', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs])) - print('winc', ' '.join(['%5.1f' % winc for winc in weekly_incs])) + print(' '*4, ' '.join(sorted_districts[1:])) + print('Σ', ' '.join(['%5.1f' % wsum for wsum in weekly_sums])) + print('Ø', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs])) + print('i', ' '.join(['%5.1f' % winc for winc in weekly_incs])) print() -- 2.30.2