From ed066c043d88823f6d08b735ae82d93d1bfccee2 Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 11 Aug 2026 17:44:24 -0700 Subject: [PATCH 1/3] Modified Blood Draw input form to force users to select "Additional Services" selection items. --- .../web/onprc_ehr/model/sources/BloodDraw.js | 19 +++++++++++++++++++ .../dataentry/BloodDrawFormType.java | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js new file mode 100644 index 000000000..5bde45c5e --- /dev/null +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2013-2019 LabKey Corporation + * + * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 + */ +EHR.model.DataModelManager.registerMetadata('BloodDraw', { + byQuery: { + 'study.drug': { + reason: { + defaultValue: 'Blood Draw' + } + }, + 'study.blood': { + additionalServices: { + allowBlank: false + } + } + } +}); \ No newline at end of file diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java index edbe49d39..1902677f7 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java @@ -60,7 +60,8 @@ public BloodDrawFormType(DataEntryFormContext ctx, Module owner, List Date: Wed, 12 Aug 2026 14:26:53 -0700 Subject: [PATCH 2/3] Modified Blood Draw input form to force users to select "Additional Services" selection items. --- .../scripts/onprc_ehr/onprc_triggers.js | 3 +++ .../web/onprc_ehr/model/sources/BloodDraw.js | 19 ------------------- .../dataentry/BloodDrawFormType.java | 3 +-- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js diff --git a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js index 51e4b53e8..451ef432c 100644 --- a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js +++ b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js @@ -1150,6 +1150,9 @@ exports.init = function(EHR){ if (!row.quantity && row.num_tubes && row.tube_vol){ row.quantity = row.num_tubes * row.tube_vol; } + if (row.additionalServices == null) { + EHR.Server.Utils.addError(scriptErrors, 'additionalServices', 'Please select from a list of Additional Services items', 'INFO'); + } if (row.additionalServices) { if (row.tube_type || row.tube_vol){ diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js deleted file mode 100644 index 5bde45c5e..000000000 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -EHR.model.DataModelManager.registerMetadata('BloodDraw', { - byQuery: { - 'study.drug': { - reason: { - defaultValue: 'Blood Draw' - } - }, - 'study.blood': { - additionalServices: { - allowBlank: false - } - } - } -}); \ No newline at end of file diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java index 1902677f7..edbe49d39 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java @@ -60,8 +60,7 @@ public BloodDrawFormType(DataEntryFormContext ctx, Module owner, List Date: Wed, 12 Aug 2026 14:29:42 -0700 Subject: [PATCH 3/3] Modified Blood Draw input form to force users to select "Additional Services" selection items. --- .../scripts/onprc_ehr/onprc_triggers.js | 3 +++ .../web/onprc_ehr/model/sources/BloodDraw.js | 19 ------------------- .../dataentry/BloodDrawFormType.java | 3 +-- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js diff --git a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js index 51e4b53e8..451ef432c 100644 --- a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js +++ b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js @@ -1150,6 +1150,9 @@ exports.init = function(EHR){ if (!row.quantity && row.num_tubes && row.tube_vol){ row.quantity = row.num_tubes * row.tube_vol; } + if (row.additionalServices == null) { + EHR.Server.Utils.addError(scriptErrors, 'additionalServices', 'Please select from a list of Additional Services items', 'INFO'); + } if (row.additionalServices) { if (row.tube_type || row.tube_vol){ diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js deleted file mode 100644 index 5bde45c5e..000000000 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/BloodDraw.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -EHR.model.DataModelManager.registerMetadata('BloodDraw', { - byQuery: { - 'study.drug': { - reason: { - defaultValue: 'Blood Draw' - } - }, - 'study.blood': { - additionalServices: { - allowBlank: false - } - } - } -}); \ No newline at end of file diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java index 1902677f7..edbe49d39 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java @@ -60,8 +60,7 @@ public BloodDrawFormType(DataEntryFormContext ctx, Module owner, List