X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_structured?a=blobdiff_plain;ds=inline;f=enhance_table.py;h=d37205ee11220cc828b2e4eb75163a0eb3a2c295;hb=3314770c7d0362afd2b17ccab7885f3c47ffa03d;hp=70a9501cab411936b5644c53a5906b4975bdc32e;hpb=a0908b9bfc9d12ab7b87af794045ebe361a9702f;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 70a9501..d37205e 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -131,12 +131,21 @@ for i in range(len(sorted_dates)):
# Optimized for web browser viewing.
if output_type == 'html':
- print("""
+ 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.
date | """)
@@ -147,7 +156,9 @@ table, tr, th, td { border: 1px solid black; }
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 | ' % long_form)
print('
')
for date in sorted_dates:
print('')
@@ -157,7 +168,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']
@@ -166,15 +177,16 @@ 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('
')
- else:
- 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(' ')
@@ -186,7 +198,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:
"""
@@ -194,6 +206,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)
|