From 1dda73a5bd256049b8864537fe5f3e29d72679b0 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Tue, 28 Apr 2026 15:35:17 -0700 Subject: [PATCH 1/6] SQL Server to Postgres Migration (#681) * Remove the unregister more actions in NIRCModule --- nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java | 1 - 1 file changed, 1 deletion(-) diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java b/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java index 59dac4c5..2ecd4dfa 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java @@ -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"); From 4c5181f3666963aef95cf30e10f5c6f2b46b4aa8 Mon Sep 17 00:00:00 2001 From: NIRC-IT <87669815+NIRC-IT@users.noreply.github.com> Date: Mon, 4 May 2026 13:53:45 -0500 Subject: [PATCH 2/6] performedby_clin_hist_nirc (#688) Removed performed by and prepped for future redaction --- .../org/labkey/nirc_ehr/history/DrugAdminDataSource.java | 5 ++++- .../org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java | 4 ++-- .../nirc_ehr/history/NIRCClinicalRemarksDataSource.java | 4 ++-- .../nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java | 6 ++++-- .../nirc_ehr/history/NIRCObservationOrdersDataSource.java | 4 ++-- .../labkey/nirc_ehr/history/NIRCObservationsDataSource.java | 4 ++-- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java index 24dc3260..1c6ccbe3 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java @@ -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(); diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java index 79f9693b..0f9a2345 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java @@ -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) { diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java index 28df3607..00c18b55 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCClinicalRemarksDataSource.java @@ -43,11 +43,11 @@ protected String getHtml(Container c, Results rs, boolean redacted) throws SQLEx StringBuilder sb = new StringBuilder(); sb.append(""); - 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", "" + label + "", sb); - } + }*/ appendNote(rs, "hx", "Hx", sb); appendNote(rs, "so", "S/O", sb); diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java index 1e4d9e58..c08dfb46 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java @@ -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(); } diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java index a44637cb..ad27f4e9 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java @@ -106,10 +106,10 @@ protected List 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); diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java index 269800c4..97ebccc5 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java @@ -109,10 +109,10 @@ protected List 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); From 81582b5a16cda9185be50b70c30864a81cab63a2 Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Mon, 11 May 2026 08:57:44 -0700 Subject: [PATCH 3/6] Ticket 54548: Header on reports (#691) --- .../resources/views/clinicalHistoryExport.html | 5 +++++ nirc_ehr/resources/views/necropsy.html | 4 ++++ nirc_ehr/resources/views/necropsy.view.xml | 2 +- .../nirc_ehr/images/ull-logo-main-subsite.png | Bin 0 -> 7359 bytes 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 nirc_ehr/resources/web/nirc_ehr/images/ull-logo-main-subsite.png diff --git a/nirc_ehr/resources/views/clinicalHistoryExport.html b/nirc_ehr/resources/views/clinicalHistoryExport.html index 8e15e246..d5470b84 100644 --- a/nirc_ehr/resources/views/clinicalHistoryExport.html +++ b/nirc_ehr/resources/views/clinicalHistoryExport.html @@ -1,3 +1,8 @@ +
+ ULL Logo + The University of Louisiana at Lafayette New Iberia Research Center
Animal Record +
+ diff --git a/nirc_ehr/resources/views/acquisitionReport.view.xml b/nirc_ehr/resources/views/acquisitionReport.view.xml new file mode 100644 index 00000000..bbbab5f4 --- /dev/null +++ b/nirc_ehr/resources/views/acquisitionReport.view.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java b/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java index 2ecd4dfa..8339e493 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/NIRC_EHRModule.java @@ -193,6 +193,7 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext) NotificationService.get().registerNotification(new NIRCPregnancyOutcomeNotification(this)); EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "Printable Necropsy Report", this, DetailsURL.fromString("/nirc_ehr-necropsy.view"), "Pathology"); + EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "Acquisition Report", this, DetailsURL.fromString("/nirc_ehr-acquisitionReport.view"), "Population Overview"); // Ensure N: is mounted if it's configured, as it's being mapped in via a symlink/shortcut, so we can't From a00c53171ce109c30beec958980bafc30946e0f6 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 18 May 2026 09:33:37 -0700 Subject: [PATCH 6/6] Override editUIButtonHandler to set showImport to false (#699) --- nirc_ehr/resources/web/nirc_ehr/nircOverrides.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nirc_ehr/resources/web/nirc_ehr/nircOverrides.js b/nirc_ehr/resources/web/nirc_ehr/nircOverrides.js index 67e2f5a4..39f89d19 100644 --- a/nirc_ehr/resources/web/nirc_ehr/nircOverrides.js +++ b/nirc_ehr/resources/web/nirc_ehr/nircOverrides.js @@ -1 +1,11 @@ -EHR.Utils.rowEditorPlugin = 'NIRC_EHR.plugin.RowEditor'; \ No newline at end of file +EHR.Utils.rowEditorPlugin = 'NIRC_EHR.plugin.RowEditor'; + +EHR.Utils.editUIButtonHandler = function(schemaName, queryName, dataRegionName, paramMap, copyFilters){ + var params = { + schemaName: schemaName, + 'query.queryName': queryName, + showImport: false + }; + + this.editUIButtonCore(schemaName, queryName, dataRegionName, paramMap, undefined, params); +}; \ No newline at end of file