From bcd3ee94a693692a817bea014e14b37418f49922 Mon Sep 17 00:00:00 2001 From: kollil Date: Wed, 1 Oct 2025 11:15:14 -0700 Subject: [PATCH 1/3] Added new query for room utilization that takes date as parameter --- .../roomUtilizationByDate.query.xml | 87 +++++++++++++++++++ .../ehr_lookups/roomUtilizationByDate.sql | 48 ++++++++++ onprc_ehr/resources/views/begin.html | 4 +- 3 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.query.xml create mode 100644 onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql diff --git a/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.query.xml b/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.query.xml new file mode 100644 index 000000000..98d72f375 --- /dev/null +++ b/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.query.xml @@ -0,0 +1,87 @@ + + + + + + Room Utilization By Date + + + + true + + ehr_lookups + rooms + room + + + + Snapshot Date + + + Total Cage Spaces + 50 + /query/executeQuery.view? + schemaName=ehr_lookups& + query.queryName=cage& + query.room~eq=${room}& + query.sort=cage& + + + + Total Cages Present + 50 + /query/executeQuery.view? + schemaName=ehr_lookups& + query.queryName=availableCages& + query.room~eq=${room}& + query.isAvailable~eq=true& + query.sort=cage& + + + + Marked Unavailable + + + Cages Used + 40 + /query/executeQuery.view? + schemaName=ehr_lookups& + query.queryName=cage& + query.room~eq=${room}& + query.availability/isAvailable~eq=true& + query.totalAnimals/totalAnimals~gt=0& + query.sort=cage& + + + + Cages Empty + 40 + /query/executeQuery.view? + schemaName=ehr_lookups& + query.queryName=cage& + query.room~eq=${room}& + query.availability/isAvailable~eq=true& + query.totalAnimals/totalAnimals~isblank& + query.sort=cage& + + + + 40 + % Used + + + Total Animals + 50 + /query/executeQuery.view? + schemaName=study& + query.queryName=Demographics& + query.viewName=By Location& + query.Id/curLocation/room~eq=${room}& + query.sort=Id& + + + +
+ + + diff --git a/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql b/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql new file mode 100644 index 000000000..494957ea1 --- /dev/null +++ b/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql @@ -0,0 +1,48 @@ +/* Added by: Kollil, 9/29/2025, Refer tkt # 13276 +Created a query that mimics the Room Utilization Report with the With PI Projects view, but with the additional feature +that it can be run for arbitrary prior dates. + Lisa requested this new reports and is very useful + */ +PARAMETERS (SnapshotDate TIMESTAMP) + +SELECT + r.room, + -- p.SnapDate AS SnapshotDate, -- echoes the effective date + COUNT(DISTINCT c.cage) AS TotalCages, + MAX(cbr.availableCages) AS AvailableCages, + MAX(cbr.markedUnavailable) AS MarkedUnavailable, + COUNT(DISTINCT h.cage) AS CagesUsed, + MAX(cbr.availableCages) - COUNT(DISTINCT h.cage) - MAX(cbr.markedUnavailable) AS CagesEmpty, + ROUND( + ( + (CAST(COUNT(DISTINCT h.cage) AS DOUBLE) + MAX(cbr.markedUnavailable)) + / NULLIF(CAST(MAX(cbr.availableCages) AS DOUBLE), 0) + ) * 100.0, 1 + ) AS pctUsed, + COUNT(DISTINCT h.id) AS TotalAnimals +FROM ehr_lookups.rooms r +-- bind the parameter once; default to today when blank + LEFT JOIN ( + SELECT COALESCE(SnapshotDate, now()) AS SnapDate +) p ON 1=1 + + LEFT JOIN ( + SELECT c1.room, c1.cage + FROM ehr_lookups.cage c1 + WHERE c1.cage IS NOT NULL + UNION ALL + SELECT r2.room, NULL AS cage + FROM ehr_lookups.rooms r2 +) c ON r.room = c.room + + LEFT JOIN study.housing h + ON r.room = h.room + AND (c.cage = h.cage OR (c.cage IS NULL AND h.cage IS NULL)) + AND h.date <= p.SnapDate + AND (h.enddate IS NULL OR h.enddate > p.SnapDate) + + LEFT JOIN ehr_lookups.availableCagesByRoom cbr + ON cbr.room = r.room +WHERE r.datedisabled IS NULL +GROUP BY r.room, p.SnapDate +ORDER BY r.room; \ No newline at end of file diff --git a/onprc_ehr/resources/views/begin.html b/onprc_ehr/resources/views/begin.html index 5f51bdf70..e883bd726 100644 --- a/onprc_ehr/resources/views/begin.html +++ b/onprc_ehr/resources/views/begin.html @@ -102,13 +102,13 @@ {name: 'Animal Groups', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr&query.queryName=animal_groups&query.viewName=Active Groups'}, {name: 'Colony Overview', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/onprc_ehr-colonyOverview.view'}, {name: 'Room Utilization', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=roomUtilization'}, + //Added by Kollil on 9/29/25 + {name: 'Room Utilization By Date', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/query-executeQuery.view?schemaName=ehr_lookups&query.queryName=roomUtilizationByDate'}, {name: 'More Reports', url: '<%=contextPath%>' + ctx['EHRStudyContainer'] + '/ehr-moreReports.view'} ] }] }); - - var menuCfg = { width: 330, renderTo: 'ehrMenu3_'+webpart.wrapperDivId, From b94e7061339c79336a9b353708937eae3106ac3f Mon Sep 17 00:00:00 2001 From: kollil Date: Mon, 27 Oct 2025 15:02:11 -0700 Subject: [PATCH 2/3] Created a new query of the same that already exists with a date parameter --- .../ehr_lookups/availableCagesByDate.sql | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql diff --git a/onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql b/onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql new file mode 100644 index 000000000..316c90762 --- /dev/null +++ b/onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql @@ -0,0 +1,44 @@ +-- Created by Kollil, Oct 2025 +-- This query is a variation of the same one in the folder, but, with a date as parameter + +PARAMETERS(SnapshotDate TIMESTAMP) + +SELECT + CASE WHEN c.cage IS NULL THEN c.room ELSE (c.room || '-' || c.cage) END AS location, + c.room, + c.cage, + c.cagePosition.row, + c.cagePosition.columnIdx, + c.cage_type, + lc.cage AS lowerCage, + lc.cage_type AS lower_cage_type, + lc.divider AS divider, + CASE + WHEN c.cage_type = 'No Cage' THEN FALSE + WHEN COALESCE(lc.divider.countAsSeparate, TRUE) = FALSE THEN FALSE + ELSE TRUE + END AS isAvailableStructure, + CASE WHEN c.status IS NOT NULL AND c.status = 'Unavailable' THEN 1 ELSE 0 END AS isMarkedUnavailable, + -- Example: occupancy "as of" SnapshotDate from study.housing + CASE WHEN h.Id IS NOT NULL THEN 1 ELSE 0 END AS isOccupiedAsOf, + -- Echo the effective date we used (handy for debugging) + COALESCE(SnapshotDate, NOW()) AS AsOfDate + +FROM ehr_lookups.cage AS c + +-- left-hand neighbor (structural) + LEFT JOIN ehr_lookups.cage AS lc + ON c.room = lc.room + AND c.cagePosition.row = lc.cagePosition.row + AND c.cagePosition.columnIdx - 1 = lc.cagePosition.columnIdx + AND lc.cage_type <> 'No Cage' + +-- time-varying occupancy example (adjust table/columns to your schema): + LEFT JOIN study.housing AS h + ON h.room = c.room + AND ( (h.cage IS NULL AND c.cage IS NULL) OR h.cage = c.cage ) + -- "as of" predicate using the parameter + AND h.date <= COALESCE(SnapshotDate, NOW()) + AND (h.enddate IS NULL OR h.enddate > COALESCE(SnapshotDate, NOW())) + +WHERE c.room.housingType.value = 'Cage Location' From 06f58e3c342a0d981de702da8aecfc7abc10dae3 Mon Sep 17 00:00:00 2001 From: kollil Date: Mon, 27 Oct 2025 16:56:42 -0700 Subject: [PATCH 3/3] Added new query --- .../ehr_lookups/availableCagesByDate.sql | 2 +- .../availableCagesByRoomByDate.sql | 23 +++++++++++++++++++ .../ehr_lookups/roomUtilizationByDate.sql | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 onprc_ehr/resources/queries/ehr_lookups/availableCagesByRoomByDate.sql diff --git a/onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql b/onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql index 316c90762..308bd462e 100644 --- a/onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql +++ b/onprc_ehr/resources/queries/ehr_lookups/availableCagesByDate.sql @@ -17,7 +17,7 @@ SELECT WHEN c.cage_type = 'No Cage' THEN FALSE WHEN COALESCE(lc.divider.countAsSeparate, TRUE) = FALSE THEN FALSE ELSE TRUE - END AS isAvailableStructure, + END AS isAvailable, CASE WHEN c.status IS NOT NULL AND c.status = 'Unavailable' THEN 1 ELSE 0 END AS isMarkedUnavailable, -- Example: occupancy "as of" SnapshotDate from study.housing CASE WHEN h.Id IS NOT NULL THEN 1 ELSE 0 END AS isOccupiedAsOf, diff --git a/onprc_ehr/resources/queries/ehr_lookups/availableCagesByRoomByDate.sql b/onprc_ehr/resources/queries/ehr_lookups/availableCagesByRoomByDate.sql new file mode 100644 index 000000000..64a2b7cc5 --- /dev/null +++ b/onprc_ehr/resources/queries/ehr_lookups/availableCagesByRoomByDate.sql @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2013-2018 LabKey Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +SELECT + c.room, + count(*) as availableCages, + sum(c.isMarkedUnavailable) as markedUnavailable + +FROM ehr_lookups.availableCagesByDate c +WHERE c.isAvailable = true +GROUP BY c.room \ No newline at end of file diff --git a/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql b/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql index 494957ea1..5b8a3b44f 100644 --- a/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql +++ b/onprc_ehr/resources/queries/ehr_lookups/roomUtilizationByDate.sql @@ -41,7 +41,7 @@ FROM ehr_lookups.rooms r AND h.date <= p.SnapDate AND (h.enddate IS NULL OR h.enddate > p.SnapDate) - LEFT JOIN ehr_lookups.availableCagesByRoom cbr + LEFT JOIN ehr_lookups.availableCagesByRoomByDate cbr ON cbr.room = r.room WHERE r.datedisabled IS NULL GROUP BY r.room, p.SnapDate