X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;f=enhance_table.py;h=e5cf8d39828bd5d94ae9f1a51960f0bb3613fcd9;hb=1fe10417db91c243a5698a617ff16da752eda345;hp=4a060a4b758a654ee5593662cf0f66386e037bf1;hpb=fca28d3ad3def405de5853c253e0ef130eb41fdc;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 4a060a4..e5cf8d3 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -134,6 +134,7 @@ 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("""
@@ -143,6 +144,7 @@ th { text-align: left; vertical-align: bottom; }
.vertical_header { writing-mode: vertical-rl; transform: rotate(180deg); font-weight: normal; }
.repeated_head th { padding-top: 0.5em; border-bottom: 1px solid black; }
.bold { font-weight: bold }
+.date { vertical-align: top; padding-top: 0.5em; }
Berlin's Corona infection numbers, development by districts
@@ -170,7 +172,8 @@ th { text-align: left; vertical-align: bottom; }
(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 | ' %
@@ -237,24 +240,30 @@ HTML view: https://plomlompom.com/berlin_corona.html"""
print('-'*77)
# Day table.
- print(date)
+ weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
+ print('%s (%s)' % (date, weekday))
new_infections = []
- weekly_sums = []
- weekly_avgs = []
- weekly_incs = []
+ weekly_sum_strings = []
+ weekly_avg_strings = []
+ weekly_inc_strings = []
for district in sorted_districts:
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:
- weekly_sums += [district_day_data['week_sum']]
+ wsum_string = '%4s' % district_day_data['week_sum']
+ weekly_sum_strings += [wsum_string]
if 'week_average' in district_day_data:
- weekly_avgs += [district_day_data['week_average']]
+ wavg_string = '%5.1f' % district_day_data['week_average']
+ weekly_avg_strings += [wavg_string]
if 'week_incidence' in district_day_data:
- weekly_incs += [district_day_data['week_incidence']]
+ 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(['%4s' % wsum for wsum in weekly_sums]))
- print('Ã', ' '*9, ''.join(['%5.1f' % wavg for wavg in weekly_avgs]))
- print('i', ' '*9, ''.join(['%5.1f' % winc for winc in weekly_incs]))
+ 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
|