X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=enhance_table.py;h=25fcd08048705eab18309283ec51d39a5d716a91;hb=8b643b326d04387f4903008cbeab89b3a9a6adb7;hp=03382554e2dbfc538aca8107777ed15ee789546c;hpb=6fb8fb729535839b201527cc04662588df3ea425;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 0338255..25fcd08 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -131,36 +131,53 @@ 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() + long_wsum = translate['wsum'] + long_wavg = translate['wavg'] + long_winc = translate['winc'] 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,15 +186,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('
|