X-Git-Url: https://plomlompom.com/repos/do_day?a=blobdiff_plain;ds=sidebyside;f=enhance_table.py;h=7fe22b3cf04195dff574a14084b6f71b165c7ce6;hb=2b686eda23627862965e73c1abfd097a2ef0411a;hp=975abd87264f14b8acb89f4d2cc99b8e5b95a5f7;hpb=ef830881ea19fe5686220b66f07591307a4948a8;p=berlin-corona-table diff --git a/enhance_table.py b/enhance_table.py index 975abd8..7fe22b3 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -95,13 +95,13 @@ 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. +# In LaGeSo's data, the last "district" is actually the sum of all districts / +# the whole of Berlin. For our district order, move it in front of the other +# districts, as its numbers are the most interesting, so in the table views +# we want to see it first. 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. -# # Fail on any day where the "sum" district's new infections are not the proper # sum of the individual districts new infections. Yes, sometimes Lageso sends # data that is troubled in this way. It will then have to be fixed manually in @@ -134,22 +134,22 @@ for i in range(len(sorted_dates)): db[district][date]['week_incidence'] = (week_sum / district_pop) * 100000 # Optimized for web browser viewing. +import calendar if output_type == 'html': print("""
Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". 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. Plain text view (optimized for terminal curl).
""") @@ -160,17 +160,19 @@ th { text-align: left; vertical-align: bottom; } print(' | %s | ' %
translate[district])
print('||
---|---|---|---|
date | ') - print('? | ') - for district in sorted_districts: - print('%s | ' % - (translate[district], district)) - print('|
date | ') + print('? | ') + for district in sorted_districts: + print('%s | ' % + (translate[district], district)) + print('|
%s | ' % date) + weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()] + print('%s %s | ' % (date, weekday))
print('
| ')
print('