Skip to content

[bot] Merge 25.7 to 25.9 #1028

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 2 commits into from
Sep 2, 2025
Merged

[bot] Merge 25.7 to 25.9 #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea073c8
getMostRecentArrivalSource in animal record (#1019)
labkey-martyp Aug 29, 2025
3d85215
Merge 25.7 to 25.9
labkey-teamcity Sep 1, 2025
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
2 changes: 2 additions & 0 deletions ehr/api-src/org/labkey/api/ehr/demographics/AnimalRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,7 @@ public interface AnimalRecord

Date getMostRecentArrival();

String getMostRecentArrivalSource();

Integer getDaysSinceWeight();
}
2 changes: 1 addition & 1 deletion ehr/api-src/org/labkey/api/ehr/demographics/SourceDemographicsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public SourceDemographicsProvider(Module module)
protected Collection<FieldKey> getFieldKeys()
{
Set<FieldKey> keys = new HashSet<>();
keys.add(FieldKey.fromString("date"));
keys.add(FieldKey.fromString("mostRecentArrival"));
keys.add(FieldKey.fromString("fromCenter"));
keys.add(FieldKey.fromString("source"));
keys.add(FieldKey.fromString("type"));
Expand Down
15 changes: 14 additions & 1 deletion ehr/src/org/labkey/ehr/demographics/AnimalRecordImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,20 @@ public Date getMostRecentArrival()
{
List<Map<String, Object>> rows = (List)_props.get("source");
if (!rows.isEmpty())
return (Date)rows.get(0).get("date");
return (Date)rows.get(0).get("mostRecentArrival");
}

return null;
}

@Override
public String getMostRecentArrivalSource()
{
if (_props.containsKey("source"))
{
List<Map<String, Object>> rows = (List)_props.get("source");
if (!rows.isEmpty())
return (String)rows.get(0).get("source/meaning");
}

return null;
Expand Down