From 2df7a21fe7d0453a5daf2f3019c7f75c05d12882 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Mon, 16 Dec 2024 11:17:05 -0800 Subject: [PATCH 1/3] 23.11 fb medical scripting amended (#1025) * Modified Medication scripting to include duration, and enddates. * Modified Medication scripting to include duration, and enddates. * Modified Medication scription process Heather's version. * Created a new program that creates new Clinical Observaction TB Test entries based on recently entered TB Test procedures. * Mosified program to create template process. * Created new medication scripting. * Created new medication scripting. * Created a new program that will provide medication scripting. * MOdified medication scripting program. * Modified medication scripting. * Modified Medical Scripting program code. * Modified medication scripting. * Modified Medication Scripting code. * Modified Medicaion scripts * Modified Medicaion scripts * Modified Medicaion scripts * Modified Medicaion scripts * Modified medication scripting program. * Modified medication scripting program. --- .../onprc_ehr/window/ApplyTemplateWindow.js | 62 ++++++++++++++++--- .../dataentry/TreatmentsFormType.java | 3 + 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/window/ApplyTemplateWindow.js b/onprc_ehr/resources/web/onprc_ehr/window/ApplyTemplateWindow.js index 94c871560..08d7c1abe 100644 --- a/onprc_ehr/resources/web/onprc_ehr/window/ApplyTemplateWindow.js +++ b/onprc_ehr/resources/web/onprc_ehr/window/ApplyTemplateWindow.js @@ -158,7 +158,8 @@ Ext4.define('ONPRC_EHR.window.ApplyTemplateWindow', { Ext4.Msg.alert('Error', 'Must choose a template'); return; } - + var obj ={} + this.animalId = obj.Id; this.loadTemplate(templateId); }, @@ -225,16 +226,59 @@ Ext4.define('ONPRC_EHR.window.ApplyTemplateWindow', { offsetDate.setHours(8); date = offsetDate; + } + if (data.duration > 0) { + var enddate = null; + //this is specifically to handle hydro, when administered ~noon + if (new String(data.duration).match(/H$/)) { + var duration = new String(data.duration); + duration = duration.replace('H', ''); + duration = Number(duration); + duration += encountersRec.get('date').getHours(); + duration = Math.floor(duration / 24); + + enddate = date; + endate = Ext4.Date.clearTime(enddate); + enddate = Ext4.Date.add(enddate, Ext4.Date.DAY, duration); + } + else { + + enddate = offsetDate + enddate = Ext4.Date.add(enddate, Ext4.Date.DAY, data.duration); + enddate.setHours(23); + enddate = enddate; + enddate.setMinutes(59); + enddate = enddate; + + + } } - var obj2 = {}; - obj2 = { - date: date + else + { + + var sdate= Ext4.Date.clone(new Date()); + var soffsetDate = Ext4.Date.add(sdate, Ext4.Date.DAY, data.offset); + var soffsetDate = Ext4.Date.clearTime(soffsetDate); + enddate = soffsetDate; + enddate.setHours(23); + enddate = enddate; + enddate.setMinutes(59); + enddate = enddate; + + } + + var obj2 = {}; + obj2 = { + date: date, + enddate: enddate + }; var newData = Ext4.apply({}, data); - newData = Ext4.apply(newData, obj); - newData = Ext4.apply(newData, obj2); + newData = Ext4.apply(newData, obj); //Adds monkey id + + newData = Ext4.apply(newData, obj2); // add new computed dates toAdd[store.storeId].push(newData); }, this); @@ -261,6 +305,7 @@ Ext4.define('ONPRC_EHR.window.ApplyTemplateWindow', { } }, + getInitialRecordValues: function(){ var ret = []; var date = this.down('#dateField').getValue(); @@ -271,6 +316,7 @@ Ext4.define('ONPRC_EHR.window.ApplyTemplateWindow', { if (this.down('#subjectIds')){ var subjectArray = LDK.Utils.splitIds(this.down('#subjectIds').getValue(),true); Ext4.Array.each(subjectArray, function(subj){ + this.animalId = subj; ret.push(Ext4.apply({ Id: subj }, obj)); @@ -312,6 +358,8 @@ Ext4.define('ONPRC_EHR.window.ApplyTemplateWindow', { return; } + + this.hide(); Ext4.Msg.wait("Loading Template..."); @@ -526,7 +574,7 @@ EHR.DataEntryUtils.registerGridButton('TEMPLATEREV', function(config){ var grid = btn.up('gridpanel'); var menu = this.up('menu').items.get('templatesMenu'); - Ext4.create('EHR.window.ApplyTemplateWindow', { + Ext4.create('ONPRC_EHR.window.ApplyTemplateWindow', { targetGrid: grid, formType: grid.formConfig.name, idSelectionMode: menu.idSelectionMode || 'multi' diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java index 0846869e7..219d2f560 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java @@ -44,6 +44,9 @@ public TreatmentsFormType(DataEntryFormContext ctx, Module owner) { super(ctx, owner, NAME, LABEL, "Clinical", Arrays.asList( new TaskFormSection(), + //Added 2-19-2016 Blasa + // new NonStoreFormSection("Treatment Template Helper", "Treatment Template Helper", "onprc_AddScheduledTreatmentPanel", Arrays.asList(ClientDependency.supplierFromPath("/onprc_ehr/panel/AddScheduledTreatmentPanel.js"))), + new AnimalDetailsFormSection(), new DrugAdministrationFormSection(ClientDependency.supplierFromPath("onprc_ehr/window/ONPRC_AddScheduledTreatmentWindow.js")), new TreatmentOrdersFormSection() From add3bfd7540cf6c195a9648392d6b8e0b227ea74 Mon Sep 17 00:00:00 2001 From: Sweta Jewargikar Date: Mon, 16 Dec 2024 13:09:09 -0800 Subject: [PATCH 2/3] Test updates (#1209) --- .../org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java index 46c50a9ad..1459bc617 100644 --- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java +++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -56,6 +57,7 @@ import java.io.IOException; import java.net.URI; +import java.time.Duration; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Arrays; @@ -1324,8 +1326,10 @@ public void bloodRequestTest() throws IOException, CommandException waitAndClickAndWait(Locator.linkWithText("ASB Services Request")); addBloodDrawRequest(animalId, now, "795644", "Heparin", 12); - checker().withScreenshot("Blood request").verifyTrue("Expected error is not present", isAnyTextPresent( - "Row 1, # of Tubes: ERROR: The quantity requested, 12.0ml exceeds the available blood volume, 10.0ml for AnimalId: 12345")); + Awaitility.await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> { + Assert.assertTrue("Expected error is not present", isAnyTextPresent( + "Row 1, # of Tubes: ERROR: The quantity requested, 12.0ml exceeds the available blood volume, 10.0ml for AnimalId: 12345")); + }); //Updating the total volume below the available blood volume. updateTotalVolume(8); From 874d35dd81f8fc25422530c9aed892c74e61e08b Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:27:23 -0800 Subject: [PATCH 3/3] Modified Epoc program to include downloadable excel Epoc formatted template (#1206) --- .../web/onprc_ehr/templates/Epoc_Template.xlsx | Bin 0 -> 14293 bytes .../web/onprc_ehr/window/EpocImportWindow.js | 10 +++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 onprc_ehr/resources/web/onprc_ehr/templates/Epoc_Template.xlsx diff --git a/onprc_ehr/resources/web/onprc_ehr/templates/Epoc_Template.xlsx b/onprc_ehr/resources/web/onprc_ehr/templates/Epoc_Template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..88f8dabb7074d2e0b5d60f4084d78a695d3fc5bc GIT binary patch literal 14293 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 literal 0 HcmV?d00001 diff --git a/onprc_ehr/resources/web/onprc_ehr/window/EpocImportWindow.js b/onprc_ehr/resources/web/onprc_ehr/window/EpocImportWindow.js index 7fe59916a..816d39940 100644 --- a/onprc_ehr/resources/web/onprc_ehr/window/EpocImportWindow.js +++ b/onprc_ehr/resources/web/onprc_ehr/window/EpocImportWindow.js @@ -19,7 +19,15 @@ Ext4.define('ONPRC_EHR.window.EpocImportWindow', { items: [{ html: 'This helper allows you to bulk import EPOC data, exported as an excel file from the Epoc software.', style: 'padding-bottom: 10px;' - },{ + },{ + xtype: 'ldk-linkbutton', + text: '[Download Epoc Template]', + scope: this, + style: 'margin-bottom: 10px;', + handler: function(){ + window.location = LABKEY.contextPath + '/onprc_ehr/templates/Epoc_Template.xlsx' + } + },{ xtype: 'textarea', itemId: 'textField', height: 300,