Gandalf/OctoPrint-Enclosure
1
0
Fork 0
Code Issues 156 Pull Requests 6 Actions Packages Projects Releases 28 Wiki Activity

fixed rowspan issue

Browse Source
This commit is contained in:
Vitor de Miranda Henrique
2018-04-18 01:02:01 -05:00
parent ee8b0588c0
commit eafccfe411
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
octoprint_enclosure/static/js/enclosure.js
View File

@@ -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) {

8
octoprint_enclosure/templates/enclosure_tab.jinja2
View File

@@ -20,8 +20,8 @@
<!-- ko foreach: $root.rpi_inputs_temperature_sensors() -->
<tr>
<th class="temperature_sensor" data-bind="text: label, attr: {title: label, rowspan: $root.linkedTemperatureControl(index_id())().length}"></th>
<td class="temperature_actual" data-bind="attr: {rowspan: $root.linkedTemperatureControl(index_id())().length}">
<th class="temperature_sensor" data-bind="text: label, attr: {title: label, rowspan: $root.calculateRowSpan(index_id}"></th>
<td class="temperature_actual" data-bind="attr: {rowspan: $root.calculateRowSpan(index_id}">
<span data-bind="text: temp_sensor_temp, attr: {title: temp_sensor_temp}"> </span>
<!-- ko if: (use_fahrenheit()) -->
<span class="add-on">&deg;F</span>
@@ -31,7 +31,7 @@
<!-- /ko -->
</td>
<!-- ko if: ($root.humidityCapableSensor(temp_sensor_type())) -->
<td class="humidity_actual" data-bind="attr: {rowspan: $root.linkedTemperatureControl(index_id())().length}">
<td class="humidity_actual" data-bind="attr: {rowspan: $root.calculateRowSpan(index_id}">
<span data-bind="text: temp_sensor_humidity, attr: {title: temp_sensor_humidity}"> </span>
<span class="add-on">%</span>
</td>
@@ -39,7 +39,7 @@
<!-- ko if: ($root.hasAnySensorWithHumidity()) -->
<!-- ko ifnot: ($root.humidityCapableSensor(temp_sensor_type())) -->
<td class="humidity_actual" data-bind="attr: {rowspan: $root.linkedTemperatureControl(index_id())().length}">N/A</td>
<td class="humidity_actual" data-bind="attr: {rowspan: $root.calculateRowSpan(index_id}">N/A</td>
<!-- /ko -->
<!-- /ko -->