Adds eventtitle config to distinguish same titled panels

Adds duplicate id protection

Author: hyper-prog

config/big-sample-config.yml

@@ -18,6 +18,7 @@ GlowDash:
   Panels:                           # You can define panels here
     - Id: ppid001                   # Unique id, optional. Required if you would like to add scheduled task on this panel
       Title: Facade lighting        # Panel title text
+      EventTitle: House facade lighting   # Verbose title text which shows in schedule editor (default value is the title value)
       PanelType: Switch             # Controls a normal relay (For example lamp)
       DeviceType: Shelly
       DeviceIp: 192.168.1.101       # Ip address of shelly relay

glowdash/action.go

@@ -33,6 +33,7 @@ func NewPanelAction() *PanelAction {
 			idStr:       "",
 			panelType:   Action,
 			title:       "",
+			eventtitle:  "",
 			subPage:     "",
 			thumbImg:    "",
 			deviceType:  "",

glowdash/glowdash.go

@@ -45,6 +45,7 @@ type PanelBase struct {
 	idStr       string
 	panelType   PanelTypes
 	title       string
+	eventtitle  string
 	subPage     string
 	thumbImg    string
 	deviceType  string
@@ -55,6 +56,7 @@ type PanelBase struct {
 
 type PanelInterface interface {
 	Title() string
+	EventTitle() string
 	PanelType() PanelTypes
 	IdStr() string
 	Sub() string
@@ -292,6 +294,16 @@ func readConfig(yamlfile string) bool {
 	return false
 }
 
+func PanelIdExists(id string) bool {
+	pc := len(Panels)
+	for i := 0; i < pc; i++ {
+		if id == Panels[i].IdStr() {
+			return true
+		}
+	}
+	return false
+}
+
 func panelUpdateRequestSSE(panelIds []string) {
 	if DebugLevel > 2 {
 		fmt.Printf("Send SSE message to refresh panelId: %s \n", strings.Join(panelIds, ","))

glowdash/group.go

@@ -28,6 +28,7 @@ func NewPanelGroup() *PanelGroup {
 			idStr:       "",
 			panelType:   Group,
 			title:       "",
+			eventtitle:  "",
 			subPage:     "",
 			thumbImg:    "",
 			deviceType:  "",

glowdash/launch.go

@@ -29,6 +29,7 @@ func NewPanelLaunch() *PanelLaunch {
 			idStr:       "",
 			panelType:   Launch,
 			title:       "",
+			eventtitle:  "",
 			subPage:     "",
 			thumbImg:    "",
 			deviceType:  "",

glowdash/panelbase.go

@@ -30,6 +30,10 @@ func (p PanelBase) Title() string {
 	return p.title
 }
 
+func (p PanelBase) EventTitle() string {
+	return p.eventtitle
+}
+
 func (p PanelBase) Sub() string {
 	return p.subPage
 }
@@ -76,11 +80,20 @@ func (p *PanelBase) LoadBaseConfig(sy smartyaml.SmartYAML, indexInConfig int) {
 	p.idStr = sy.GetStringByPathWithDefault(fmt.Sprintf("/GlowDash/Panels/[%d]/Id", indexInConfig), fmt.Sprintf("autogenId%d", indexInConfig+1))
 	p.thumbImg = sy.GetStringByPathWithDefault(fmt.Sprintf("/GlowDash/Panels/[%d]/Thumbnail", indexInConfig), "")
 	p.deviceType = sy.GetStringByPathWithDefault(fmt.Sprintf("/GlowDash/Panels/[%d]/DeviceType", indexInConfig), "Unknown")
-
+	p.eventtitle = sy.GetStringByPathWithDefault(fmt.Sprintf("/GlowDash/Panels/[%d]/EventTitle", indexInConfig), "")
+	if p.eventtitle == "" {
+		p.eventtitle = p.title
+	}
 	p.hide = false
 	if sy.GetStringByPathWithDefault(fmt.Sprintf("/GlowDash/Panels/[%d]/Hide", indexInConfig), "") == "yes" {
 		p.hide = true
 	}
+
+	//Duplicated Id protection
+	conf_id := p.idStr
+	for runner := 1111 ; runner < 9999 && PanelIdExists(p.idStr) ; runner++ {
+		p.idStr = fmt.Sprintf("%s%d",conf_id,runner)
+	}
 }
 
 func (p *PanelBase) LoadCustomConfig(sy smartyaml.SmartYAML, indexInConfig int) {

glowdash/scheduleedit.go

@@ -216,7 +216,7 @@ func htmlStaticScheduleBlock(index int, cS int, s Schedule) string {
 	title := "-"
 	refPanel := GetPanelById(s.actionId)
 	if refPanel != nil {
-		title = refPanel.Title()
+		title = refPanel.EventTitle()
 	}
 	html += "<div class=\"schedule-item-act\">"
 	html += "<span class=\"schedule-item-act-id\">" + title + "</span>"
@@ -374,37 +374,37 @@ func htmlScheduleEditor(new bool, oneshotIfNew bool, s Schedule) string {
 		}
 
 		if Panels[i].PanelType() == Switch {
-			html += "<option value=\"switch:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].Title() + "</option>"
+			html += "<option value=\"switch:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].EventTitle() + "</option>"
 
 			if current {
 				subselOpts += "<option value=\"on\" " + IfTrue(s.actionParam == "on", "selected") + ">Switch On</option>"
 				subselOpts += "<option value=\"off\" " + IfTrue(s.actionParam == "off", "selected") + ">Switch Off</option>"
 			}
 		}
 		if Panels[i].PanelType() == Shading {
-			html += "<option value=\"shading:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].Title() + "</option>"
+			html += "<option value=\"shading:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].EventTitle() + "</option>"
 
 			if current {
 				subselOpts += "<option value=\"open\" " + IfTrue(s.actionParam == "open", "selected") + ">Open</option>"
 				subselOpts += "<option value=\"close\" " + IfTrue(s.actionParam == "close", "selected") + ">Close</option>"
 			}
 		}
 		if Panels[i].PanelType() == Action {
-			html += "<option value=\"action:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].Title() + "</option>"
+			html += "<option value=\"action:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].EventTitle() + "</option>"
 			if current {
 				subselOpts += "<option value=\"run\" " + IfTrue(s.actionParam == "run", "selected") + ">Run</option>"
 			}
 		}
 		if Panels[i].PanelType() == Script {
-			html += "<option value=\"script:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].Title() + "</option>"
+			html += "<option value=\"script:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].EventTitle() + "</option>"
 
 			if current {
 				subselOpts += "<option value=\"start\" " + IfTrue(s.actionParam == "start", "selected") + ">Start</option>"
 				subselOpts += "<option value=\"stop\" " + IfTrue(s.actionParam == "stop", "selected") + ">Stop</option>"
 			}
 		}
 		if Panels[i].PanelType() == Thermostat {
-			html += "<option value=\"therm:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].Title() + "</option>"
+			html += "<option value=\"therm:" + Panels[i].IdStr() + "\" " + selectedText + ">" + Panels[i].EventTitle() + "</option>"
 
 			if current {
 				apf, _ := strconv.ParseFloat(s.actionParam, 8)

glowdash/schedulepanel.go

@@ -27,8 +27,9 @@ func NewPanelScheduleShortcut() *PanelScheduleShortcut {
 	return &PanelScheduleShortcut{
 		PanelBase{
 			idStr:       "",
-			panelType:   Action,
+			panelType:   ScheduleShortcut,
 			title:       "",
+			eventtitle:  "",
 			subPage:     "",
 			thumbImg:    "",
 			deviceType:  "",

glowdash/script.go

@@ -29,6 +29,7 @@ func NewPanelScript() *PanelScript {
 				idStr:       "",
 				panelType:   Script,
 				title:       "",
+				eventtitle:  "",
 				subPage:     "",
 				thumbImg:    "",
 				deviceType:  "",

glowdash/sensors.go

@@ -38,6 +38,7 @@ func NewPanelSensors() *PanelSensors {
 			idStr:       "",
 			panelType:   Sensors,
 			title:       "",
+			eventtitle:  "",
 			subPage:     "",
 			thumbImg:    "",
 			deviceType:  "",

glowdash/shading.go

@@ -31,6 +31,7 @@ func NewPanelShading() *PanelShading {
 				idStr:       "",
 				panelType:   Shading,
 				title:       "",
+				eventtitle:  "",
 				subPage:     "",
 				thumbImg:    "",
 				deviceType:  "",

glowdash/switch.go

@@ -27,6 +27,7 @@ func NewPanelSwitch() *PanelSwitch {
 				idStr:       "",
 				panelType:   Switch,
 				title:       "",
+				eventtitle:  "",
 				subPage:     "",
 				thumbImg:    "",
 				deviceType:  "",

glowdash/thermostat.go

@@ -37,6 +37,7 @@ func NewPanelThermostat() *PanelThermostat {
 			idStr:       "",
 			panelType:   Thermostat,
 			title:       "",
+			eventtitle:  "",
 			subPage:     "",
 			thumbImg:    "",
 			deviceType:  "",