X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/task?a=blobdiff_plain;f=enhance_table.py;h=28c472eeeda95650488700c8b4384c3cae7e4d44;hb=402755409e719a9e2cba7a9dcb1482b5834a3aa1;hp=cee78f82bb674fb98a879c1814bc6a2cca078ea8;hpb=56de61949ed35ecb8ab728dd1912e161892bc521;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index cee78f8..28c472e 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,23 @@ 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("""
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.
+Updated daily at 7pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". Source code. Plain text view (optimized for terminal curl).
| """)
@@ -160,17 +161,19 @@ th { text-align: left; vertical-align: bottom; }
print(' | ' %
translate[district])
print('
')
- print('')
- # In Chromium, the th only stay fixed if also given this class.
- print('date | ')
- print('? | ')
- for district in sorted_districts:
- print('%s | ' %
- (translate[district], district))
- print('
')
+ weekday_count = 0
for date in sorted_dates:
+ if weekday_count == 0:
+ print('')
+ print('date | ')
+ print('? | ')
+ for district in sorted_districts:
+ print('%s | ' %
+ (translate[district], district))
+ print('
')
print('')
- print('%s | ' % date)
+ weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+ print('%s %s | ' % (date, weekday))
print('')
for abbr in ['+', 'Σ', 'Ã', 'i']:
print('%s | ' %
@@ -195,6 +198,10 @@ th { text-align: left; vertical-align: bottom; }
print(' ')
print(' | ')
print('
')
+ weekday_count += 1
+ if weekday_count != 7:
+ continue
+ weekday_count = 0
print('
')
print('Symbols
')
print('')
@@ -209,18 +216,15 @@ elif output_type == 'txt':
# Explain what this is.
intro = \
"""Table of Berlin's Corona infection number development by districts.
-Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
+Updated daily at 7pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
Abbrevations/explanations:
"""
for k in translate:
- if k == '+': # not used in terminal version
- continue
intro += "%s: %s\n" % (k, translate[k])
intro += """
Source code: https://plomlompom.com/repos/?p=berlin-corona-table
-HTML view: https://plomlompom.com/berlin_corona.html
-"""
+HTML view: https://plomlompom.com/berlin_corona.html"""
print(intro)
# Output table of enhanced daily infection data, newest on top,
@@ -231,44 +235,36 @@ HTML view: https://plomlompom.com/berlin_corona.html
# Week table header.
if weekday_count == 0:
- print(' '*10, ' '.join(sorted_districts),
- ' Σ', ' Ã', ' i')
- week_start_date = date
+ print()
+ print(' '*13, ' '.join(sorted_districts))
+ print('-'*77)
- # Day data line.
+ # Day table.
+ weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+ print('%s (%s)' % (date, weekday))
new_infections = []
+ weekly_sum_strings = []
+ weekly_avg_strings = []
+ weekly_inc_strings = []
for district in sorted_districts:
- new_infections += [db[district][date]['new_infections']]
- week_sum = week_avg = week_inc = ''
- sum_district_data = db[sum_district][date]
- if 'week_sum' in sum_district_data:
- week_sum = '%4s' % sum_district_data['week_sum']
- if 'week_average' in sum_district_data:
- week_avg = '%5.1f' % sum_district_data['week_average']
- if 'week_incidence' in sum_district_data:
- week_inc = '%4.1f' % sum_district_data['week_incidence']
- print(date, ' '.join(['%3s' % infections
- for infections in new_infections]),
- week_sum, week_avg, week_inc)
-
- # Maintain 7-day cycle.
+ district_day_data = db[district][date]
+ new_infections += [district_day_data['new_infections']]
+ wsum_string = ' '*3 + '?'
+ wavg_string = winc_string = ' '*4 + '?'
+ if 'week_sum' in district_day_data:
+ wsum_string = '%4s' % district_day_data['week_sum']
+ weekly_sum_strings += [wsum_string]
+ if 'week_average' in district_day_data:
+ wavg_string = '%5.1f' % district_day_data['week_average']
+ weekly_avg_strings += [wavg_string]
+ if 'week_incidence' in district_day_data:
+ winc_string = '%5.1f' % district_day_data['week_incidence']
+ weekly_inc_strings += [winc_string]
+ print('+', ' '*11, ' '.join(['%3s' % i for i in new_infections]))
+ print('Σ', ' '*10, ' '.join(weekly_sum_strings))
+ print('Ã', ' '*9, ''.join(weekly_avg_strings))
+ print('i', ' '*9, ''.join(weekly_inc_strings))
weekday_count += 1
if weekday_count != 7:
continue
weekday_count = 0
-
- # After each 7 days, print summary for individual districts.
- weekly_sums = []
- weekly_avgs = []
- weekly_incs = []
- for district in sorted_districts[1:]:
- weekly_sums += [db[district][week_start_date]['week_sum']]
- weekly_avgs += [db[district][week_start_date]['week_average']]
- weekly_incs += [db[district][week_start_date]['week_incidence']]
- print()
- print('district stats for week from %s to %s:' % (date, week_start_date))
- print(' '*4, ' '.join(sorted_districts[1:]))
- print('Σ', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
- print('Ã', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
- print('i', ' '.join(['%5.1f' % winc for winc in weekly_incs]))
- print()