From c0b58478e632295d51a5a8dc6cee298c22b0b98c Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 4 Jul 2020 01:35:42 +0200
Subject: [PATCH] Remain consistent in choice of abbrevations among output
versions.
---
enhance_table.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/enhance_table.py b/enhance_table.py
index 25fcd08..cfb5eff 100755
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -135,6 +135,7 @@ if output_type == 'html':
<html>
<head>
<style>
+th { text-align: left; vertical-align: bottom; }
.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; }
@@ -149,9 +150,6 @@ if output_type == 'html':
<tr>
<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]
@@ -170,10 +168,10 @@ if output_type == 'html':
print('<tr class="day_row">')
print('<td>%s</td>' % date)
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('<tr><th><abbr title="new infections counted">new</abbr></th></tr>')
+ for abbr in ['wsum', 'wavg', 'winc']:
+ print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
+ (translate[abbr], abbr))
print('</table></td>')
for district in sorted_districts:
district_data = db[district][date]
--
2.30.2