thermostat comma

Standarduser · May 15, 2024 · eecf45d · eecf45d
1 parent ebaa61f
commit eecf45d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ The widgets are designed for VIS 1.x.
 * (Standarduser) thermostat: css-corrections
 * (Standarduser) thermostat: select for heating profile
 * (Standarduser) thermostat: added setpoint mode
+* (Standarduser) thermostat: comma
 
 ### 0.0.13 (2024-05-05)
 

diff --git a/widgets/vis-homekittiles.html b/widgets/vis-homekittiles.html
@@ -478,11 +478,12 @@
 						temperatureMin[15];
 						temperatureMax[28];
 						temperatureStep[0.5];
-						showLikeActive[true]/checkbox;"
+						comma[true]/checkbox;
+						showLikeActive[true]/checkbox;
+						texttemplate[-]/select,-,english,german/texttemplateThermostat(onChangeFunc);"
 		data-vis-attrs0="group.label;label[Thermostat];label2pre[Set at];label2post[];"
 		data-vis-attrs1="group.blockOperation;blockOperationIfTrue/checkbox;blockOperationIfFalse/checkbox;blockOperationShowIcon/checkbox;blockOperationIcon/image;blockOperationIconNotInEditor/checkbox;blockOperationUseDifferentOID/checkbox;blockOperationOID/id;"
 		data-vis-attrs2="group.thermostatDialog;
-						texttemplate[-]/select,-,english,german/texttemplateThermostat(onChangeFunc);
 						title;
 						closebuttonLabel;
 						actualTemperatureLabel;
@@ -508,13 +509,14 @@
 >
 	<div class="homekitTiles tile thermostatDialog vis-widget <%= this.data.attr('showLikeActive') ? 'state-active' : 'state-default' %> <%== this.data.attr('class') %>" style="width: 110px; height: 110px;" id="<%= this.data.attr('wid') %>">
 		<div class="vis-widget-body" id="<%= this.data.attr('wid') %>_body">
-			<span class="tileValue <%= vis.states.attr(this.data['oidActualTemperature'] + '.val') < vis.states.attr(this.data['oidSetPointTemperature'] + '.val') ? 'heating' : vis.states.attr(this.data['oidActualTemperature'] + '.val') > vis.states.attr(this.data['oidSetPointTemperature'] + '.val') ? 'cooling' : '' %>"><%= vis.states.attr(this.data['oidActualTemperature'] + '.val') %><%= this.data.attr('unitTemperature') %></span>
+
+			<span class="tileValue <%= vis.states.attr(this.data['oidActualTemperature'] + '.val') < vis.states.attr(this.data['oidSetPointTemperature'] + '.val') ? 'heating' : vis.states.attr(this.data['oidActualTemperature'] + '.val') > vis.states.attr(this.data['oidSetPointTemperature'] + '.val') ? 'cooling' : '' %>"><%= vis.binds['vis-homekittiles'].formatValue(vis.states.attr(this.data['oidActualTemperature'] + '.val'), undefined, 1, this.data.attr('comma'), false) %><%= this.data.attr('unitTemperature') %></span>
 			<div class="labelGroup1">
 				<span class="label"><%= this.data.attr('label') %></span>
 				<% if (this.data.attr('oidSetPointTemperature')) { %>
 					<br>
 					<span class="label2pre"><%= this.data.attr('label2pre') %></span>
-					<span class="label2value"><%= vis.states.attr(this.data['oidSetPointTemperature'] + '.val') %></span><span class="label2unit"><%= this.data.attr('unitTemperature') %></span>
+					<span class="label2value"><%= vis.binds['vis-homekittiles'].formatValue(vis.states.attr(this.data['oidSetPointTemperature'] + '.val'), undefined, 1, this.data.attr('comma'), false) %></span><span class="label2unit"><%= this.data.attr('unitTemperature') %></span>
 					<span class="label2post"><%= this.data.attr('label2post') %></span>
 				<% } %>
 			</div>
@@ -549,12 +551,12 @@
 		<div class="vis-widget-dialog <%== this.data.attr('class') %>" id="<%= this.data.attr('wid') %>_dialog" style="display:none" title="<%= this.data.attr('title') %>">
 
 			<div class="thermostat head">
