From 46d33b0c090b43b9e71d223f18348b974eb68d4f Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Sun, 14 Sep 2025 10:47:41 -0700 Subject: [PATCH 1/6] death/necropsy form updates --- .../resources/web/nirc_ehr/model/sources/DeathNecropsy.js | 6 ++++++ .../dataentry/section/NIRCTissueDispositionFormSection.java | 1 + 2 files changed, 7 insertions(+) diff --git a/nirc_ehr/resources/web/nirc_ehr/model/sources/DeathNecropsy.js b/nirc_ehr/resources/web/nirc_ehr/model/sources/DeathNecropsy.js index 4be79f4c..8deb34ba 100644 --- a/nirc_ehr/resources/web/nirc_ehr/model/sources/DeathNecropsy.js +++ b/nirc_ehr/resources/web/nirc_ehr/model/sources/DeathNecropsy.js @@ -12,6 +12,12 @@ EHR.model.DataModelManager.registerMetadata('DeathNecropsy', { dateFormat: 'Y-m-d', timeFormat: 'H:i' }, + }, + remark: { + hidden: true + }, + performedby: { + hidden: true } }, 'study.necropsy': { diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCTissueDispositionFormSection.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCTissueDispositionFormSection.java index 290d1193..ed018a20 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCTissueDispositionFormSection.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/section/NIRCTissueDispositionFormSection.java @@ -27,6 +27,7 @@ public List getTbarButtons() List defaults = super.getTbarButtons(); defaults.remove("ADDANIMALS"); defaults.remove("TEMPLATE"); + defaults.add("TEMPLATE_NO_ID_NO_DATE"); return defaults; } From b55bfba2c209f78b9ed042f3da5b9e4e8734e497 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 15 Sep 2025 04:30:59 -0700 Subject: [PATCH 2/6] Remove unused arrival info --- .../nirc_ehr/study/study/datasets/datasetArrival.tsv | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv diff --git a/nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv b/nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv deleted file mode 100644 index 73f7ec99..00000000 --- a/nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv +++ /dev/null @@ -1,6 +0,0 @@ -objectid Id QCStateLabel date remark Description -1 TEST4551032 Completed -4377d nunc augue feugiat neque imperdiet et ornare euismod consequat -2 TEST5904521 Completed -4188d tellus sit semper fringilla arcu tincidunt turpis quis imperdiet ultrices eleifend -3 TEST1993532 Completed -6088d ut erat auctor fringilla hendrerit vitae ornare -4 44442 Completed -6100d -5 44443 Completed -6100d \ No newline at end of file From ce9c5a6b6a41ef2e13791cae30882702c4d3cdca Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 15 Sep 2025 08:07:31 -0700 Subject: [PATCH 3/6] Revert "Remove unused arrival info" This reverts commit b55bfba2c209f78b9ed042f3da5b9e4e8734e497. --- .../nirc_ehr/study/study/datasets/datasetArrival.tsv | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv diff --git a/nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv b/nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv new file mode 100644 index 00000000..73f7ec99 --- /dev/null +++ b/nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv @@ -0,0 +1,6 @@ +objectid Id QCStateLabel date remark Description +1 TEST4551032 Completed -4377d nunc augue feugiat neque imperdiet et ornare euismod consequat +2 TEST5904521 Completed -4188d tellus sit semper fringilla arcu tincidunt turpis quis imperdiet ultrices eleifend +3 TEST1993532 Completed -6088d ut erat auctor fringilla hendrerit vitae ornare +4 44442 Completed -6100d +5 44443 Completed -6100d \ No newline at end of file From 170403a7a9aa43768ff4a3f312d203b7275dccf1 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 15 Sep 2025 08:16:56 -0700 Subject: [PATCH 4/6] arrival trigger update --- nirc_ehr/resources/queries/study/arrival.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nirc_ehr/resources/queries/study/arrival.js b/nirc_ehr/resources/queries/study/arrival.js index 7f1d4366..9a245644 100644 --- a/nirc_ehr/resources/queries/study/arrival.js +++ b/nirc_ehr/resources/queries/study/arrival.js @@ -11,14 +11,12 @@ function onInit(event, helper){ }); } -EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.BEFORE_INSERT, 'study', 'Arrival', function(helper, scriptErrors, row, oldRow) { +EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.BEFORE_UPSERT, 'study', 'Arrival', function(helper, scriptErrors, row, oldRow) { - if (triggerHelper.animalIdExists(row.Id)) { + // Due to order of operation, this needs to be done in upsert instead of insert + if (helper.getEvent() == 'insert' && row.Id && triggerHelper.animalIdExists(row.Id)) { EHR.Server.Utils.addError(scriptErrors, 'Id', 'Animal Id ' + row.Id + ' is already in use. Please use a different Id.', 'ERROR'); } -}); - -EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.BEFORE_UPSERT, 'study', 'Arrival', function(helper, scriptErrors, row, oldRow) { if (row.eventDate) { row.date = row.eventDate; From e25d95fefb132fd49685fc490ac0cacf339be848 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 15 Sep 2025 08:17:40 -0700 Subject: [PATCH 5/6] Remove unnecessary if statement --- .../labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java b/nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java index 0f86c196..af3d6d6c 100644 --- a/nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java +++ b/nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java @@ -267,13 +267,9 @@ public String saveBirthRecord(String id, Map row) throws QueryUp public boolean animalIdExists(String id) { TableInfo ti = getTableInfo("study", "demographics"); - if (ti != null) - { - SimpleFilter filter = new SimpleFilter(FieldKey.fromString("Id"), id); - TableSelector ts = new TableSelector(ti, PageFlowUtil.set("lsid"), filter, null); - return ts.exists(); - } - return false; + SimpleFilter filter = new SimpleFilter(FieldKey.fromString("Id"), id); + TableSelector ts = new TableSelector(ti, PageFlowUtil.set("lsid"), filter, null); + return ts.exists(); } public boolean birthExists(String id) From 1035f948ef2a9ef6644f9cf96af47a8d84b90781 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Tue, 16 Sep 2025 03:47:14 -0700 Subject: [PATCH 6/6] Hide performedby and remark --- nirc_ehr/resources/queries/study/deaths.query.xml | 8 ++++++-- nirc_ehr/resources/queries/study/deaths/.qview.xml | 2 -- nirc_ehr/resources/views/necropsy.html | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nirc_ehr/resources/queries/study/deaths.query.xml b/nirc_ehr/resources/queries/study/deaths.query.xml index efa2b558..cd8b8e8c 100644 --- a/nirc_ehr/resources/queries/study/deaths.query.xml +++ b/nirc_ehr/resources/queries/study/deaths.query.xml @@ -17,8 +17,12 @@ title - - + + true + + + true + true diff --git a/nirc_ehr/resources/queries/study/deaths/.qview.xml b/nirc_ehr/resources/queries/study/deaths/.qview.xml index d04d768b..c6d14aec 100644 --- a/nirc_ehr/resources/queries/study/deaths/.qview.xml +++ b/nirc_ehr/resources/queries/study/deaths/.qview.xml @@ -7,7 +7,5 @@ - - \ No newline at end of file diff --git a/nirc_ehr/resources/views/necropsy.html b/nirc_ehr/resources/views/necropsy.html index f7390155..5b51a70d 100644 --- a/nirc_ehr/resources/views/necropsy.html +++ b/nirc_ehr/resources/views/necropsy.html @@ -59,7 +59,7 @@ schemaName: 'study', queryName: 'deaths', filterArray: filterArray, - columns: 'Id,Id/demographics/species,date,reason,remark,performedby,Id/lastProtocol/protocol,Id/lastProject/project', + columns: 'Id,Id/demographics/species,date,reason,Id/lastProtocol/protocol,Id/lastProject/project', }, title: 'Death', renderTo: 'animalDeath',