From f007dd1f63e038c091def6f313e36c466cf25971 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Tue, 6 Sep 2022 15:47:30 -0400
Subject: [PATCH] use select for occupancy fields

---
 views/lotOccupancy-edit.ejs | 52 ++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/views/lotOccupancy-edit.ejs b/views/lotOccupancy-edit.ejs
index 213c40f6..417e1e5c 100644
--- a/views/lotOccupancy-edit.ejs
+++ b/views/lotOccupancy-edit.ejs
@@ -171,16 +171,48 @@
                                         <%= lotOccupancyField.occupancyTypeField %>
                                     </label>
                                     <div class="control">
-                                        <input class="input"
-                                            id="lotOccupancy--lotOccupancyFieldValue_<%= lotOccupancyField.occupancyTypeFieldId %>"
-                                            name="lotOccupancyFieldValue_<%= lotOccupancyField.occupancyTypeFieldId %>"
-                                            type="text"
-                                            value="<%= lotOccupancyField.lotOccupancyFieldValue %>"
-                                            <% if (lotOccupancyField.pattern !== "") { %>
-                                                pattern="<%= lotOccupancyField.pattern %>"
-                                            <% } %>
-                                            minlength="<%= lotOccupancyField.minimumLength %>"
-                                            maxlength="<%= lotOccupancyField.maximumLength %>" />
+                                        <% if (lotOccupancyField.occupancyTypeFieldValues === "") { %>
+                                            <input class="input"
+                                                id="lotOccupancy--lotOccupancyFieldValue_<%= lotOccupancyField.occupancyTypeFieldId %>"
+                                                name="lotOccupancyFieldValue_<%= lotOccupancyField.occupancyTypeFieldId %>"
+                                                type="text"
+                                                value="<%= lotOccupancyField.lotOccupancyFieldValue %>"
+                                                <% if (lotOccupancyField.pattern !== "") { %>
+                                                    pattern="<%= lotOccupancyField.pattern %>"
+                                                <% } %>
+                                                minlength="<%= lotOccupancyField.minimumLength %>"
+                                                maxlength="<%= lotOccupancyField.maximumLength %>"
+                                                <%= lotOccupancyField.isRequired ? " required" : "" %> />
+                                        <% } else { %>
+                                            <%
+                                                const fieldValues = lotOccupancyField.occupancyTypeFieldValues.split("\n");
+                                                let valueFound = false;
+                                            %>
+                                            <div class="select is-fullwidth">
+                                                <select id="lotOccupancy--lotOccupancyFieldValue_<%= lotOccupancyField.occupancyTypeFieldId %>"
+                                                    name="lotOccupancyFieldValue_<%= lotOccupancyField.occupancyTypeFieldId %>">
+                                                    <% if (!lotOccupancyField.isRequired || lotOccupancyField.lotOccupancyFieldValue === "") { %>
+                                                        <option value="">(Not Set)</option>
+                                                    <% } %>
+                                                    <% for (const fieldValue of fieldValues) { %>
+                                                        <% 
+                                                            if (fieldValue === lotOccupancyField.lotOccupancyFieldValue) {
+                                                                valueFound = true;
+                                                            }
+                                                        %>
+                                                        <option value="<%= fieldValue %>"
+                                                            <%= (fieldValue === lotOccupancyField.lotOccupancyFieldValue ? " selected" : "") %>>
+                                                            <%= fieldValue %>
+                                                        </option>
+                                                    <% } %>
+                                                    <% if (!valueFound && lotOccupancyField.lotOccupancyFieldValue !== "") { %>
+                                                        <option value="<%= lotOccupancyField.lotOccupancyFieldValue %>" selected>
+                                                            <%= lotOccupancyField.lotOccupancyFieldValue %>
+                                                        </option>
+                                                    <% } %>
+                                                </select>
+                                            </div>
+                                        <% } %>
                                     </div>
                                 </div>
                             <% } %>