Merge branch 'development' into check_state

DewGew · Feb 6, 2024 · ab61d5b · ab61d5b
2 parents 84324a5 + 62ce6b8
commit ab61d5b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/VERSION.md b/VERSION.md
@@ -1,6 +1,4 @@
-24.6
-- Fixed "Deprecated RType () for API request" error
-- Fixed camerastream not working
+24.7
+- Added REST API read more in wiki
 - Add Security device
-- UI improvments
 - Add more selectable device types
diff --git a/static/js/smarthome.js b/static/js/smarthome.js
@@ -249,6 +249,7 @@ function refreshScenes(updateScenes) {
 				$('#lastUpdate_' + idx).html(moment(lastUpdate).fromNow())
 			}
 			$('button[id="switch_' + idx + '"]').html(data)
+			$('#data_'+ idx).html(data)
 			if (data != 'Off'){
 				$('#icon_Group_' + idx).removeClass("bi bi-toggle2-off")
 				$('#icon_Group_' + idx).addClass("bi bi-toggle2-on").css('color', green)

diff --git a/templates/dashboard.html b/templates/dashboard.html
@@ -34,6 +34,7 @@ <h5 id="title_scenes">Scenes/Groups <i class="bi bi-chevron-compact-down"></i></
 					<div class="click" onclick="toogleGroup({{ v['customData']['idx'] }})">
 					  <i class="bi bi-toggle2-off" id="icon_{{ v['customData']['domain'] }}_{{ v['customData']['idx'] }}"></i>
 					  <div class="label">{{ v['name']['name'] }}</div>
+					  <small id="data_{{ v['customData']['idx'] }}">Not available</small>
 					</div>
 					<div class="card-footer col-sm-12">
 					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
@@ -45,6 +46,7 @@ <h5 id="title_scenes">Scenes/Groups <i class="bi bi-chevron-compact-down"></i></
 					<div class="click" id="clickScene_{{ v['customData']['idx'] }}" onclick="activateScene({{ v['customData']['idx'] }})">
 					  <i class="bi bi-toggle2-off" id="icon_{{ v['customData']['domain'] }}_{{ v['customData']['idx'] }}"></i>
 					  <div class="label">{{ v['name']['name'] }}</div>
+					  <small id="sceneData_{{ v['customData']['idx'] }}" style="visibility:hidden">Activates Scene</small>
 					</div>
 					<div class="card-footer col-sm-12">
 					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
@@ -806,10 +808,12 @@ <h5 id="title_other">Other devices <small>(not supported devices)</small><i clas
 		$("#clickScene_{{ v['customData']['idx'] }}").click(function(){
 			$("#icon_{{ v['customData']['domain'] }}_{{ v['customData']['idx'] }}").removeClass("bi bi-toggle2-off");
 			$("#icon_{{ v['customData']['domain'] }}_{{ v['customData']['idx'] }}").addClass("bi bi-toggle2-on").css('color', green);
+			$("#sceneData_{{ v['customData']['idx'] }}").css('visibility','visible');
 			setTimeout(() => {
 			  $("#icon_{{ v['customData']['domain'] }}_{{ v['customData']['idx'] }}").removeClass("bi bi-toggle2-on");
 			   $("#icon_{{ v['customData']['domain'] }}_{{ v['customData']['idx'] }}").addClass("bi bi-toggle2-off").removeAttr('style');
-			}, 2000);
+			   $("#sceneData_{{ v['customData']['idx'] }}").css('visibility','hidden');
+			}, 5000);
 		});
 	{% elif v['customData']['domain'] in ('Dimmer', 'ColorSwitch', 'BlindsStop', 'BlindsPercentage') %}
 		updateDimmers_block.push("{{ v['customData']['idx'] }}")