From b2afbdcf5351cf2aa7898241baa7ab081814d522 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 4 Jul 2020 01:16:01 +0200
Subject: [PATCH] Completely redesign HTML table.
---
enhance_table.py | 56 +++++++++++++++++++++++++-----------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/enhance_table.py b/enhance_table.py
index 5926db0..c670739 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -135,12 +135,10 @@ if output_type == 'html':
<html>
<head>
<style>
-table, tr, th, td { border: 1px solid black; text-align: center; }
-.day_row:nth-child(7n+1) { background-color: yellow; }
-.district_name { writing-mode: vertical-rl; transform: rotate(180deg); }
-.bonus_data th { font-weight: normal; }
-.new_infections { font-weight: bold; }
-thead th { position: sticky; top: 0; background-color: white; }
+.day_row:nth-child(7n+3) > td { border-top: 1px solid black; }
+.vertical_header { writing-mode: vertical-rl; transform: rotate(180deg); font-weight: normal; }
+.fixed_head { position: sticky; top: 0; background-color: white; }
+.bold { font-weight: bold }
</style>
<title>Berlin's Corona infection numbers, development by districts</title>
</head>
@@ -148,27 +146,35 @@ thead th { position: sticky; top: 0; background-color: white; }
<h1>Berlin's Corona infection numbers, development by districts</h1>
<p>Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, Pflege und Gleichstellung". <a href="https://plomlompom.com/repos/?p=berlin-corona-table">Source code</a>. <a href="berlin_corona.txt">Text view optimized for terminal curl</a>.</p>
<table>
-<thead>
<tr>
-<th>date</th>""")
+<th colspan=2></th>""")
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('<th>%s</th>' % long_form)
- else:
- # Wrap in div because the vertical orientation otherwise fails
- # in Chromium.
- print('<th><div class="district_name">%s</div></th>' % long_form)
+ # Wrap in div because the vertical orientation otherwise fails
+ # in Chromium.
+ print('<th><div class="vertical_header">%s</div></th>' % long_form)
+ print('</tr>')
+ print('<tr class="fixed_head">')
+ # In Chromium, the th only stay fixed if also given this class.
+ print('<th class="fixed_head">date</th>')
+ print('<th class="fixed_head"></th>')
+ for district in sorted_districts:
+ print('<th class="fixed_head">%s</th>' % district)
print('</tr>')
- print('</thead>')
for date in sorted_dates:
print('<tr class="day_row">')
print('<td>%s</td>' % date)
- long_wsum = translate['wsum']
- long_wavg = translate['wavg']
- long_winc = translate['winc']
+ print('<td><table>')
+ print('<tr><th><abbr title="new">+<abbr></th></tr>')
+ print('<tr><th><abbr title="%s">Σ</abbr></th></tr>' % long_wsum)
+ print('<tr><th><abbr title="%s">Ã</abbr></th></tr>' % long_wavg)
+ print('<tr><th><abbr title="%s">i</abbr></th></tr>' % long_winc)
+ print('</table></td>')
for district in sorted_districts:
district_data = db[district][date]
week_sum = week_avg = week_inc = '(not enough data)'
@@ -180,16 +186,12 @@ thead th { position: sticky; top: 0; background-color: white; }
if 'week_incidence' in district_data:
week_inc = '%.1f' % district_data['week_incidence']
print('<td>')
- print('<span class="new_infections">%s</span>' % new_infections)
- if district != sum_district:
- print('<details><summary></summary>')
- print('<table class="bonus_data">')
- print('<tr><th>%s</th><td>%s</td></tr>' % (long_wsum, week_sum))
- print('<tr><th>%s</th><td>%s</td></tr>' % (long_wavg, week_avg))
- print('<tr><th>%s</th><td>%s</td></tr>' % (long_winc, week_inc))
+ print('<table>')
+ print('<tr><td class="bold">%s</td></tr>' % new_infections)
+ print('<tr><td>%s</td></tr>' % week_sum)
+ print('<tr><td>%s</td></tr>' % week_avg)
+ print('<tr><td>%s</td></tr>' % week_inc)
print('</table>')
- if district != sum_district:
- print('</details>')
print('</td>')
print('</tr>')
print('</table>')
--
2.30.2