X-Git-Url: https://plomlompom.com/repos/do_day?a=blobdiff_plain;f=enhance_table.py;h=785e231a681b8f0862fa206eeaf1fc80c7c42faf;hb=27d911cf01028ff3e2fe9f87b453f3e34222adae;hp=0482bdfbffbf8fe0e89bb174454b04f561318a92;hpb=5252dee46a33cce9616ba4e4103b59dba2ec44c1;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 0482bdf..785e231 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,6 +32,9 @@ translate = {
'TS': 'Tempelhof-Schöneberg',
'TK': 'Treptow-Köpenick',
'sum': 'all of Berlin',
+ 'wsum': 'sum 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',
}
# Read infections table path and output type.
@@ -131,17 +134,24 @@ if output_type == 'html':
print('')
print('')
print('
')
print('')
print('date | ')
for district in sorted_districts:
- print('%s | ' % district)
+ long_form = translate[district]
+ print('%s | ' % long_form)
print('
')
sorted_dates.reverse()
+ sum_district = sorted_districts[-1]
for date in sorted_dates:
print('')
print('%s | ' % date)
+ long_wsum = translate['wsum']
+ long_wavg = translate['wavg']
+ long_winc = translate['winc']
for district in sorted_districts:
district_data = db[district][date]
week_sum = week_avg = week_inc = ''
@@ -153,12 +163,15 @@ if output_type == 'html':
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print('')
- print('new | %s | ' % new_infections)
- print('wsum | %s | ' % week_sum)
- print('wavg | %s | ' % week_avg)
- print('winc | %s | ' % week_inc)
- print(' ')
+ print(new_infections)
+ if district == sum_district:
+ print('
')
+ else:
+ print('
')
+ print('%s | %s | ' % (long_wsum, week_sum))
+ print('%s | %s | ' % (long_wavg, week_avg))
+ print('%s | %s | ' % (long_winc, week_inc))
+ print(' ')
print('')
print('')
print(' ')
@@ -176,10 +189,7 @@ Abbrevations/explanations:
"""
for k in translate:
intro += "%s: %s\n" % (k, translate[k])
- intro += """wsum: sum 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
-
+ intro += """
Source code: https://plomlompom.com/repos/?p=berlin-corona-table
"""
print(intro)
|