X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=enhance_table.py;h=fd401671a3723ed5798b4f49927e43e0e6b34aaa;hb=bdc52bdeda5f03066adb764c810a37dff408f2ff;hp=0b30d216f5105d66391251659427caa7903f316a;hpb=049ba1c6850f9344523f8efd46c837a6c15263ee;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 0b30d21..fd40167 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -131,29 +131,41 @@ for i in range(len(sorted_dates)):
# Optimized for web browser viewing.
if output_type == 'html':
- print('')
- print('')
- print('
')
- print('')
- print('date | ')
+ print("""
+
+
+
+Berlin's Corona infection numbers, development by districts
+
+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.
+
+
+date | """)
+ sorted_dates.reverse()
+ sum_district = sorted_districts[-1]
for district in sorted_districts:
long_form = translate[district]
- print('%s | ' % long_form)
+ if sum_district == district:
+ print('%s | ' % long_form)
+ else:
+ print('%s | ' % long_form)
print('
')
- sorted_dates.reverse()
for date in sorted_dates:
- print('')
+ print('
')
print('%s | ' % date)
long_wsum = translate['wsum']
long_wavg = translate['wavg']
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']
@@ -162,12 +174,16 @@ if output_type == 'html':
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('')
- print(new_infections)
- print('
')
+ print('%s' % new_infections)
+ if district != sum_district:
+ print('')
+ print('')
print('%s | %s | ' % (long_wsum, week_sum))
print('%s | %s | ' % (long_wavg, week_avg))
print('%s | %s | ' % (long_winc, week_inc))
- print(' ')
+ print(' ')
+ if district != sum_district:
+ print(' ')
print(' | ')
print('
')
print('
')
@@ -179,7 +195,7 @@ elif output_type == 'txt':
# Explain what this is.
intro = \
"""Table of Berlin's Corona infection number development by districts.
-Updated daily around 9pm.
+Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung".
Abbrevations/explanations:
"""
@@ -187,6 +203,8 @@ Abbrevations/explanations:
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
"""
print(intro)