From e7cd34cd21c20a2f84ba6d71078ae23610390fd6 Mon Sep 17 00:00:00 2001
From: Calvin McLean <calvinlmc@gmail.com>
Date: Wed, 24 Apr 2024 21:53:00 -0700
Subject: [PATCH 1/2] Do not fetch WaterHistory when listing Zones

---
 garden-app/server/zone_responses.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/garden-app/server/zone_responses.go b/garden-app/server/zone_responses.go
index 7f4b3a1b..da7ec0c7 100644
--- a/garden-app/server/zone_responses.go
+++ b/garden-app/server/zone_responses.go
@@ -101,16 +101,16 @@ func (zr *ZoneResponse) Render(w http.ResponseWriter, r *http.Request) error {
 	)
 
 	if render.GetAcceptedContentType(r) == render.ContentTypeHTML {
-		history, apiErr := zr.api.getWaterHistoryFromRequest(r, zr.Zone, logger)
-		// non-fatal error so we can still render the HTML page
-		if apiErr != nil {
-			logger.Error("error getting water history", "error", apiErr)
-			zr.HistoryError = apiErr.ErrorText
-			return nil
+		// only get history when rendering a ZoneDetail page
+		if zr.api.GetIDParam(r) != "" {
+			history, apiErr := zr.api.getWaterHistoryFromRequest(r, zr.Zone, logger)
+			if apiErr != nil {
+				logger.Error("error getting water history", "error", apiErr)
+				zr.HistoryError = apiErr.ErrorText
+			}
+			zr.History = NewZoneWaterHistoryResponse(history)
 		}
 
-		zr.History = NewZoneWaterHistoryResponse(history)
-
 		if r.Method == http.MethodPut {
 			w.Header().Add("HX-Trigger", "newZone")
 		}

From db836ae30be6bbe494334b259d1b807d7c5b0eb6 Mon Sep 17 00:00:00 2001
From: Calvin McLean <calvinlmc@gmail.com>
Date: Wed, 24 Apr 2024 21:53:17 -0700
Subject: [PATCH 2/2] Add quick water dropdown to ZoneCard

---
 garden-app/server/templates.go         | 21 +++++++++++++++++++++
 garden-app/server/templates/zones.html | 21 +++++++++++++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/garden-app/server/templates.go b/garden-app/server/templates.go
index 721c6e2e..c3aa3e96 100644
--- a/garden-app/server/templates.go
+++ b/garden-app/server/templates.go
@@ -129,6 +129,27 @@ func templateFuncs(r *http.Request) map[string]any {
 				return item.String() == target.String()
 			})
 		},
+		"ZoneQuickWater": func(z *ZoneResponse) []string {
+			var waterDurations []string
+			if z.NextWater.Duration == nil || z.NextWater.Duration.Duration == 0 {
+				return append(waterDurations, "15m", "30m", "1h")
+			}
+
+			divideDuration := func(d time.Duration, f int) string {
+				divided := time.Duration(int(d.Seconds())/f) * time.Second
+				if divided > time.Minute {
+					divided = (divided + 30*time.Second).Truncate(time.Minute)
+				}
+				return formatDuration(&pkg.Duration{Duration: divided})
+			}
+
+			baseDuration := z.NextWater.Duration.Duration
+			waterDurations = append(waterDurations, divideDuration(baseDuration, 4))
+			waterDurations = append(waterDurations, divideDuration(baseDuration, 2))
+			waterDurations = append(waterDurations, divideDuration(baseDuration, 1))
+
+			return waterDurations
+		},
 	}
 }
 
diff --git a/garden-app/server/templates/zones.html b/garden-app/server/templates/zones.html
index 6308a41b..c179275d 100644
--- a/garden-app/server/templates/zones.html
+++ b/garden-app/server/templates/zones.html
@@ -46,7 +46,7 @@ <h3 class="uk-card-title uk-margin-remove-bottom uk-text-center">
 {{ define "nextWaterDetail" }}
 {{ if and .Duration .Time }}
 <div>
-    </span> Watering for
+    Watering for
     <span class="uk-text-primary">{{ FormatDuration .Duration }}</span>
     {{ FormatUpcomingDate .Time }}
 </div>
@@ -61,7 +61,6 @@ <h3 class="uk-card-title uk-margin-remove-bottom uk-text-center">
 
 {{ define "infoPopover" }}
 <div class="uk-inline">
-    <span class="uk-margin-small-right" uk-icon="info"></span>
     <div uk-dropdown>
         <p><b>{{ .ID }}</b></p>
         <p>Position: {{ .Position }}</p>
@@ -73,17 +72,31 @@ <h3 class="uk-card-title uk-margin-remove-bottom uk-text-center">
 {{ define "zoneActionButton" }}
 <div id="action-modal-here"></div>
 <div class="uk-inline">
-    <button class="uk-button uk-button-default" type="button">Actions</button>
+    <button class="uk-button uk-button-default" type="button">Quick Water</button>
     <div uk-dropdown>
         <ul class="uk-nav uk-dropdown-nav">
             <li>
                 <a hx-get="/gardens/{{ .GardenID }}/zones/{{ .ID }}/components?type=action_modal"
                     hx-headers='{"Accept": "text/html"}' hx-target="#action-modal-here"
                     _="on htmx:afterOnLoad wait 10ms then add .uk-open to #modal">
-                    <span uk-icon="cloud-download"></span> Water
+                    Custom
                 </a>
             </li>
+
+            {{ template "quickWaterLinks" . }}
         </ul>
     </div>
 </div>
+{{ end }}
+
+{{ define "quickWaterLinks" }}
+{{ $zone := . }}
+{{ range (ZoneQuickWater .) }}
+<li>
+    <a hx-post="/gardens/{{ $zone.GardenID }}/zones/{{ $zone.ID }}/action" hx-include="this" hx-swap="none" {{
+        template "actionFeedback" "primary" }}>
+        <input type="hidden" name="water.duration" value="{{ . }}"> {{ . }}
+    </a>
+</li>
+{{ end }}
 {{ end }}
\ No newline at end of file