X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=8d0fd335ec2c62e077bb3b34fcd47f10920adb30;hp=bdf91e1654a28be8d6c33445362f2cd0aadf7a3f;hb=7c0bea9a26a3e3a5466f1a75d41f4a48d2106ac2;hpb=76d923286b2178d07972ac6b4da6c8877362b479 diff --git a/enhance_table.py b/enhance_table.py index bdf91e1..8d0fd33 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -131,28 +131,39 @@ for i in range(len(sorted_dates)): # Optimized for web browser viewing. if output_type == 'html': - print('') - print('') - print('') - print('') - print('') + print(""" + + + +Table of Berlin's Corona infection number development by districts + +

Table of Berlin's Corona infection number development by districts

+

Updated daily at 9pm. Source code. Text view optimized for terminal curl.

+
date
+ +""") + sorted_dates.reverse() + sum_district = sorted_districts[-1] for district in sorted_districts: long_form = translate[district] - print('' % long_form) + if sum_district == district: + print('' % long_form) + else: + print('' % long_form) print('') - sorted_dates.reverse() for date in sorted_dates: - print('') + print('') print('' % 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 = '' + week_sum = week_avg = week_inc = '(not enough data)' new_infections = district_data['new_infections'] if 'week_sum' in district_data: week_sum = '%s' % district_data['week_sum'] @@ -162,11 +173,15 @@ if output_type == 'html': week_inc = '%.1f' % district_data['week_incidence'] print('
date%s%s%s
%s') print(new_infections) - print('
(more)') + if district != sum_district: + print('
') + print('
') print('' % (long_wsum, week_sum)) print('' % (long_wavg, week_avg)) print('' % (long_winc, week_inc)) - print('
%s%s
%s%s
%s%s
') + print('
') + if district != sum_district: + print('') print('') print('') print('') @@ -178,7 +193,7 @@ elif output_type == 'txt': # Explain what this is. intro = \ """Table of Berlin's Corona infection number development by districts. -Updated daily around 9pm. +Updated daily at 9pm. Abbrevations/explanations: """ @@ -186,6 +201,8 @@ Abbrevations/explanations: 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 """ print(intro)