From 89a559d2b5e691feddc0b3fd2b1020c53db8227e Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Tue, 27 Sep 2022 10:43:00 -0400
Subject: [PATCH] lot search query filters

---
 handlers/lots-get/search.js | 4 +++-
 handlers/lots-get/search.ts | 4 +++-
 views/lot-search.ejs        | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/handlers/lots-get/search.js b/handlers/lots-get/search.js
index 835f8614..5bc3ed8b 100644
--- a/handlers/lots-get/search.js
+++ b/handlers/lots-get/search.js
@@ -10,7 +10,9 @@ export const handler = (request, response) => {
         maps,
         lotTypes,
         lotStatuses,
-        mapId: request.query.mapId
+        mapId: request.query.mapId,
+        lotTypeId: request.query.lotTypeId,
+        lotStatusId: request.query.lotStatusId
     });
 };
 export default handler;
diff --git a/handlers/lots-get/search.ts b/handlers/lots-get/search.ts
index 1f543d4b..6576ce76 100644
--- a/handlers/lots-get/search.ts
+++ b/handlers/lots-get/search.ts
@@ -16,7 +16,9 @@ export const handler: RequestHandler = (request, response) => {
         maps,
         lotTypes,
         lotStatuses,
-        mapId: request.query.mapId
+        mapId: request.query.mapId,
+        lotTypeId: request.query.lotTypeId,
+        lotStatusId: request.query.lotStatusId
     });
 };
 
diff --git a/views/lot-search.ejs b/views/lot-search.ejs
index 7b024ae9..5c752bed 100644
--- a/views/lot-search.ejs
+++ b/views/lot-search.ejs
@@ -49,7 +49,9 @@
                 <select id="searchFilter--lotTypeId" name="lotTypeId">
                     <option value="">(All <%= configFunctions.getProperty("aliases.lot") %> Types)</option>
                     <% for (const lotType of lotTypes) { %>
-                    <option value="<%= lotType.lotTypeId %>"><%= lotType.lotType || "(No Name)" %></option>
+                    <option value="<%= lotType.lotTypeId %>" <%= (lotType.lotTypeId.toString() === lotTypeId) ? " selected" : "" %>>
+                        <%= lotType.lotType || "(No Name)" %>
+                    </option>
                     <% } %>
                 </select>
                 </div>
@@ -89,7 +91,9 @@
                         <select id="searchFilter--lotStatusId" name="lotStatusId">
                             <option value="">(All Statuses)</option>
                             <% for (const lotStatus of lotStatuses) { %>
-                            <option value="<%= lotStatus.lotStatusId %>"><%= lotStatus.lotStatus %></option>
+                            <option value="<%= lotStatus.lotStatusId %>" <%= (lotStatus.lotStatusId.toString() === lotStatusId) ? " selected" : "" %>>
+                                <%= lotStatus.lotStatus %>
+                            </option>
                             <% } %>
                         </select>
                     </div>