From fddc328a9901444c6b53cfafc49f9cc7090c4b6a Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Tue, 3 Jun 2025 05:38:53 -0700 Subject: [PATCH 1/5] Default treatment order date --- .../web/onprc_ehr/data/sources/ONPRCDefaults.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js b/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js index 6aa7a3c15..9bbd8eb8c 100644 --- a/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js +++ b/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js @@ -32,6 +32,18 @@ EHR.model.DataModelManager.registerMetadata('Default', { defaultHour: 23, defaultMinutes: 59 } + }, + date: { + inheritDateFromParent: false, + getInitialValue: function(v, rec){ + if (v) + return v; + + var ret = Ext4.Date.clearTime(new Date()); + ret = Ext4.Date.add(ret, Ext4.Date.DAY, 1); + ret.setHours(8); + return ret; + } } }, From 8a6787225c94f345684e411817b2ba4d2e8733fc Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Tue, 3 Jun 2025 05:39:08 -0700 Subject: [PATCH 2/5] cleanup --- .../onprc_ehr/dataentry/EncounterChildFormSection.java | 1 - .../labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java | 8 -------- 2 files changed, 9 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java index 66b37ae97..300daf3e3 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java @@ -44,7 +44,6 @@ public EncounterChildFormSection(String schemaName, String queryName, String lab // Modified: 2-13-2025 R. Blasa addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/AddProcedureDefaultsWindow.js")); - addConfigSource("Encounter"); addConfigSource("EncounterChild"); setTemplateMode(TEMPLATE_MODE.ENCOUNTER); diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java index 1bf0c75fa..fad3ed827 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java @@ -73,16 +73,8 @@ public SingleSurgeryFormType(DataEntryFormContext ctx, Module owner) for (FormSection s : this.getFormSections()) { - s.addConfigSource("Encounter"); - // Modified: 4-20-2021 R. Blasa s.addConfigSource("onprc_Surgery"); - - //Added: 9-6-2017 R.Blasa - s.addConfigSource("Surgery_Blood"); - - //Added: 10-13-2017 R.Blasa - s.addConfigSource("Biopsy_Staff"); } } From ce09ce57d8f788893907668e7fb691a561e705a1 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Tue, 3 Jun 2025 16:07:04 -0700 Subject: [PATCH 3/5] Move treatment order date to just surgery --- .../web/onprc_ehr/data/sources/ONPRCDefaults.js | 12 ------------ .../resources/web/onprc_ehr/model/sources/Surgery.js | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js b/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js index 9bbd8eb8c..6aa7a3c15 100644 --- a/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js +++ b/onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js @@ -32,18 +32,6 @@ EHR.model.DataModelManager.registerMetadata('Default', { defaultHour: 23, defaultMinutes: 59 } - }, - date: { - inheritDateFromParent: false, - getInitialValue: function(v, rec){ - if (v) - return v; - - var ret = Ext4.Date.clearTime(new Date()); - ret = Ext4.Date.add(ret, Ext4.Date.DAY, 1); - ret.setHours(8); - return ret; - } } }, diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js index 61bbf3f28..d16229629 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js @@ -35,6 +35,18 @@ EHR.model.DataModelManager.registerMetadata('onprc_Surgery', { shownInGrid: true, defaultValue: 'Surgical', allowBlank: false + }, + date: { + inheritDefaultDateFromParent: false, + getInitialValue: function(v, rec){ + if (v) + return v; + + var ret = Ext4.Date.clearTime(new Date()); + ret = Ext4.Date.add(ret, Ext4.Date.DAY, 1); + ret.setHours(8); + return ret; + } } }, From ff93ad8b4fb1ae6e4ec47b1ab7e18440337dc343 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Wed, 4 Jun 2025 09:36:15 -0700 Subject: [PATCH 4/5] test case --- .../labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java index 5dcbd3b73..2ebd9f64e 100644 --- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java +++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java @@ -61,6 +61,7 @@ import java.io.File; import java.io.IOException; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; @@ -1550,6 +1551,8 @@ public void testPathology() @Test public void testSurgeryForm() { + LocalDateTime tomorrow = LocalDateTime.now().plusDays(1); + _helper.goToTaskForm("Surgeries"); Ext4GridRef proceduresGrid = _helper.getExt4GridForFormSection("Procedures"); @@ -1689,6 +1692,17 @@ public void testSurgeryForm() waitForElementToDisappear(caseWindow); waitForElement(Ext4Helper.Locators.window("Success").append(Locator.tagWithText("div", "Surgical cases opened"))); waitAndClick(Ext4Helper.Locators.window("Success").append(Ext4Helper.Locators.ext4ButtonEnabled("OK"))); + + _ext4Helper.clickExt4Tab("Medication/Treatment Orders"); + treatmentGrid = _helper.getExt4GridForFormSection("Medication/Treatment Orders"); + treatmentGrid.clickTbarButton("Add Record"); + treatmentGrid.completeEdit(); + + Assert.assertEquals(tomorrow.withHour(8).withMinute(0).withSecond(0).withNano(0), + treatmentGrid.getDateFieldValue(3, "date").toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDateTime()); + _helper.discardForm(); } From 47f9e2dbff7a2390bf986b00d2353005a1cce38a Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Wed, 4 Jun 2025 10:55:18 -0700 Subject: [PATCH 5/5] Fix times calc col. This is putting in extra single quotes. This doesn't affect anything just nice to have it fixed if these are ever used. --- .../src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java b/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java index 717db38f7..0253307c1 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java @@ -1111,7 +1111,7 @@ private void customizeTreatmentFrequency(AbstractTableInfo ti) ColumnInfo existing = ti.getColumn(name); if (null == existing && null != ti.getColumn("meaning")) { - SQLFragment sql = new SQLFragment("(SELECT " + ti.getSqlDialect().getGroupConcat(new SQLFragment("REPLICATE('0', 4 - LEN(t.hourofday)) + cast(t.hourofday as varchar(4))"), true, true, "','").getSqlCharSequence() + + SQLFragment sql = new SQLFragment("(SELECT " + ti.getSqlDialect().getGroupConcat(new SQLFragment("REPLICATE('0', 4 - LEN(t.hourofday)) + cast(t.hourofday as varchar(4))"), true, true, ",").getSqlCharSequence() + "FROM ehr_lookups.treatment_frequency_times t " + " WHERE t.frequency = " + ExprColumn.STR_TABLE_ALIAS + ".meaning " + " GROUP BY t.frequency " +