X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=enhance_table.py;h=7fe22b3cf04195dff574a14084b6f71b165c7ce6;hb=2b686eda23627862965e73c1abfd097a2ef0411a;hp=0ca53d7a200f5f5b4255fb85acaf3452dc4ff425;hpb=43820a07318a4751ac914b42a80aaa346a6e85a9;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 0ca53d7..7fe22b3 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -134,15 +134,15 @@ 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
@@ -160,17 +160,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 +197,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('')
@@ -233,7 +239,8 @@ 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 = []