Refactor symbol usage, add symbol explanation anchor to HTML.

(The latter for mobile device views where abbreviations cannot be
hovered productively.)

diff --git a/enhance_table.py b/enhance_table.py
index 07ad84bfe20ef809b8a2aabb3c56b64efc0206b4..62e503986b5aa0e59b88d32b11c878d7f3735802 100755 (executable)
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -32,6 +32,7 @@ translate = {
   'TS': 'Tempelhof-Schöneberg',
   'TK': 'Treptow-Köpenick',
   'sum': 'all of Berlin',
   'TS': 'Tempelhof-Schöneberg',
   'TK': 'Treptow-Köpenick',
   'sum': 'all of Berlin',

+  '+': 'new infections counted',

   'Σ': 'sum of new infections for last 7 days',
   'Ø': 'per-day average of new infections for last 7 days',
   'i': 'incidence (x per 100k inhabitants) of new infections for last 7 days',
   'Σ': 'sum of new infections for last 7 days',
   'Ø': 'per-day average of new infections for last 7 days',
   'i': 'incidence (x per 100k inhabitants) of new infections for last 7 days',


@@ -154,24 +155,24 @@ th { text-align: left; vertical-align: bottom; }
 <th colspan=2></th>""")
     sorted_dates.reverse()
     for district in sorted_districts:
 <th colspan=2></th>""")
     sorted_dates.reverse()
     for district in sorted_districts:

-        long_form = translate[district]

         # Wrap in div because the vertical orientation otherwise fails
         # in Chromium.
         # Wrap in div because the vertical orientation otherwise fails
         # in Chromium.

-        print('<th><div class="vertical_header">%s</div></th>' % long_form)
+        print('<th><div class="vertical_header">%s</div></th>' %
+              translate[district])

     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('</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>')
+    print('<th class="fixed_head"><a href="#symbols">?</a></th>')

     for district in sorted_districts:
     for district in sorted_districts:

-        print('<th class="fixed_head">%s</th>' % district)
+        print('<th class="fixed_head"><abbr title="%s">%s</abbr></th>' %
+              (translate[district], district))

     print('</tr>')
     for date in sorted_dates:
         print('<tr class="day_row">')
         print('<td>%s</td>' % date)
         print('<td><table>')
     print('</tr>')
     for date in sorted_dates:
         print('<tr class="day_row">')
         print('<td>%s</td>' % date)
         print('<td><table>')

-        print('<tr><th><abbr title="new infections counted">+</abbr></th></tr>')
-        for abbr in ['Σ', 'Ø', 'i']:
+        for abbr in ['+', 'Σ', 'Ø', 'i']:

             print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
                   (translate[abbr], abbr))
         print('</table></td>')
             print('<tr><th><abbr title="%s">%s</abbr></th></tr>' %
                   (translate[abbr], abbr))
         print('</table></td>')


@@ -195,6 +196,11 @@ th { text-align: left; vertical-align: bottom; }
             print('</td>')
         print('</tr>')
     print('</table>')
             print('</td>')
         print('</tr>')
     print('</table>')

+    print('<h3 id="symbols">Symbols</h3>')
+    print('<dl>')
+    for abbr in ['+', 'Σ', 'Ø', 'i']:
+        print('<dt>%s</dt><dd>%s</dd>' % (abbr, translate[abbr]))
+    print('</dl>')

     print('</html>')
 
 # Optimized for in-terminal curl.
     print('</html>')
 
 # Optimized for in-terminal curl.


@@ -208,6 +214,8 @@ Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, P
 Abbrevations/explanations:
 """
     for k in translate:
 Abbrevations/explanations:
 """
     for k in translate:

+        if k == '+':  # not used in terminal version
+            continue

         intro += "%s: %s\n" % (k, translate[k])
     intro += """
 Source code: https://plomlompom.com/repos/?p=berlin-corona-table
         intro += "%s: %s\n" % (k, translate[k])
     intro += """
 Source code: https://plomlompom.com/repos/?p=berlin-corona-table