From 3bd20d9c5f5d504d84935f247aab13c1c0386fc1 Mon Sep 17 00:00:00 2001 From: "core.autocrlf" Date: Wed, 26 Jun 2019 08:12:38 -0600 Subject: [PATCH] Moved setting html id to the method call instead of constructor --- pyrediseasyio/html/html_io_group.py | 13 +++++++------ setup.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pyrediseasyio/html/html_io_group.py b/pyrediseasyio/html/html_io_group.py index 560c33c..4ea8b21 100644 --- a/pyrediseasyio/html/html_io_group.py +++ b/pyrediseasyio/html/html_io_group.py @@ -9,10 +9,9 @@ class HMTLIOGroup: - def __init__(self, io_group: IOGroup, html_id: str = None): + def __init__(self, io_group: IOGroup): self._io_group = io_group self.namespace = io_group.namespace - self.html_id = html_id def _heading(self, headers, row_tag: dominate.tags, cell_tag: dominate.tags): @@ -29,10 +28,11 @@ def html(self, headers: List[str] = None, show_units: bool = True, show_set_reset: bool = False, set_text: str = "On", - reset_text: str = "Off"): + reset_text: str = "Off", + html_id: str = None): attrs = self._io_group.get_attributes(by_names, by_type, by_lambda_each, by_lambda_results) - html_id = f'{attrs[0].key}_io_container' if self.html_id is None else self.html_id + html_id = f'{attrs[0].key}_io_container' if html_id is None else html_id with div(cls=f'easyio_container', id=html_id) as container: self._heading(headers, div, div) @@ -50,10 +50,11 @@ def html_table(self, headers: List[str] = None, show_units: bool = True, show_set_reset: bool = False, set_text: str = "On", - reset_text: str = "Off"): + reset_text: str = "Off", + html_id: str = None): attrs = self._io_group.get_attributes(by_names, by_type, by_lambda_each, by_lambda_results) - html_id = f'{attrs[0].addr}_io_container' if self.html_id is None else self.html_id + html_id = f'{attrs[0].addr}_io_container' if html_id is None else html_id with table(cls=f'easyio_container', id=html_id) as container: self._heading(headers, tr, th) diff --git a/setup.py b/setup.py index 5b7ac64..aa9da4b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="pyrediseasyio", - version="0.0.22", + version="0.0.23", author="Steve Jackson", author_email="washad@gmail.com", description="A set of tools for simplifying reading and writing of single values to/from Redis.",