Skip to content

[bot] Merge 26.3 to 26.5 #692

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 3 commits into from
May 5, 2026
Merged

[bot] Merge 26.3 to 26.5 #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dda73a
SQL Server to Postgres Migration (#681)
labkey-martyp Apr 28, 2026
4c5181f
performedby_clin_hist_nirc (#688)
NIRC-IT May 4, 2026
fac046f
Merge 26.3 to 26.5
labkey-teamcity May 5, 2026
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
1 change: 0 additions & 1 deletion nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)

EHRService.get().registerMoreActionsButton(new ShowEditUIButton(this, "ehr", "observation_types", EHRDataAdminPermission.class), "ehr", "observation_types");

EHRService.get().unregisterMoreActionsButtons("study", "treatment_order");
EHRService.get().registerMoreActionsButton(new MarkCompletedButton(this, "study", "observation_order", "Set End Date"), "study", "observation_order");
EHRService.get().registerMoreActionsButton(new MarkCompletedButton(this, "study", "flags", "Set End Date"), "study", "flags");

Expand Down
5 changes: 4 additions & 1 deletion nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ else if (volumeExists)
{
sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("vol_units")));
}
sb.append(safeAppend(rs, "Performed By", "performedby/displayName"));
/*if (!redacted)
{
sb.append(safeAppend(rs, "Performed By", "performedby/displayName"));
}*/
sb.append(safeAppend(rs, "Remark", "remark"));

return sb.toString();
Expand Down
4 changes: 2 additions & 2 deletions nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ protected String getHtml(Container c, Results rs, boolean redacted) throws SQLEx
sb.append(safeAppend(rs, "Open Remark", "openRemark"));
sb.append(safeAppend(rs, "Case Plan", "plan"));

if (!redacted)
/*if (!redacted)
{
sb.append(safeAppend(rs, "Opened By", "performedby/displayName"));
}
}*/

if (rs.getObject(FieldKey.fromString("enddate")) != null)
{
Expand Down
4 changes: 2 additions & 2 deletions nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ protected String getHtml(Container c, Results rs, boolean redacted) throws SQLEx
StringBuilder sb = new StringBuilder();
sb.append("<table>");

if (!redacted && rs.getObject(FieldKey.fromString("performedby/displayName")) != null)
/*if (!redacted && rs.getObject(FieldKey.fromString("performedby/displayName")) != null)
{
String label = "Entered By";
appendNote(rs, "performedby/displayName", "<span style='white-space:nowrap'>" + label + "</span>", sb);
}
}*/

appendNote(rs, "hx", "Hx", sb);
appendNote(rs, "so", "S/O", sb);
Expand Down
6 changes: 4 additions & 2 deletions nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ else if (volumeExists)
{
sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("vol_units")));
}
sb.append(safeAppend(rs, "End Ordered By", "orderedby/displayName"));

/*if (!redacted)
{
sb.append(safeAppend(rs, "End Ordered By", "orderedby/displayName"));
}*/
return sb.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ protected List<HistoryRow> processRows(Container c, TableSelector ts, final bool
html.append(rowMap.get("html"));
}

if (performedBy != null && !redacted)
/*if (performedBy != null && !redacted)
{
html.append("Ordered By: ").append(PageFlowUtil.filter(performedBy)).append("\n");
}
}*/

HistoryRow row = new HistoryRowImpl(this, categoryText, categoryGroup, categoryColor, subjectId, date, html.toString(), qcStateLabel, publicData, taskId, taskRowId, formType, objectId);
row.setShowTime(false);
Expand Down
4 changes: 2 additions & 2 deletions nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ protected List<HistoryRow> processRows(Container c, TableSelector ts, final bool
html.append(rowMap.get("html"));
}

if (performedBy != null && !redacted)
/*if (performedBy != null && !redacted)
{
html.append("Performed By: ").append(PageFlowUtil.filter(performedBy)).append("\n");
}
}*/

HistoryRow row = new HistoryRowImpl(this, categoryText, categoryGroup, categoryColor, subjectId, date, html.toString(), qcStateLabel, publicData, taskId, taskRowId, formType, objectId);
row.setShowTime(false);
Expand Down
Loading