Add UI for WaterSchedule.NotificationClientID

calvinmclean · Jul 10, 2024 · 87ff3e1 · 87ff3e1
1 parent 2d99fa7
commit 87ff3e1
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 10 deletions.
diff --git a/garden-app/server/garden.go b/garden-app/server/garden.go
@@ -114,7 +114,7 @@ func NewGardenAPI() *GardensAPI {
 func (api *GardensAPI) gardenModalRenderer(ctx context.Context, g *pkg.Garden) render.Renderer {
 	notificationClients, err := api.storageClient.NotificationClientConfigs.GetAll(ctx, nil)
 	if err != nil {
-		return babyapi.InternalServerError(fmt.Errorf("error getting all waterschedules to create zone modal: %w", err))
+		return babyapi.InternalServerError(fmt.Errorf("error getting all notification clients to create garden modal: %w", err))
 	}
 
 	slices.SortFunc(notificationClients, func(nc1 *notifications.Client, nc2 *notifications.Client) int {

diff --git a/garden-app/server/templates.go b/garden-app/server/templates.go
@@ -156,10 +156,11 @@ func templateFuncs(r *http.Request) map[string]any {
 				return item.String() == target.String()
 			})
 		},
-		"CompareNotificationClientID": func(ncID babyapi.ID, ls *pkg.LightSchedule) bool {
-			return ls != nil &&
-				ls.NotificationClientID != nil &&
-				ncID.String() == *ls.NotificationClientID
+		"CompareNotificationClientID": func(ncID babyapi.ID, parent interface {
+			GetNotificationClientID() string
+		},
+		) bool {
+			return ncID.String() == parent.GetNotificationClientID()
 		},
 		"ZoneQuickWater": func(z *ZoneResponse) []string {
 			var waterDurations []string

diff --git a/garden-app/server/templates/water_schedule_modal.html b/garden-app/server/templates/water_schedule_modal.html
@@ -27,9 +27,6 @@ <h3 class="uk-modal-title">{{ if .Duration }}{{ $name }}{{ else }}Create Water S
                     name="Interval">
             </div>
             <div class="uk-margin">
-                <input class="uk-input" value="{{ if .StartTime }}{{ .StartTime }}{{ else }}15:04:05Z{{ end }}"
-                    placeholder="Start Time" name="StartTime">
-
                 <div class="uk-margin">
                     {{ if .StartTime }}
                     {{ template "startTimeInput" (args "Name" "StartTime" "StartTime" .StartTime) }}
@@ -49,6 +46,22 @@ <h3 class="uk-modal-title">{{ if .Duration }}{{ $name }}{{ else }}Create Water S
                     {{ MonthRows .ActivePeriod false }}
                 </select>
             </div>
+
+            <div class="uk-margin">
+                <label class="uk-form-label" for="notification-client-select">Notification Client</label>
+                <select id="notification-client-select" class="uk-select" name="NotificationClientID">
+                    {{ $noClientSelected := true }}
+                    {{ if ne . nil }}
+                    $noClientSelected = eq .NotificationClientID nil
+                    {{ end }}
+                    <option disabled {{ if $noClientSelected }}selected{{ end }}>Notification Client</option>
+
+                    {{ $ws := . }}
+                    {{ range $i, $nc := .NotificationClients }}
+                    <option value="{{ $nc.ID }}" {{ if CompareNotificationClientID $nc.ID $ws }}selected{{ end }}>{{ $nc.Name }}</option>
+                    {{ end }}
+                </select>
+            </div>
 
             {{ template "modalSubmitButton" }}
             {{ if .Duration }}

diff --git a/garden-app/server/water_schedule.go b/garden-app/server/water_schedule.go
@@ -5,8 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"slices"
+	"strings"
 
 	"github.com/calvinmclean/automated-garden/garden-app/pkg"
+	"github.com/calvinmclean/automated-garden/garden-app/pkg/notifications"
 	"github.com/calvinmclean/automated-garden/garden-app/pkg/storage"
 	"github.com/calvinmclean/automated-garden/garden-app/worker"
 	"github.com/calvinmclean/babyapi"
@@ -80,7 +83,7 @@ func NewWaterSchedulesAPI() *WaterSchedulesAPI {
 	api.AddCustomRoute(http.MethodGet, "/components", babyapi.Handler(func(_ http.ResponseWriter, r *http.Request) render.Renderer {
 		switch r.URL.Query().Get("type") {
 		case "create_modal":
-			return waterScheduleModalTemplate.Renderer(&pkg.WaterSchedule{
+			return api.waterScheduleModalRenderer(r.Context(), &pkg.WaterSchedule{
 				ID: babyapi.NewID(),
 			})
 		default:
@@ -91,7 +94,7 @@ func NewWaterSchedulesAPI() *WaterSchedulesAPI {
 	api.AddCustomIDRoute(http.MethodGet, "/components", api.GetRequestedResourceAndDo(func(r *http.Request, ws *pkg.WaterSchedule) (render.Renderer, *babyapi.ErrResponse) {
 		switch r.URL.Query().Get("type") {
 		case "edit_modal":
-			return waterScheduleModalTemplate.Renderer(ws), nil
+			return api.waterScheduleModalRenderer(r.Context(), ws), nil
 		case "detail_modal":
 			return waterScheduleDetailModalTemplate.Renderer(ws), nil
 		default:
@@ -104,6 +107,22 @@ func NewWaterSchedulesAPI() *WaterSchedulesAPI {
 	return api
 }
 
+func (api *WaterSchedulesAPI) waterScheduleModalRenderer(ctx context.Context, ws *pkg.WaterSchedule) render.Renderer {
+	notificationClients, err := api.storageClient.NotificationClientConfigs.GetAll(ctx, nil)
+	if err != nil {
+		return babyapi.InternalServerError(fmt.Errorf("error getting all notification clients to create water schedule modal: %w", err))
+	}
+
+	slices.SortFunc(notificationClients, func(nc1 *notifications.Client, nc2 *notifications.Client) int {
+		return strings.Compare(nc1.Name, nc2.Name)
+	})
+
+	return waterScheduleModalTemplate.Renderer(struct {
+		*pkg.WaterSchedule
+		NotificationClients []*notifications.Client
+	}{ws, notificationClients})
+}
+
 func (api *WaterSchedulesAPI) setup(storageClient *storage.Client, worker *worker.Worker) error {
 	api.storageClient = storageClient
 	api.worker = worker