X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=enhance_table.py;h=25fcd08048705eab18309283ec51d39a5d716a91;hb=8b643b326d04387f4903008cbeab89b3a9a6adb7;hp=6fe12d4282fb8c0816756673041b33e57c076a7d;hpb=46e399e76a33e978ff50cdfd735d4701093c1976;p=berlin-corona-table
diff --git a/enhance_table.py b/enhance_table.py
index 6fe12d4..25fcd08 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -135,11 +135,10 @@ if output_type == 'html':
Berlin's Corona infection numbers, development by districts
@@ -148,25 +147,37 @@ table, tr, th, td { border: 1px solid black; text-align: center; }
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()
+ long_wsum = translate['wsum']
+ long_wavg = translate['wavg']
+ long_winc = translate['winc']
sum_district = sorted_districts[-1]
for district in sorted_districts:
long_form = translate[district]
- 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(' | ' % long_form)
+ print('
')
+ print('')
+ # In Chromium, the th only stay fixed if also given this class.
+ print('date | ')
+ print(' | ')
+ for district in sorted_districts:
+ print('%s | ' % district)
print('
')
for date in sorted_dates:
print('')
print('%s | ' % date)
- long_wsum = translate['wsum']
- long_wavg = translate['wavg']
- long_winc = translate['winc']
+ print('')
+ print('+ | ')
+ print('Σ | ' % long_wsum)
+ print('Ã | ' % long_wavg)
+ print('i | ' % long_winc)
+ print(' | ')
for district in sorted_districts:
district_data = db[district][date]
- week_sum = week_avg = week_inc = '(not enough data)'
+ week_sum = week_avg = week_inc = '?'
new_infections = district_data['new_infections']
if 'week_sum' in district_data:
week_sum = '%s' % district_data['week_sum']
@@ -175,16 +186,12 @@ table, tr, th, td { border: 1px solid black; text-align: center; }
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
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('%s | ' % new_infections)
+ print('%s | ' % week_sum)
+ print('%s | ' % week_avg)
+ print('%s | ' % week_inc)
print(' ')
- if district != sum_district:
- print('')
print('')
print('')
print(' ')
|