Merge pull request #2013 from mcspr/web/sch-init-order

Since relayState is no longer in the same obj as relayConfig, init relays when matching relayConfig.
Also a small update to the scheduler (...which needs more cleanup...), fix getSetting("schType", i, 0) when sending ws data

code/espurna/scheduler.ino

@@ -55,7 +55,7 @@ void _schWebSocketOnConnected(JsonObject &root){
 
         switch_.add(getSetting("schSwitch", i, 0).toInt());
         action.add(getSetting("schAction", i, 0).toInt());
-        type.add(getSetting("schType", i, 0).toInt());
+        type.add(getSetting("schType", i, SCHEDULER_TYPE_SWITCH).toInt());
         hour.add(getSetting("schHour", i, 0).toInt());
         minute.add(getSetting("schMinute", i, 0).toInt());
         weekdays.add(getSetting("schWDs", i, SCHEDULER_WEEKDAYS));

code/html/custom.js

@@ -983,8 +983,7 @@ function addSchedule(event) {
     var type = (1 === event.data.schType) ? "switch" : "light";
 
     template = $("#" + type + "ActionTemplate").children();
-    var actionLine = template.clone();
-    $(line).find("#schActionDiv").append(actionLine);
+    $(line).find("#schActionDiv").append(template.clone());
 
     $(line).find("input").each(function() {
         $(this).attr("tabindex", tabindex);
@@ -1028,10 +1027,6 @@ function initRelays(data) {
         $("label.toggle", line).prop("for", "relay" + i)
         line.appendTo("#relays");
 
-        // Populate the relay SELECTs
-        $("select.isrelay").append(
-            $("<option></option>").attr("value",i).text("Switch #" + i));
-
     }
 
 }
@@ -1096,6 +1091,11 @@ function initRelayConfig(data) {
         }
 
         line.appendTo("#relayConfig");
+
+        // Populate the relay SELECTs
+        $("select.isrelay").append(
+            $("<option></option>").attr("value",i).text("Switch #" + i));
+
     }
 
 }