Merge pull request #567 from gaudryc/fix_some_selector_switch_misses

Fix some selector switch misses

Author: gizmocuz

main/WebServer.cpp

@@ -3466,7 +3466,7 @@ namespace http {
 				root["status"] = "OK";
 				root["title"] = "GetLightSwitches";
 				std::vector<std::vector<std::string> > result;
-				result = m_sql.safe_query("SELECT ID, Name, Type, SubType, Used, SwitchType FROM DeviceStatus ORDER BY Name");
+				result = m_sql.safe_query("SELECT ID, Name, Type, SubType, Used, SwitchType, Options FROM DeviceStatus ORDER BY Name");
 				if (result.size() > 0)
 				{
 					std::vector<std::vector<std::string> >::const_iterator itt;
@@ -3481,6 +3481,7 @@ namespace http {
 						int SubType = atoi(sd[3].c_str());
 						int used = atoi(sd[4].c_str());
 						_eSwitchType switchtype = (_eSwitchType)atoi(sd[5].c_str());
+						std::map<std::string, std::string> options = m_sql.BuildDeviceOptions(sd[6]);
 						bool bdoAdd=false;
 						switch (Type)
 						{
@@ -3528,9 +3529,28 @@ namespace http {
 								bool bIsDimmer = (
 									(switchtype == STYPE_Dimmer) ||
 									(switchtype == STYPE_BlindsPercentage) ||
-									(switchtype == STYPE_BlindsPercentageInverted)
+									(switchtype == STYPE_BlindsPercentageInverted) ||
+									(switchtype == STYPE_Selector)
 									);
 								root["result"][ii]["IsDimmer"] = bIsDimmer;
+								std::string dimmerLevels = bIsDimmer ? "all" : "none";
+								if (switchtype == STYPE_Selector) {
+									std::stringstream ss;
+									std::map<std::string, std::string> selectorStatuses;
+									GetSelectorSwitchStatuses(options, selectorStatuses);
+									bool levelOffHidden = options["LevelOffHidden"] == "true";
+									for(int i = 0; i < selectorStatuses.size(); i++) {
+										if (levelOffHidden && (i == 0)) {
+											continue;
+										}
+										if((levelOffHidden && (i > 1)) || (i > 0)) {
+											ss << ",";
+										}
+										ss << i * 10;
+									}
+									dimmerLevels = ss.str();
+								}
+								root["result"][ii]["DimmerLevels"] = dimmerLevels;
 								ii++;
 							}
 							break;

main/mainworker.cpp

@@ -11682,6 +11682,15 @@ bool MainWorker::SwitchScene(const unsigned long long idx, const std::string &sw
 						fLevel=100;
 					ilevel=round(fLevel)+1;
 				}
+				if (switchtype == STYPE_Selector) {
+					if (lstatus != "Set Level") {
+						ilevel = 0;
+					}
+					ilevel = round(ilevel/10.0f)*10; // select only multiples of 10
+					if (ilevel == 0) {
+						lstatus ="Off";
+					}
+				}
 			}
 
 			int idx = atoi(sd[0].c_str());

www/app/DevicesController.js

@@ -269,6 +269,14 @@ define(['app'], function (app) {
 									else {
 													itemImage='<img src="images/push.png" title="Turn On" onclick="SwitchScene(' + item.idx + ',\'On\',ShowDevices);" class="lcursor">';
 									}
+				  } else if (item.SubType === "Selector Switch") {
+					var imagePath; 
+					if (item.CustomImage !== 0) {
+						imagePath = (this.levelName === "Off") ? "images/" + item.Image + "48_Off.png" : "images/" + item.Image + "48_On.png";
+					} else {
+						imagePath = (this.levelName === "Off") ? "images/" + item.TypeImg + "48_Off.png" : "images/" + item.TypeImg + "48_On.png";
+					}
+					itemImage = '<img src="' + imagePath + '" width="16" height="16">';
 				  }
 				  if ((item.Type == "Group")||(item.Type == "Scene")) {
 					itemSubIcons+='&nbsp;<img src="images/empty16.png">';

www/app/ScenesController.js

@@ -566,24 +566,29 @@ define(['app'], function (app) {
 			}
 			var bShowLevel=false;
 			var bIsLED=false;
+			var dimmerLevels = "none";
 			$.each($.LightsAndSwitches, function(i,item){
 				if (item.idx==DeviceIdx) {
 					bShowLevel=item.isdimmer;
 					bIsLED=(item.SubType.indexOf("RGB") >= 0);
+					dimmerLevels = item.DimmerLevels;
 				}
 			});
 
+			$("#scenecontent #LedColor").hide();
+			$("#scenecontent #LevelDiv").hide();
 			if (bIsLED) {
 				$("#scenecontent #LedColor").show();
-				$("#scenecontent #LevelDiv").hide();
-			}
-			else {
-				$("#scenecontent #LedColor").hide();
+			} else {
 				if (bShowLevel==true) {
-					$("#scenecontent #LevelDiv").show();
-				}
-				else {
-					$("#scenecontent #LevelDiv").hide();
+					var levelDiv$ = $("#scenecontent #LevelDiv");
+					levelDiv$.find("option").show().end().show();
+					if (dimmerLevels !== "all") {
+						levelDiv$.find("option").hide();
+						$.each(dimmerLevels.split(','), function(i, level) {
+							levelDiv$.find("option[value=\"" + level + "\"]").show();
+						});
+					}
 				}
 			}
 		}
@@ -718,7 +723,8 @@ define(['app'], function (app) {
 									idx: item.idx,
 									name: item.Name,
 									SubType: item.SubType,
-									isdimmer: item.IsDimmer
+									isdimmer: item.IsDimmer,
+									DimmerLevels: item.DimmerLevels
 								 }
 							);
 				});

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 1233
+# ref 1234
 
 CACHE:
 # CSS