X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=enhance_table.py;h=8d0fd335ec2c62e077bb3b34fcd47f10920adb30;hp=70a9501cab411936b5644c53a5906b4975bdc32e;hb=7c0bea9a26a3e3a5466f1a75d41f4a48d2106ac2;hpb=a0908b9bfc9d12ab7b87af794045ebe361a9702f diff --git a/enhance_table.py b/enhance_table.py index 70a9501..8d0fd33 100755 --- a/enhance_table.py +++ b/enhance_table.py @@ -131,12 +131,18 @@ for i in range(len(sorted_dates)): # Optimized for web browser viewing. if output_type == 'html': - 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.

""") @@ -157,7 +163,7 @@ table, tr, th, td { border: 1px solid black; } 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'] @@ -167,14 +173,15 @@ table, tr, th, td { border: 1px solid black; } week_inc = '%.1f' % district_data['week_incidence'] print('
date') print(new_infections) - if district == sum_district: - print('
') - else: - print('
') + 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('') @@ -186,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: """ @@ -194,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)