Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cage compliance report sort order fix #1076

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Cage compliance report sort order fix #1076

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f53486
Added sort clause to the SQL fragment
kollil Jul 22, 2024
f69e38e
Fixed a spelling
kollil Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1776,7 +1776,7 @@ protected void deadAnimalsWithActiveTreatments(final Container c, User u, final

protected void cageReviewErrors(final Container c, User u, final StringBuilder msg, boolean notifyOnNone, String requirementSet)
{
cageReview(c, u, msg, notifyOnNone, "ERROR", "WARNING: The following cages are too small for the animals currently in them (using " + requirementSet + "), except for animals with heigh/weight exemption flags:", requirementSet);
cageReview(c, u, msg, notifyOnNone, "ERROR", "WARNING: The following cages are too small for the animals currently in them (using " + requirementSet + "), except for animals with height/weight exemption flags:", requirementSet);
}

protected void cageReviewWarnings(final Container c, User u, final StringBuilder msg, boolean notifyOnNone, String requirementSet)
Expand All @@ -1802,7 +1802,7 @@ private void cageReview(final Container c, User u, final StringBuilder msg, bool
params.put("RequirementSet", requirementSet);
QueryService.get().bindNamedParameters(sql, params);

sql = new SQLFragment("SELECT * FROM ").append(sql).append(" WHERE t.status = ?").add(filterTerm);
sql = new SQLFragment("SELECT * FROM ").append(sql).append(" WHERE t.status = ? ORDER BY room, cage").add(filterTerm);
SqlSelector ss = new SqlSelector(ti.getSchema(), sql);
Map<String, Object>[] rows = ss.getMapArray();

Expand Down