From eafccfe41160d8ffcaa901026bcca0cdf4c97e66 Mon Sep 17 00:00:00 2001 From: Vitor de Miranda Henrique Date: Wed, 18 Apr 2018 01:02:01 -0500 Subject: [PATCH] fixed rowspan issue --- octoprint_enclosure/static/js/enclosure.js | 5 +++++ octoprint_enclosure/templates/enclosure_tab.jinja2 | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/octoprint_enclosure/static/js/enclosure.js b/octoprint_enclosure/static/js/enclosure.js index 36c391a..31126bf 100644 --- a/octoprint_enclosure/static/js/enclosure.js +++ b/octoprint_enclosure/static/js/enclosure.js @@ -83,6 +83,11 @@ $(function () { }); }; + self.calculateRowSpan = function(index_id){ + span = self.linkedTemperatureControl(index_id())().length + return span == 0 ? 1 : span; + }; + self.hasAnySensorWithHumidity = function(){ return_value = false; self.rpi_inputs_temperature_sensors().forEach(function (sensor) { diff --git a/octoprint_enclosure/templates/enclosure_tab.jinja2 b/octoprint_enclosure/templates/enclosure_tab.jinja2 index 323f998..809827c 100644 --- a/octoprint_enclosure/templates/enclosure_tab.jinja2 +++ b/octoprint_enclosure/templates/enclosure_tab.jinja2 @@ -20,8 +20,8 @@ - - + + °F @@ -31,7 +31,7 @@ - + % @@ -39,7 +39,7 @@ - N/A + N/A