-				<div class="actualTemperature"><span class="title"><%= this.data.attr('actualTemperatureLabel') %></span><span class="value"><%= vis.states.attr(this.data['oidActualTemperature'] + '.val') %><%= this.data.attr('unitTemperature') %></span></div>
+				<div class="actualTemperature"><span class="title"><%= this.data.attr('actualTemperatureLabel') %></span><span class="value"><%= vis.binds['vis-homekittiles'].formatValue(vis.states.attr(this.data['oidActualTemperature'] + '.val'), undefined, 1, this.data.attr('comma'), false) %><%= this.data.attr('unitTemperature') %></span></div>
 			</div>
 
 			<div class="thermostat content">
 				<div class="values">
-					<% if (this.data.attr('oidSetPointTemperature')) { %><div class="setpointTemperature"><span class="title"><%= this.data.attr('setpointTemperatureLabel') %></span><span class="value"><%= vis.states.attr(this.data['oidSetPointTemperature'] + '.val') %><%= this.data.attr('unitTemperature') %></span></div><% } %>
+					<% if (this.data.attr('oidSetPointTemperature')) { %><div class="setpointTemperature"><span class="title"><%= this.data.attr('setpointTemperatureLabel') %></span><span class="value"><%= vis.binds['vis-homekittiles'].formatValue(vis.states.attr(this.data['oidSetPointTemperature'] + '.val'), undefined, 1, this.data.attr('comma'), false) %><%= this.data.attr('unitTemperature') %></span></div><% } %>
 					<% if (this.data.attr('oidSetPointMode')) {
 						var setpointMode = vis.states.attr(this.data['oidSetPointMode'] + '.val').toString();
 						var setpointModeValue = (data.attr('setpointModeValues') ? data.attr('setpointModeValues').split(';') : []);

diff --git a/widgets/vis-homekittiles/js/vis-homekittiles.js b/widgets/vis-homekittiles/js/vis-homekittiles.js
@@ -950,6 +950,9 @@ vis.binds["vis-homekittiles"] = {
 
 		switch (texttemplate) {
 			case 'english':
+				vis.views[view].widgets[widgetID].data.label2pre				= 'Set at';
+				vis.views[view].widgets[widgetID].data.label2post				= '';
+
 				vis.views[view].widgets[widgetID].data.title					= 'Room';
 				vis.views[view].widgets[widgetID].data.closebuttonLabel			= 'Close';
 				vis.views[view].widgets[widgetID].data.actualTemperatureLabel	= 'Actual temperature';
@@ -968,6 +971,9 @@ vis.binds["vis-homekittiles"] = {
 				vis.views[view].widgets[widgetID].data.unreachLabel				= 'Unreach';
 				break;
 			case 'german':
+				vis.views[view].widgets[widgetID].data.label2pre				= '';
+				vis.views[view].widgets[widgetID].data.label2post				= 'eingestellt';
+
 				vis.views[view].widgets[widgetID].data.title					= 'Raum';
 				vis.views[view].widgets[widgetID].data.closebuttonLabel			= 'Schließen';
 				vis.views[view].widgets[widgetID].data.actualTemperatureLabel	= 'Aktuelle Temperatur';
@@ -977,8 +983,8 @@ vis.binds["vis-homekittiles"] = {
 				vis.views[view].widgets[widgetID].data.setpointModeTexts		= 'Auto;Manuell;Urlaub';
 				vis.views[view].widgets[widgetID].data.actualHumidityLabel		= 'Feuchte';
 				vis.views[view].widgets[widgetID].data.activeProfileLabel		= 'Heizprofil';
-				vis.views[view].widgets[widgetID].data.activeProfileValues		= '1;2;3;4;5;6';
-				vis.views[view].widgets[widgetID].data.activeProfileTexts		= 'Komfort;Eco;-;-;Vorheizen;Abwesend';
+				vis.views[view].widgets[widgetID].data.activeProfileValues		= '1;2;5;6';
+				vis.views[view].widgets[widgetID].data.activeProfileTexts		= 'Komfort;Eco;Vorheizen;Abwesend';
 				vis.views[view].widgets[widgetID].data.windowStateLabel			= 'Fenster';
 				vis.views[view].widgets[widgetID].data.windowStateValues		= '0;1';
 				vis.views[view].widgets[widgetID].data.windowStateTexts			= 'zu;auf';