Fix in schedule shortcut panel

Author: hyper-prog

config/big-sample-config.yml

@@ -68,7 +68,7 @@ GlowDash:
       Title: Sensors
       PanelType: Sensors   # Shows the current values of some sensors
       DeviceType: smtherm  # SMTherm - daemon
-      DeviceIp: 192.168.1.10   
+      DeviceIp: 192.168.1.10
       Sensors:
         - Name: Living room     # Display name of the sensor
           Code: livingroom      # Codename of the sensor in SMTherm
@@ -79,7 +79,7 @@ GlowDash:
 
     - Id: ppid003
       PanelType: ScheduleShortcut  # Shortcut to a scheduled task
-      ScheduleName: "Moring wake up"
+      ScheduleName: "Morning wake up"
 
     - Id: ppidheaterset
       Title: Central heating

docs/local-docker-compose-file/docker-compose.yml renamed to docs/docker-compose-files/local-build-for-dev.yml

@@ -0,0 +1,22 @@
+services:
+  glowdash:
+    image: hyperprog/glowdash
+    restart: unless-stopped
+    environment:
+      TZ: "Europe/Budapest"
+    ports:
+      - "80:80"
+    volumes:
+      - ./userstuff:/glowdash/user
+      - ./config:/glowdash/config
+  hassesdaemon:
+    image: hyperprog/hassesdaemon
+    container_name: hasses_sse_srv
+    restart: always
+    ports:
+      - "8080:8080"
+      - "8085:8085"
+    logging:
+      options:
+        max-size: 5m
+

docs/docker-compose-files/with-sse-server.yml

@@ -140,7 +140,7 @@ var CommSSEHost string = ""
 var CommSSEPort int = 8085
 var BackgroudDevQueryNetDialerTimeout time.Duration = time.Duration(1200) * time.Millisecond
 var BackgroudDevQueryNetKeepaliveTimeout time.Duration = time.Duration(1200) * time.Millisecond
-var AssetVer string = "107"
+var AssetVer string = "108"
 
 var Panels []PanelInterface
 var Pages []PageInterface

glowdash/glowdash.go

@@ -58,7 +58,7 @@ func (p PanelScheduleShortcut) PanelHtml(withContainer bool) string {
 		</div>
 	</div>
 
-	<div class="main-container panelnoinfo" data-refid="b-{{.Id}}">
+	<div class="main-container {{if .MissingSchedule}}panelnoinfo{{end}}" data-refid="b-{{.Id}}">
 		<div class="main-container-top">
 			<div class="placeholdersp"></div>
 
@@ -116,8 +116,6 @@ func (p PanelScheduleShortcut) PanelHtml(withContainer bool) string {
 		Disabled:        connectedSchedule && !s.enabled,
 	}
 
-	///Reggeli ébresztő
-
 	buffer := bytes.Buffer{}
 	templ.Execute(&buffer, pass)
 
@@ -153,6 +151,9 @@ func (p PanelScheduleShortcut) IsActionIdMatch(aId string) bool {
 	if "b-"+p.idStr+"-updateclock" == aId {
 		return true
 	}
+	if "b-"+p.idStr+"-update" == aId {
+		return true
+	}
 	return false
 }
 
@@ -168,17 +169,18 @@ func (p PanelScheduleShortcut) DoAction(actionName string, parameters map[string
 	var updatedIds []string = []string{}
 	if actionName == "toggle" {
 		idx := getScheduleIndex(p.scheduleName)
-		if idx > 0 {
+		if idx >= 0 {
 			s := getScheduleByIndex(idx)
 			s.enabled = !s.enabled
 			updateSchedule(idx, s)
+
 			stateChanged = true
 			updatedIds = append(updatedIds, p.QueryDevice()...)
 		}
 	}
 	if actionName == "updateclock" {
 		idx := getScheduleIndex(p.scheduleName)
-		if idx > 0 {
+		if idx >= 0 {
 			s := getScheduleByIndex(idx)
 			if len(parameters["toclock"]) > 3 && parameters["toclock"][0] == 'h' {
 				hmtxt := strings.Split(parameters["toclock"][1:], "m")
@@ -193,10 +195,12 @@ func (p PanelScheduleShortcut) DoAction(actionName string, parameters map[string
 					}
 				}
 			}
-
 			updatedIds = append(updatedIds, p.QueryDevice()...)
 		}
 	}
+	if actionName == "update" {
+		updatedIds = append(updatedIds, p.QueryDevice()...)
+	}
 	return "ok", updatedIds, stateChanged
 }
 

glowdash/schedulepanel.go

@@ -173,7 +173,7 @@ function sendRequestForPanelId(id,reqSuffix,param) {
     xhrRequests.set(id,xhr);
     let url_to_call = '/action/'+id+"-"+reqSuffix+"?otsseid="+ot_sse_id;
     if(param != null && param != "" && param.length > 0 )
-        url_to_call += "?" + param;
+        url_to_call += "&" + param;
     xhr.open('GET',url_to_call , true);
     xhr.onreadystatechange = function(e) {
         xhrRequests.delete(id);
@@ -430,7 +430,7 @@ function initClockPickerBlocks() {
     const allClockPickerBlock = document.getElementsByClassName("clockpicker-controller-block");
     for (let i = 0; i < allClockPickerBlock.length; i++) {
         if(allClockPickerBlock[i].classList.contains('clockpicker-processed'))
-            continue; 
+            continue;
         let mainId = allClockPickerBlock[i].dataset.mainid;
         init_clockselector(mainId);
         allClockPickerBlock[i].classList.add('clockpicker-processed');
@@ -470,7 +470,7 @@ function initActionSubselector() {
     const allActionSelector = document.getElementsByClassName("schedule-action-selector");
     for (let i = 0; i < allActionSelector.length; i++) {
         if(allActionSelector[i].classList.contains('action-selector-processed'))
-            continue; 
+            continue;
         let actionSubId = allActionSelector[i].dataset.actionsubid;
         allActionSelector[i].addEventListener('change',function(e){
             fillActionSubselect(e.target.value,actionSubId);
@@ -494,6 +494,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
     handleJustMovingPanels();
     handleDeferredInfos();
     initUnravedGauges();
+    initClockPickerBlocks();
     startSSE();
     updateTime();
 });