Skip to content

[bot] Fast-forward for 26.3.16 #1794

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

Merged
github-actions merged 1 commit into from
Jul 7, 2026
Merged

[bot] Fast-forward for 26.3.16 #1794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 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 @@ -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;
Expand Down Expand Up @@ -909,7 +910,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, "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)
Expand Down Expand Up @@ -952,7 +953,16 @@ protected void incompleteBirthRecords(final Container c, User u, final StringBui
msg.append("<td>" + (rs.getString("date") == null ? "Unknown" : rs.getDate("date")) + "</td>");
msg.append("<td>" + (rs.getString("remark") == null ? " " : rs.getString("remark")) + "</td>");

msg.append("<td>" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + "</td>");
//Added: 6-30-2026 R. Blasa
if (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == "Pending")
{
msg.append("<td>" + rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) + "</td>");
}
else
{
msg.append("<td>" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + "</td>");
}

msg.append("<td>" + (rs.getString(FieldKey.fromString("Id/demographics/species")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/species"))) + "</td>");
msg.append("<td>" + (rs.getString(FieldKey.fromString("Id/demographics/geographic_origin")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/geographic_origin"))) + "</td>");
msg.append("</tr>");
Expand Down
Loading