From c3aed480d601bdd069e124a734e1c0cef46d6f2f Mon Sep 17 00:00:00 2001 From: mikeAdamss Date: Wed, 28 Apr 2021 15:40:47 +0100 Subject: [PATCH 1/2] tweak some old assumptions RE xlrd used in html preview --- databaker/jupybakehtml.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/databaker/jupybakehtml.py b/databaker/jupybakehtml.py index ffd5400..f65af5b 100644 --- a/databaker/jupybakehtml.py +++ b/databaker/jupybakehtml.py @@ -86,16 +86,26 @@ def tabletohtml(tab, tsubs, consolidatedcellvalueoverride, blocalstylesheet): ih = ixyheaderlookup.get((c.x, c.y)) if blocalstylesheet: cs = [ ] - if ih is not None: cs.append("xc%s" % ih) - if c.properties.cell.sheet.book.font_list: # overcome bug in messytables caused by https://www.communities-ni.gov.uk/sites/default/files/publications/communities/ni-housing-stats-15-16-tables1.xlsx - if c.properties.get_bold(): cs.append("xb") - if c.is_number(): cs.append("xn") + if ih is not None: + cs.append("xc%s" % ih) + try: + if c.properties.cell.sheet.book.font_list: # overcome bug in messytables caused by https://www.communities-ni.gov.uk/sites/default/files/publications/communities/ni-housing-stats-15-16-tables1.xlsx + if c.properties.get_bold(): + cs.append("xb") + except Exception: + raise(type(c.properties)) + if c.is_number(): + cs.append("xn") htm.append('' % (" ".join(cs), c.x, c.y)) else: ls = [ ] - if ih is not None: ls.append("background-color:%s" % colourlist.get(ih,"white")) - if c.properties.cell.sheet.book.font_list: - if c.properties.get_bold(): ls.append("font-weight:bold") + if ih is not None: + ls.append("background-color:%s" % colourlist.get(ih,"white")) + try: + if c.properties.get_bold(): + ls.append("font-weight:bold") + except Exception: + raise ValueError(type(c.properties)) lss = ' style="%s"' % ";".join(ls) if ls else '' htm.append('' % (lss, c.x, c.y)) From 4e9a1fe2b76a0490a12379f812df61d5beaab605 Mon Sep 17 00:00:00 2001 From: mikeAdamss Date: Wed, 28 Apr 2021 15:42:42 +0100 Subject: [PATCH 2/2] tidy up --- databaker/jupybakehtml.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/databaker/jupybakehtml.py b/databaker/jupybakehtml.py index f65af5b..64bf241 100644 --- a/databaker/jupybakehtml.py +++ b/databaker/jupybakehtml.py @@ -88,12 +88,8 @@ def tabletohtml(tab, tsubs, consolidatedcellvalueoverride, blocalstylesheet): cs = [ ] if ih is not None: cs.append("xc%s" % ih) - try: - if c.properties.cell.sheet.book.font_list: # overcome bug in messytables caused by https://www.communities-ni.gov.uk/sites/default/files/publications/communities/ni-housing-stats-15-16-tables1.xlsx - if c.properties.get_bold(): - cs.append("xb") - except Exception: - raise(type(c.properties)) + if c.properties.get_bold(): + cs.append("xb") if c.is_number(): cs.append("xn") htm.append('' % (" ".join(cs), c.x, c.y)) @@ -101,11 +97,8 @@ def tabletohtml(tab, tsubs, consolidatedcellvalueoverride, blocalstylesheet): ls = [ ] if ih is not None: ls.append("background-color:%s" % colourlist.get(ih,"white")) - try: - if c.properties.get_bold(): - ls.append("font-weight:bold") - except Exception: - raise ValueError(type(c.properties)) + if c.properties.get_bold(): + ls.append("font-weight:bold") lss = ' style="%s"' % ";".join(ls) if ls else '' htm.append('' % (lss, c.x, c.y))