diff --git a/bin/user/weatherserviceshealth.py b/bin/user/weatherserviceshealth.py index c799acf..0c6f13b 100644 --- a/bin/user/weatherserviceshealth.py +++ b/bin/user/weatherserviceshealth.py @@ -369,6 +369,9 @@ def __init__(self, name, conf_dict, archive_interval): self.plusminus_icon_size = weeutil.weeutil.to_int( conf_dict.get('plusminus_icon_size',20) ) + self.thermalstress_icon_size = weeutil.weeutil.to_int( + conf_dict.get('thermalstress_icon_size', self.plusminus_icon_size*2) + ) # orientation of the HTML table orientation = conf_dict.get('orientation','h,v') if not isinstance(orientation,list): @@ -675,7 +678,7 @@ def write_html(self, tabtimespans, area_name, last_update, now): timespansvalue = False for ii,val in timespans.items(): s += '%s
%s' % (colwidth,ii[0],ii[1]) - if ii[2]: s += '
%s' % ii[2] + if ii[2]: s += '
%s' % ii[2].replace('Tageshälfte','Tages­hälfte') s += '' if val is not None: timespansvalue = True s += '' @@ -728,7 +731,7 @@ def write_html(self, tabtimespans, area_name, last_update, now): col = '' if self.model=='biowetter': if ii=='Thermische Belastung': - effect = thermalstress_symbol(effect,self.plusminus_icon_size*2) + effect = thermalstress_symbol(effect,self.thermalstress_icon_size) else: effect = symbol(effect,self.plusminus_icon_size) if self.model=='pollen': @@ -738,7 +741,7 @@ def write_html(self, tabtimespans, area_name, last_update, now): else: s += effect if 'recomm' in tab[ii][jj] and tab[ii][jj]['recomm']!='keine': - s += '
%s:
%s' % ('Empfehlung',tab[ii][jj]['recomm']) + s += '' % ('Empfehlung',tab[ii][jj]['recomm']) if self.model=='pollen': s += '' s += '' @@ -760,6 +763,14 @@ def write_html(self, tabtimespans, area_name, last_update, now): txt = ii if sym==ii else '%s %s' % (sym,ii) s += '
  • %s
  • ' % txt s += '' + elif self.model=='pollen': + s += '' s += '

    herausgegeben vom %s am %s | Vorhersage erstellt am %s

    ' % ( self.provider_url,self.provider_name, time.strftime('%d.%m.%Y %H:%M',time.localtime(last_update)),