Adapt TXT variant to HTML variant.

diff --git a/enhance_table.py b/enhance_table.py
index cee78f82bb674fb98a879c1814bc6a2cca078ea8..f8add4efe2bcfaca4989785621323042b0f22982 100755 (executable)
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -214,13 +214,10 @@ Updated daily at 9pm based on data from the "Senatsverwaltung für Gesundheit, P
 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
-HTML view: https://plomlompom.com/berlin_corona.html
-"""
+HTML view: https://plomlompom.com/berlin_corona.html"""
     print(intro)
 
     # Output table of enhanced daily infection data, newest on top,
@@ -231,44 +228,26 @@ HTML view: https://plomlompom.com/berlin_corona.html
 
         # Week table header.
         if weekday_count == 0:
-            print(' '*10, '  '.join(sorted_districts),
-                  '   Σ', '    Ø', '   i')
-            week_start_date = date
+            print()
+            print(' '*13, '   '.join(sorted_districts))
+            print('-'*77)
 
-        # Day data line.
+        # Day table.
+        print(date)
         new_infections = []
+        weekly_sums = []
+        weekly_avgs = []
+        weekly_incs = []
         for district in sorted_districts:
             new_infections += [db[district][date]['new_infections']]
-        week_sum = week_avg = week_inc = ''
-        sum_district_data = db[sum_district][date]
-        if 'week_sum' in sum_district_data:
-            week_sum = '%4s' % sum_district_data['week_sum']
-        if 'week_average' in sum_district_data:
-            week_avg = '%5.1f' % sum_district_data['week_average']
-        if 'week_incidence' in sum_district_data:
-            week_inc = '%4.1f' % sum_district_data['week_incidence']
-        print(date, ' '.join(['%3s' % infections
-                              for infections in new_infections]),
-              week_sum, week_avg, week_inc)
-
-        # Maintain 7-day cycle.
+            weekly_sums += [db[district][date]['week_sum']]
+            weekly_avgs += [db[district][date]['week_average']]
+            weekly_incs += [db[district][date]['week_incidence']]
+        print('+', ' '*11, '  '.join(['%3s' % i for i in new_infections]))
+        print('Σ', ' '*10, ' '.join(['%4s' % wsum for wsum in weekly_sums]))
+        print('Ø', ' '*9, ''.join(['%5.1f' % wavg for wavg in weekly_avgs]))
+        print('i', ' '*9, ''.join(['%5.1f' % winc for winc in weekly_incs]))
         weekday_count += 1
         if weekday_count != 7:
             continue
         weekday_count = 0
-
-        # After each 7 days, print summary for individual districts.
-        weekly_sums = []
-        weekly_avgs = []
-        weekly_incs = []
-        for district in sorted_districts[1:]:
-            weekly_sums += [db[district][week_start_date]['week_sum']]
-            weekly_avgs += [db[district][week_start_date]['week_average']]
-            weekly_incs += [db[district][week_start_date]['week_incidence']]
-        print()
-        print('district stats for week from %s to %s:' % (date, week_start_date))
-        print(' '*4, '    '.join(sorted_districts[1:]))
-        print('Σ', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
-        print('Ø', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
-        print('i', ' '.join(['%5.1f' % winc for winc in weekly_incs]))
-        print()