- Changed: Alert sensor, removed level notation in user interface

Author: gizmocuz

History.txt

@@ -30,6 +30,7 @@ Version 2.3xxx
 - Implemented: Waterflow sensor
 - Implemented: Wind Beaufort scale
 - Implemented: Wind Graph, option to delete a short-log data point
+- Changed: Alert sensor, removed level notation in user interface
 - Changed: EventSystem, don't process unused devices
 - Changed: Fritzbox, Now updating text sensor on connect/disconnect
 - Changed: OpenZWave, Control Panel log starts displaying from the end when entering for the first time

main/WebServer.cpp

@@ -9444,12 +9444,10 @@ namespace http {
 						}
 						else if (dSubType == sTypeAlert)
 						{
-							sprintf(szData, "Level: %d", nValue);
-							root["result"][ii]["Data"] = szData;
 							if (!sValue.empty())
-								root["result"][ii]["Desc"] = sValue;
+								root["result"][ii]["Data"] = sValue;
 							else
-								root["result"][ii]["Desc"] = Get_Alert_Desc(nValue);
+								root["result"][ii]["Data"] = Get_Alert_Desc(nValue);
 							root["result"][ii]["TypeImg"] = "Alert";
 							root["result"][ii]["Level"] = nValue;
 							root["result"][ii]["HaveTimeout"] = false;

www/app/DashboardController.js

@@ -1310,7 +1310,7 @@ define(['app'], function (app) {
 											}
 								}
 								else if (item.SubType=="Alert") {
-									status=item.Data + " (" + item.Desc + ")" + ' <img src="images/Alert48_' + item.Level + '.png" height="16" width="16">';
+									status=item.Data + ' <img src="images/Alert48_' + item.Level + '.png" height="16" width="16">';
 								}
 								else if ((item.Type == "Thermostat")&&(item.SubType=="SetPoint")) {
 									status+=item.Data + '\u00B0 ' + $scope.config.TempSign;
@@ -1391,7 +1391,7 @@ define(['app'], function (app) {
 									status=item.Data;
 								}
 								else if (item.SubType=="Alert") {
-									status=item.Data + " (" + item.Desc + ")";
+									status=item.Data;
 									img='<img src="images/Alert48_' + item.Level + '.png" height="40" width="40">';
 								}
 								else if (item.Type == "Lux") {
@@ -3179,7 +3179,7 @@ define(['app'], function (app) {
 									}
 						}
 						else if (item.SubType=="Alert") {
-							status=item.Data + " (" + item.Desc + ")" + ' <img src="images/Alert48_' + item.Level + '.png" height="16" width="16">';
+							status=item.Data + ' <img src="images/Alert48_' + item.Level + '.png" height="16" width="16">';
 						}
 						else if ((item.Type == "Thermostat")&&(item.SubType=="SetPoint")) {
 							status=' <button class="btn btn-mini btn-info" type="button" onclick="ShowSetpointPopup(event, ' + item.idx + ', ShowFavorites, ' + item.Protected + ', ' + item.Data + ',true);">' + item.Data + '\u00B0 ' + $scope.config.TempSign +'</button> ';
@@ -3383,7 +3383,7 @@ define(['app'], function (app) {
 						}
 						else if (item.SubType=="Alert") {
 							xhtm+='Alert48_' + item.Level + '.png" class="lcursor" onclick="ShowTextLog(\'#dashcontent\',\'ShowFavorites\',' + item.idx + ',\'' + escape(item.Name) + '\');" height="40" width="40"></td>\n';
-							status=item.Data + " (" + item.Desc + ")";
+							status=item.Data;
 						}
 						else if (item.SubType=="Pressure") {
 							xhtm+='gauge48.png" class="lcursor" onclick="ShowGeneralGraph(\'#dashcontent\',\'ShowFavorites\',' + item.idx + ',\'' + escape(item.Name) + '\',' + item.SwitchTypeVal +', \'' + item.SubType + '\');" height="40" width="40"></td>\n';

www/app/UtilityController.js

@@ -726,7 +726,7 @@ define(['app'], function (app) {
 							status=item.Data;
 						}
 						else if (item.SubType == "Alert") {
-							status=item.Data + " (" + item.Desc + ")";
+							status=item.Data;
 							img='<img src="images/Alert48_' + item.Level + '.png" height="48" width="48">';
 						}
 						else if (item.Type == "Lux") {
@@ -1065,7 +1065,7 @@ define(['app'], function (app) {
 					}
 					else if (item.SubType == "Alert") {
 					  xhtm+='Alert48_' + item.Level + '.png" height="48" width="48"></td>\n';
-					  status=item.Data + " (" + item.Desc + ")";
+					  status=item.Data;
 					}
 					else if (item.SubType == "Pressure") {
 					  xhtm+='gauge48.png" height="48" width="48"></td>\n';

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 1173
+# ref 1175
 
 CACHE:
 # CSS