From 76d923286b2178d07972ac6b4da6c8877362b479 Mon Sep 17 00:00:00 2001 From: Christian Heller <c.heller@plomlompom.de> Date: Fri, 3 Jul 2020 21:06:56 +0200 Subject: [PATCH] Extend abbreviation mapping, use collapsible for HTML table cells. --- enhance_table.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/enhance_table.py b/enhance_table.py index acbebc6..bdf91e1 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -32,6 +32,9 @@ translate = { 'TS': 'Tempelhof-Schöneberg', 'TK': 'Treptow-Köpenick', 'sum': 'all of Berlin', + 'wsum': 'sum for last 7 days', + 'wavg': 'per-day average of new infections for last 7 days', + 'winc': 'incidence (x per 100k inhabitants) of new infections for last 7 days', } # Read infections table path and output type. @@ -144,6 +147,9 @@ if output_type == 'html': for date in sorted_dates: print('<tr>') print('<td>%s</td>' % date) + long_wsum = translate['wsum'] + long_wavg = translate['wavg'] + long_winc = translate['winc'] for district in sorted_districts: district_data = db[district][date] week_sum = week_avg = week_inc = '' @@ -155,12 +161,12 @@ if output_type == 'html': if 'week_incidence' in district_data: week_inc = '%.1f' % district_data['week_incidence'] print('<td>') - print('<table>') - print('<tr><th>new</th><td>%s</td></tr>' % new_infections) - print('<tr><th>wsum</th><td>%s</td></tr>' % week_sum) - print('<tr><th>wavg</th><td>%s</td></tr>' % week_avg) - print('<tr><th>winc</th><td>%s</td></tr>' % week_inc) - print('</table>') + print(new_infections) + print('<details><summary>(more)</summary><table>') + 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></details>') print('</td>') print('</tr>') print('</table>') @@ -178,10 +184,7 @@ Abbrevations/explanations: """ for k in translate: intro += "%s: %s\n" % (k, translate[k]) - intro += """wsum: sum for last 7 days -wavg: per-day average of new infections for last 7 days -winc: incidence (x per 100k inhabitants) of new infections for last 7 days - + intro += """ Source code: https://plomlompom.com/repos/?p=berlin-corona-table """ print(intro) -- 2.30.2