current status type key filter

handlers/dashboard/doGetRecords.js

@@ -6,7 +6,8 @@ export const handler = async (request, response) => {
         recordNumber: request.body.recordNumber,
         recordTag: request.body.recordTag,
         recordDateStringGTE: request.body["recordDateString-gte"],
-        recordDateStringLTE: request.body["recordDateString-lte"]
+        recordDateStringLTE: request.body["recordDateString-lte"],
+        statusTypeKey: request.body.statusTypeKey
     }, {
         limit: Number.parseInt(request.body.limit, 10),
         offset: Number.parseInt(request.body.offset, 10)

handlers/dashboard/doGetRecords.ts

@@ -11,7 +11,8 @@ export const handler: RequestHandler = async (request, response) => {
     recordNumber: request.body.recordNumber,
     recordTag: request.body.recordTag,
     recordDateStringGTE: request.body["recordDateString-gte"],
-    recordDateStringLTE: request.body["recordDateString-lte"]
+    recordDateStringLTE: request.body["recordDateString-lte"],
+    statusTypeKey: request.body.statusTypeKey
   }, {
       limit: Number.parseInt(request.body.limit, 10),
       offset: Number.parseInt(request.body.offset, 10)

handlers/dashboard/doGetStatusTypes.d.ts

@@ -0,0 +1,3 @@
+import type { RequestHandler } from "express";
+export declare const handler: RequestHandler;
+export default handler;

handlers/dashboard/doGetStatusTypes.js

@@ -0,0 +1,8 @@
+import { getStatusTypes } from "../../helpers/recordsDB/getStatusTypes.js";
+export const handler = async (request, response) => {
+    const statusTypes = await getStatusTypes(request.body.recordTypeKey);
+    return response.json({
+        statusTypes
+    });
+};
+export default handler;

handlers/dashboard/doGetStatusTypes.ts

@@ -0,0 +1,16 @@
+import type { RequestHandler } from "express";
+
+import { getStatusTypes } from "../../helpers/recordsDB/getStatusTypes.js";
+
+
+export const handler: RequestHandler = async (request, response) => {
+
+  const statusTypes = await getStatusTypes(request.body.recordTypeKey);
+
+  return response.json({
+    statusTypes
+  });
+};
+
+
+export default handler;

helpers/recordsDB/getRecords.d.ts

@@ -10,6 +10,7 @@ export declare const getRecords: (parameters: {
     recordTag?: string;
     recordDateStringGTE?: string;
     recordDateStringLTE?: string;
+    statusTypeKey?: string;
 }, options: {
     limit: number;
     offset: number;

helpers/recordsDB/getRecords.js

@@ -42,6 +42,11 @@ export const getRecords = async (parameters, options, requestSession) => {
             resultsRequest = resultsRequest.input("recordDateStringLTE", parameters.recordDateStringLTE);
             whereSQL += " and recordDate <= @recordDateStringLTE";
         }
+        if (parameters.statusTypeKey && parameters.statusTypeKey !== "") {
+            countRequest = countRequest.input("statusTypeKey", parameters.statusTypeKey);
+            resultsRequest = resultsRequest.input("statusTypeKey", parameters.statusTypeKey);
+            whereSQL += " and s.statusTypeKey = @statusTypeKey";
+        }
         if (parameters.searchString !== "") {
             const searchStringSplit = parameters.searchString.trim().split(" ");
             for (const [index, element] of searchStringSplit.entries()) {
@@ -57,7 +62,14 @@ export const getRecords = async (parameters, options, requestSession) => {
                     ")";
             }
         }
-        const countResult = await countRequest.query("select count(*) as cnt from CR.Records" +
+        const countResult = await countRequest.query("select count(*) as cnt from CR.Records r" +
+            " outer apply (" +
+            "select top 1 s.statusTime, s.statusTypeKey, t.statusType" +
+            " from CR.RecordStatusLog s" +
+            " left join CR.StatusTypes t on s.statusTypeKey = t.statusTypeKey" +
+            " where r.recordID = s.recordID" +
+            " and recordDelete_datetime is null" +
+            " order by statusTime desc, statusLogID desc) s" +
             whereSQL);
         returnObject.count = countResult.recordset[0].cnt;
         if (returnObject.count === 0) {

helpers/recordsDB/getRecords.ts

@@ -21,6 +21,7 @@ export const getRecords = async (parameters: {
   recordTag?: string;
   recordDateStringGTE?: string;
   recordDateStringLTE?: string;
+  statusTypeKey?: string;
 }, options: {
   limit: number;
   offset: number;
@@ -76,6 +77,12 @@ export const getRecords = async (parameters: {
       whereSQL += " and recordDate <= @recordDateStringLTE";
     }
 
+    if (parameters.statusTypeKey && parameters.statusTypeKey !== "") {
+      countRequest = countRequest.input("statusTypeKey", parameters.statusTypeKey);
+      resultsRequest = resultsRequest.input("statusTypeKey", parameters.statusTypeKey);
+      whereSQL += " and s.statusTypeKey = @statusTypeKey";
+    }
+
     if (parameters.searchString !== "") {
 
       const searchStringSplit = parameters.searchString.trim().split(" ");
@@ -97,7 +104,14 @@ export const getRecords = async (parameters: {
       }
     }
 
-    const countResult = await countRequest.query("select count(*) as cnt from CR.Records" +
+    const countResult = await countRequest.query("select count(*) as cnt from CR.Records r" +
+      " outer apply (" +
+      "select top 1 s.statusTime, s.statusTypeKey, t.statusType" +
+      " from CR.RecordStatusLog s" +
+      " left join CR.StatusTypes t on s.statusTypeKey = t.statusTypeKey" +
+      " where r.recordID = s.recordID" +
+      " and recordDelete_datetime is null" +
+      " order by statusTime desc, statusLogID desc) s" +
       whereSQL);
 
     returnObject.count = countResult.recordset[0].cnt;

public-typescript/dashboard.js

@@ -91,6 +91,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
         offsetElement.value = "0";
         searchRecordsFunction();
     };
+    const recordTypeKeyElement = document.querySelector("#search--recordTypeKey");
+    const statusTypeKeyElement = document.querySelector("#search--statusTypeKey");
+    const statusTypeKeyMap = new Map();
+    const renderStatusTypeKey = () => {
+        statusTypeKeyElement.innerHTML = "<option value=\"\" selected>(All Statuses)</option>";
+        if (!statusTypeKeyMap.has(recordTypeKeyElement.value)) {
+            return;
+        }
+        for (const statusType of statusTypeKeyMap.get(recordTypeKeyElement.value)) {
+            if (!statusType.isActive || statusType.recordCount === 0) {
+                continue;
+            }
+            const optionElement = document.createElement("option");
+            optionElement.value = statusType.statusTypeKey;
+            optionElement.textContent = statusType.statusType;
+            statusTypeKeyElement.append(optionElement);
+        }
+    };
+    recordTypeKeyElement.addEventListener("change", () => {
+        statusTypeKeyElement.innerHTML = "<option value=\"\" selected>(All Statuses)</option>";
+        if (recordTypeKeyElement.value === "") {
+        }
+        else if (statusTypeKeyMap.has(recordTypeKeyElement.value)) {
+            renderStatusTypeKey();
+        }
+        else {
+            const recordTypeKey = recordTypeKeyElement.value;
+            cityssm.postJSON(urlPrefix + "/dashboard/doGetStatusTypes", {
+                recordTypeKey
+            }, (responseJSON) => {
+                statusTypeKeyMap.set(recordTypeKey, responseJSON.statusTypes);
+                renderStatusTypeKey();
+            });
+        }
+    });
     searchFormElement.addEventListener("submit", resetOffsetAndSearchFunction);
     const filterElements = searchFormElement.querySelectorAll("input, select");
     for (const filterElement of filterElements) {

public-typescript/dashboard.ts

@@ -139,6 +139,63 @@ declare const cityssm: cityssmGlobal;
     searchRecordsFunction();
   };
 
+  /*
+   * Status Type Key
+   */
+
+  const recordTypeKeyElement = document.querySelector("#search--recordTypeKey") as HTMLSelectElement;
+  const statusTypeKeyElement = document.querySelector("#search--statusTypeKey") as HTMLSelectElement;
+
+  const statusTypeKeyMap = new Map<string, recordTypes.StatusType[]>();
+
+  const renderStatusTypeKey = () => {
+
+    statusTypeKeyElement.innerHTML = "<option value=\"\" selected>(All Statuses)</option>";
+
+    if (!statusTypeKeyMap.has(recordTypeKeyElement.value)) {
+      return;
+    }
+
+    for (const statusType of statusTypeKeyMap.get(recordTypeKeyElement.value)) {
+
+      if (!statusType.isActive || statusType.recordCount === 0) {
+        continue;
+      }
+
+      const optionElement = document.createElement("option");
+      optionElement.value = statusType.statusTypeKey;
+      optionElement.textContent = statusType.statusType;
+      statusTypeKeyElement.append(optionElement);
+    }
+  };
+
+  recordTypeKeyElement.addEventListener("change", () => {
+
+    statusTypeKeyElement.innerHTML = "<option value=\"\" selected>(All Statuses)</option>";
+
+    if (recordTypeKeyElement.value === "") {
+      // ignore
+
+    } else if (statusTypeKeyMap.has(recordTypeKeyElement.value)) {
+      renderStatusTypeKey();
+
+    } else {
+
+      const recordTypeKey = recordTypeKeyElement.value;
+
+      cityssm.postJSON(urlPrefix + "/dashboard/doGetStatusTypes", {
+        recordTypeKey
+      }, (responseJSON: { statusTypes: recordTypes.StatusType[] }) => {
+        statusTypeKeyMap.set(recordTypeKey, responseJSON.statusTypes);
+        renderStatusTypeKey();
+      })
+    }
+  });
+
+  /*
+   * Initialize form
+   */
+
   searchFormElement.addEventListener("submit", resetOffsetAndSearchFunction);
 
   const filterElements = searchFormElement.querySelectorAll("input, select");

routes/dashboard.js

@@ -2,8 +2,10 @@ import { Router } from "express";
 import handler_dashboard from "../handlers/dashboard/dashboard.js";
 import handler_doGetRecords from "../handlers/dashboard/doGetRecords.js";
 import handler_doGetRecordTagsForSearch from "../handlers/dashboard/doGetRecordTagsForSearch.js";
+import handler_doGetStatusTypes from "../handlers/dashboard/doGetStatusTypes.js";
 export const router = Router();
 router.get("/", handler_dashboard);
 router.post("/doGetRecords", handler_doGetRecords);
 router.post("/doGetRecordTagsForSearch", handler_doGetRecordTagsForSearch);
+router.post("/doGetStatusTypes", handler_doGetStatusTypes);
 export default router;

routes/dashboard.ts

@@ -5,6 +5,7 @@ import handler_dashboard from "../handlers/dashboard/dashboard.js";
 
 import handler_doGetRecords from "../handlers/dashboard/doGetRecords.js";
 import handler_doGetRecordTagsForSearch from "../handlers/dashboard/doGetRecordTagsForSearch.js";
+import handler_doGetStatusTypes from "../handlers/dashboard/doGetStatusTypes.js";
 
 
 export const router = Router();
@@ -15,6 +16,7 @@ router.get("/", handler_dashboard);
 
 router.post("/doGetRecords", handler_doGetRecords);
 router.post("/doGetRecordTagsForSearch", handler_doGetRecordTagsForSearch);
+router.post("/doGetStatusTypes", handler_doGetStatusTypes);
 
 
 export default router;