X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/do_day?a=blobdiff_plain;f=enhance_table.py;h=2410099c2e3c72a07acb450a1e441ec47b980c46;hb=f13581e13f5e699a54dc3d7b48efffbd149e1966;hp=105e1d52a6c1833ca9c8bb55fed8ed74db9e1289;hpb=110bcb27bfd9f6e4a8984ca205f8ddae1e146f26;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 105e1d5..2410099 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -32,7 +32,7 @@ translate = { 'TS': 'Tempelhof-Schöneberg', 'TK': 'Treptow-Köpenick', 'sum': 'all of Berlin', - 'wsum': 'sum for last 7 days', + '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', } @@ -131,36 +131,50 @@ for i in range(len(sorted_dates)): # Optimized for web browser viewing. if output_type == 'html': - print(""" + print(""" + +
-Updated daily at 9pm. Source code. Text view optimized for terminal curl.
+Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". Source code. Text view optimized for terminal curl.
date | """) +""") sorted_dates.reverse() - sum_district = sorted_districts[-1] for district in sorted_districts: long_form = translate[district] - if sum_district == district: - print(' | %s | ' % long_form) - else: - print('%s | ' % long_form) + # Wrap in div because the vertical orientation otherwise fails + # in Chromium. + print('%s | ' % long_form)
+ print('||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
date | ') + print('') + for district in sorted_districts: + print(' | %s | ' % district) print('||||||||||||
%s | ' % date) - long_wsum = translate['wsum'] - long_wavg = translate['wavg'] - long_winc = translate['winc'] + print('
| ')
for district in sorted_districts:
district_data = db[district][date]
- week_sum = week_avg = week_inc = ''
+ week_sum = week_avg = week_inc = '?'
new_infections = district_data['new_infections']
if 'week_sum' in district_data:
week_sum = '%s' % district_data['week_sum']
@@ -169,16 +183,12 @@ table, tr, th, td { border: 1px solid black; }
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print(new_infections)
- if district != sum_district:
- print('') print('
| ')
print('