home
·
contact
·
privacy
projects
/
berlin-corona-table
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3cde66c
)
Use '?' for lack of data for 7-day values in TXT version too.
author
Christian Heller
<c.heller@plomlompom.de>
Mon, 6 Jul 2020 18:40:22 +0000
(20:40 +0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Mon, 6 Jul 2020 18:40:22 +0000
(20:40 +0200)
enhance_table.py
patch
|
blob
|
history
diff --git
a/enhance_table.py
b/enhance_table.py
index f44252463130075d456b6faf0d593b8144528c10..e5cf8d39828bd5d94ae9f1a51960f0bb3613fcd9 100755
(executable)
--- a/
enhance_table.py
+++ b/
enhance_table.py
@@
-243,22
+243,27
@@
HTML view: https://plomlompom.com/berlin_corona.html"""
weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
print('%s (%s)' % (date, weekday))
new_infections = []
weekday = calendar.day_name[datetime.date.fromisoformat(date).weekday()]
print('%s (%s)' % (date, weekday))
new_infections = []
- weekly_sums = []
- weekly_avgs = []
- weekly_incs = []
+ weekly_sum
_string
s = []
+ weekly_avg
_string
s = []
+ weekly_inc
_string
s = []
for district in sorted_districts:
district_day_data = db[district][date]
new_infections += [district_day_data['new_infections']]
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:
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:
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:
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('+', ' '*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
weekday_count += 1
if weekday_count != 7:
continue