X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=5926db0c1cc6a61bd445b6d482dd549057bcee23;hp=14c0134ebb323a7218b6a69730cdbe1e23e9ba7a;hb=ac8865761b936186c35acd382c7d191b0b5ef7bd;hpb=3e0c98e1d945f82a92df64e4493ccf054c674cae diff --git a/enhance_table.py b/enhance_table.py index 14c0134..5926db0 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -131,14 +131,24 @@ for i in range(len(sorted_dates)): # Optimized for web browser viewing. if output_type == 'html': - print(""" + print(""" + +

Table of Berlin's Corona infection number development by districts

-

Updated daily at 9pm. Source code. Text view optimized for terminal curl.

+.bonus_data th { font-weight: normal; } +.new_infections { font-weight: bold; } +thead th { position: sticky; top: 0; background-color: white; } + +Berlin's Corona infection numbers, development by districts + +home · contact · privacy +

Berlin's Corona infection numbers, development by districts

+

Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". Source code. Text view optimized for terminal curl.

+""") sorted_dates.reverse() @@ -148,8 +158,11 @@ table, tr, th, td { border: 1px solid black; } if sum_district == district: print('' % long_form) else: - print('' % long_form) + # Wrap in div because the vertical orientation otherwise fails + # in Chromium. + print('' % long_form) print('') + print('') for date in sorted_dates: print('') print('' % date) @@ -158,7 +171,7 @@ table, tr, th, td { border: 1px solid black; } long_winc = translate['winc'] for district in sorted_districts: district_data = db[district][date] - week_sum = week_avg = week_inc = '' + week_sum = week_avg = week_inc = '(not enough data)' new_infections = district_data['new_infections'] if 'week_sum' in district_data: week_sum = '%s' % district_data['week_sum'] @@ -167,10 +180,10 @@ table, tr, th, td { border: 1px solid black; } if 'week_incidence' in district_data: week_inc = '%.1f' % district_data['week_incidence'] print('
date%s%s
%s
%s') - print(new_infections) + print('%s' % new_infections) if district != sum_district: print('
') - print('') + print('
') print('' % (long_wsum, week_sum)) print('' % (long_wavg, week_avg)) print('' % (long_winc, week_inc)) @@ -188,7 +201,7 @@ elif output_type == 'txt': # Explain what this is. intro = \ """Table of Berlin's Corona infection number development by districts. -Updated daily at 9pm. +Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". Abbrevations/explanations: """
%s%s
%s%s
%s%s