From 31cfbc1e716217a489dc47979fa6b7b808834b4e Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 30 Jun 2026 13:18:53 -0700 Subject: [PATCH 1/4] Modified Colony Management notification to include "Pending" gender Births as warning message listings. --- .../labkey/onprc_ehr/notification/ColonyAlertsNotification.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java index 712b8a462..fbc0ae589 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java @@ -909,7 +909,7 @@ protected void pedigreeIssues(final Container c, User u, final StringBuilder msg protected void incompleteBirthRecords(final Container c, User u, final StringBuilder msg) { SimpleFilter filter = new SimpleFilter(new SimpleFilter.OrClause( - //new CompareType.CompareClause(FieldKey.fromString("species"), CompareType.ISBLANK, null), + new CompareType.CompareClause(FieldKey.fromString("Id/demographics/gender"), CompareType.EQUAL, "Pending"), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/gender"), CompareType.ISBLANK, null), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/species"), CompareType.ISBLANK, null), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/geographic_origin"), CompareType.ISBLANK, null) From 2a21fecd3f8b9c5b97ec253c2a21ab7e76e56019 Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 30 Jun 2026 13:31:59 -0700 Subject: [PATCH 2/4] Modified Colony Management notification to include "Pending" gender Births as warning message listings. --- .../labkey/onprc_ehr/notification/ColonyAlertsNotification.java | 1 + 1 file changed, 1 insertion(+) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java index fbc0ae589..32b865bde 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java @@ -953,6 +953,7 @@ protected void incompleteBirthRecords(final Container c, User u, final StringBui msg.append("" + (rs.getString("remark") == null ? " " : rs.getString("remark")) + ""); msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + ""); + msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == "Pending" ? "Pending" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + ""); msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/species")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/species"))) + ""); msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/geographic_origin")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/geographic_origin"))) + ""); msg.append(""); From 9948086a1ea70e5d34e061ae664e1be44576b637 Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 30 Jun 2026 14:50:11 -0700 Subject: [PATCH 3/4] Modified Colony Management notification to include "Pending" gender Births as warning message listings. --- .../labkey/onprc_ehr/notification/ColonyAlertsNotification.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java index 32b865bde..5a491723a 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java @@ -909,7 +909,7 @@ protected void pedigreeIssues(final Container c, User u, final StringBuilder msg protected void incompleteBirthRecords(final Container c, User u, final StringBuilder msg) { SimpleFilter filter = new SimpleFilter(new SimpleFilter.OrClause( - new CompareType.CompareClause(FieldKey.fromString("Id/demographics/gender"), CompareType.EQUAL, "Pending"), + new CompareType.CompareClause(FieldKey.fromString("Id/demographics/gender"), CompareType.EQUAL, "p"), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/gender"), CompareType.ISBLANK, null), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/species"), CompareType.ISBLANK, null), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/geographic_origin"), CompareType.ISBLANK, null) From e22652b30f5577d31ae977e4de35fd6d80e4bebf Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 30 Jun 2026 15:07:55 -0700 Subject: [PATCH 4/4] Modified Colony Management notification to include "Pending" gender Births as warning message listings. --- .../notification/ColonyAlertsNotification.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java index 5a491723a..d17eafc0d 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java @@ -15,6 +15,7 @@ */ package org.labkey.onprc_ehr.notification; +import com.google.gwt.user.cellview.client.AbstractCellTable; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Aggregate; @@ -952,8 +953,16 @@ protected void incompleteBirthRecords(final Container c, User u, final StringBui msg.append("" + (rs.getString("date") == null ? "Unknown" : rs.getDate("date")) + ""); msg.append("" + (rs.getString("remark") == null ? " " : rs.getString("remark")) + ""); - msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + ""); - msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == "Pending" ? "Pending" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + ""); + //Added: 6-30-2026 R. Blasa + if (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == "Pending") + { + msg.append("" + rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) + ""); + } + else + { + msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + ""); + } + msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/species")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/species"))) + ""); msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/geographic_origin")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/geographic_origin"))) + ""); msg.append("");