From fc3869d5feee41c3a89227ede402fb9d4f14fb03 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 6 Jul 2026 06:51:07 -0600 Subject: [PATCH] Show time on all nirc_ehr clinical history data sources Add setShowTime(true) to the 18 history data source constructors that were missing it, and flip the explicit row.setShowTime(false) calls to true in NIRCObservationsDataSource and NIRCObservationOrdersDataSource, whose custom processRows overrides bypass the constructor flag (this also covers the behavior and clinical observation subclasses). Every source already selects its date field (date, or enddate where getDateField() is overridden) and AbstractDataSource reads it via getTimestamp(), so the time component is available for display. --- nirc_ehr/src/org/labkey/nirc_ehr/history/ArrivalDataSource.java | 1 + nirc_ehr/src/org/labkey/nirc_ehr/history/BiopsyDataSource.java | 1 + nirc_ehr/src/org/labkey/nirc_ehr/history/BreederDataSource.java | 1 + nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/DepartureDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/ExemptionsDataSource.java | 1 + nirc_ehr/src/org/labkey/nirc_ehr/history/FlagsDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/FosteringDataSource.java | 1 + .../org/labkey/nirc_ehr/history/HistopathologyDataSource.java | 1 + .../org/labkey/nirc_ehr/history/NIRCCaseCloseDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java | 1 + .../nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java | 1 + .../nirc_ehr/history/NIRCObservationOrdersDataSource.java | 2 +- .../org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java | 2 +- .../labkey/nirc_ehr/history/NIRCProcedureOrdersDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/PairingsDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/PhysicalExamDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/PregnancyDataSource.java | 1 + .../src/org/labkey/nirc_ehr/history/SerologyDataSource.java | 1 + 20 files changed, 20 insertions(+), 2 deletions(-) diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/ArrivalDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/ArrivalDataSource.java index 4b4a8798..2540a301 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/ArrivalDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/ArrivalDataSource.java @@ -14,6 +14,7 @@ public class ArrivalDataSource extends AbstractDataSource public ArrivalDataSource(Module module) { super("study", "Arrival", "Arrival", "Arrival", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/BiopsyDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/BiopsyDataSource.java index 1d4f3fd2..56ac67b9 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/BiopsyDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/BiopsyDataSource.java @@ -15,6 +15,7 @@ public class BiopsyDataSource extends AbstractDataSource public BiopsyDataSource(Module module) { super("study", "Biopsy", "Biopsy", "Biopsy", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/BreederDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/BreederDataSource.java index 2a5d7917..8a9a4c8a 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/BreederDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/BreederDataSource.java @@ -27,6 +27,7 @@ public class BreederDataSource extends AbstractDataSource public BreederDataSource(Module module) { super("study", "breeder", "Breeding", "Breeding", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java index 7817284f..79b40481 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java @@ -15,6 +15,7 @@ public class DeathDataSource extends AbstractDataSource public DeathDataSource(Module module) { super("study", "Deaths", "Death", "Deaths", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/DepartureDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/DepartureDataSource.java index 0de6d6f0..4b03613d 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/DepartureDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/DepartureDataSource.java @@ -15,6 +15,7 @@ public class DepartureDataSource extends AbstractDataSource public DepartureDataSource(Module module) { super("study", "Departure", "Departure", "Departure", module); + setShowTime(true); } @Override 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 1c6ccbe3..476c0b4b 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/DrugAdminDataSource.java @@ -16,6 +16,7 @@ public class DrugAdminDataSource extends AbstractDataSource public DrugAdminDataSource(Module module) { super("study", "drug", "Drug Admin", "Drug Admin", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/ExemptionsDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/ExemptionsDataSource.java index 88542870..ed5be3be 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/ExemptionsDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/ExemptionsDataSource.java @@ -16,6 +16,7 @@ public class ExemptionsDataSource extends AbstractDataSource public ExemptionsDataSource(Module module) { super("study", "exemptions", "Exemptions", "Exemptions", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/FlagsDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/FlagsDataSource.java index 099a7ea1..767ff83a 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/FlagsDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/FlagsDataSource.java @@ -16,6 +16,7 @@ public class FlagsDataSource extends AbstractDataSource public FlagsDataSource(Module module) { super("study", "flags", "Flags", "Flags", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/FosteringDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/FosteringDataSource.java index 710be254..f6bd5a5b 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/FosteringDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/FosteringDataSource.java @@ -29,6 +29,7 @@ public class FosteringDataSource extends AbstractDataSource public FosteringDataSource(Module module) { super("study", "foster", "Fostering", "Fostering", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/HistopathologyDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/HistopathologyDataSource.java index 50254ac6..ae62c7fc 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/HistopathologyDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/HistopathologyDataSource.java @@ -29,6 +29,7 @@ public class HistopathologyDataSource extends AbstractDataSource public HistopathologyDataSource(Module module) { super("study", "histopathology", "Histopathology", "Histopathology", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseCloseDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseCloseDataSource.java index b7ce3891..1d9eccfe 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseCloseDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseCloseDataSource.java @@ -23,6 +23,7 @@ public class NIRCCaseCloseDataSource extends AbstractDataSource public NIRCCaseCloseDataSource(Module module) { super("study", "Cases", "Case Closed", "Clinical", module); + setShowTime(true); } @Override 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 0f9a2345..308eb777 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCCaseOpenDataSource.java @@ -16,6 +16,7 @@ public class NIRCCaseOpenDataSource extends AbstractDataSource public NIRCCaseOpenDataSource(Module module) { super("study", "Cases", "Case Opened", "Clinical", module); + setShowTime(true); } @Override 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 c08dfb46..5b7097dd 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java @@ -20,6 +20,7 @@ public class NIRCEndTreatmentOrderDataSource extends AbstractDataSource public NIRCEndTreatmentOrderDataSource(Module module) { super("study", "treatment_order", "End Treatment Orders", "Clinical", module); + setShowTime(true); } @Override 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 ad27f4e9..129e31bc 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationOrdersDataSource.java @@ -112,7 +112,7 @@ protected List processRows(Container c, TableSelector ts, final bool }*/ HistoryRow row = new HistoryRowImpl(this, categoryText, categoryGroup, categoryColor, subjectId, date, html.toString(), qcStateLabel, publicData, taskId, taskRowId, formType, objectId); - row.setShowTime(false); + row.setShowTime(true); rows.add(row); } 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 97ebccc5..cf994ffb 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCObservationsDataSource.java @@ -115,7 +115,7 @@ protected List processRows(Container c, TableSelector ts, final bool }*/ HistoryRow row = new HistoryRowImpl(this, categoryText, categoryGroup, categoryColor, subjectId, date, html.toString(), qcStateLabel, publicData, taskId, taskRowId, formType, objectId); - row.setShowTime(false); + row.setShowTime(true); rows.add(row); } diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCProcedureOrdersDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCProcedureOrdersDataSource.java index 25c627f7..eb447fd9 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCProcedureOrdersDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCProcedureOrdersDataSource.java @@ -15,6 +15,7 @@ public class NIRCProcedureOrdersDataSource extends AbstractDataSource public NIRCProcedureOrdersDataSource(Module module) { super("study", "prc_order", "Procedure Orders", "Procedures", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/PairingsDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/PairingsDataSource.java index aa30bf73..3b8b92d5 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/PairingsDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/PairingsDataSource.java @@ -14,6 +14,7 @@ public class PairingsDataSource extends AbstractDataSource public PairingsDataSource(Module module) { super("study", "Pairings", "Pairings", "Pairings", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/PhysicalExamDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/PhysicalExamDataSource.java index 9c02ce8f..60200c57 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/PhysicalExamDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/PhysicalExamDataSource.java @@ -15,6 +15,7 @@ public class PhysicalExamDataSource extends AbstractDataSource public PhysicalExamDataSource(Module module) { super("study", "physicalExam", "Physical Exam", "Physical Exam", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/PregnancyDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/PregnancyDataSource.java index 6d515092..fa6a8411 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/PregnancyDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/PregnancyDataSource.java @@ -15,6 +15,7 @@ public class PregnancyDataSource extends AbstractDataSource public PregnancyDataSource(Module module) { super("study", "pregnancy", "Pregnancy", "Pregnancy", module); + setShowTime(true); } @Override diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/SerologyDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/SerologyDataSource.java index f74112e7..0d0544b3 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/history/SerologyDataSource.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/SerologyDataSource.java @@ -16,6 +16,7 @@ public class SerologyDataSource extends AbstractDataSource public SerologyDataSource(Module module) { super("study", "Serology", "Serology", "Serology", module); + setShowTime(true); } @Override