X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=blobdiff_plain;ds=inline;f=enhance_table.py;h=cee78f82bb674fb98a879c1814bc6a2cca078ea8;hb=56de61949ed35ecb8ab728dd1912e161892bc521;hp=14c0134ebb323a7218b6a69730cdbe1e23e9ba7a;hpb=3e0c98e1d945f82a92df64e4493ccf054c674cae;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 14c0134..cee78f8 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -32,9 +32,10 @@ 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', + '+': 'new infections counted that day', + 'Σ': '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. @@ -94,6 +95,10 @@ for line in lines[1:]: db[district][date] = {'new_infections': int(district_data)} sorted_dates.sort() +# Define and move sum_district from end to start. +sum_district = sorted_districts.pop() +sorted_districts.insert(0, sum_district) + # In LaGeSo's data, the last "district" is actually the sum of all districts / # the whole of Berlin. # @@ -103,9 +108,8 @@ sorted_dates.sort() # the table file, since we should have a human look at what mistake was # probably made. for date in sorted_dates: - sum_district = sorted_districts[-1] day_sum = 0 - for district in sorted_districts[:-1]: + for district in [d for d in sorted_districts if not d==sum_district]: day_sum += db[district][date]['new_infections'] if day_sum != db[sum_district][date]['new_infections']: raise Exception('Questionable district infection sum in %s' % date) @@ -131,34 +135,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.
+th { text-align: left; vertical-align: bottom; } +.day_row:nth-child(7n+3) > td { border-top: 1px solid black; } +.vertical_header { writing-mode: vertical-rl; transform: rotate(180deg); font-weight: normal; } +.fixed_head { position: sticky; top: 0; background-color: white; } +.bold { font-weight: bold } + +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 | ' %
+ translate[district])
+ print('|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
date | ') + print('? | ') + for district in sorted_districts: + print('%s | ' % + (translate[district], 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']
@@ -167,19 +187,20 @@ 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('