diff --git a/nirc_ehr/resources/queries/ehr/my_tasks.query.xml b/nirc_ehr/resources/queries/ehr/my_tasks.query.xml index a8c18a3e..2a6ca882 100644 --- a/nirc_ehr/resources/queries/ehr/my_tasks.query.xml +++ b/nirc_ehr/resources/queries/ehr/my_tasks.query.xml @@ -2,6 +2,7 @@ + My Tasks diff --git a/nirc_ehr/resources/queries/ehr/my_tasks/.qview.xml b/nirc_ehr/resources/queries/ehr/my_tasks/.qview.xml index 2e29eb87..83885950 100644 --- a/nirc_ehr/resources/queries/ehr/my_tasks/.qview.xml +++ b/nirc_ehr/resources/queries/ehr/my_tasks/.qview.xml @@ -1,4 +1,4 @@ - + diff --git a/nirc_ehr/resources/queries/ehr/my_tasks/Active Tasks.qview.xml b/nirc_ehr/resources/queries/ehr/my_tasks/Active Tasks.qview.xml index c519d797..069ab01d 100644 --- a/nirc_ehr/resources/queries/ehr/my_tasks/Active Tasks.qview.xml +++ b/nirc_ehr/resources/queries/ehr/my_tasks/Active Tasks.qview.xml @@ -1,4 +1,4 @@ - + diff --git a/nirc_ehr/resources/queries/ehr/my_tasks/Review Required.qview.xml b/nirc_ehr/resources/queries/ehr/my_tasks/Review Required.qview.xml index 9b19b128..d02c415a 100644 --- a/nirc_ehr/resources/queries/ehr/my_tasks/Review Required.qview.xml +++ b/nirc_ehr/resources/queries/ehr/my_tasks/Review Required.qview.xml @@ -1,4 +1,4 @@ - + diff --git a/nirc_ehr/resources/queries/ehr/tasks/.qview.xml b/nirc_ehr/resources/queries/ehr/tasks/.qview.xml index 1ffa8809..b60dc1d5 100644 --- a/nirc_ehr/resources/queries/ehr/tasks/.qview.xml +++ b/nirc_ehr/resources/queries/ehr/tasks/.qview.xml @@ -1,4 +1,4 @@ - + diff --git a/nirc_ehr/resources/queries/ehr/tasks/Active Tasks.qview.xml b/nirc_ehr/resources/queries/ehr/tasks/Active Tasks.qview.xml index e1c740b7..33364dce 100644 --- a/nirc_ehr/resources/queries/ehr/tasks/Active Tasks.qview.xml +++ b/nirc_ehr/resources/queries/ehr/tasks/Active Tasks.qview.xml @@ -1,4 +1,4 @@ - + diff --git a/nirc_ehr/resources/queries/ehr/tasks/Review Required.qview.xml b/nirc_ehr/resources/queries/ehr/tasks/Review Required.qview.xml index 0b78c492..ac3cbd6f 100644 --- a/nirc_ehr/resources/queries/ehr/tasks/Review Required.qview.xml +++ b/nirc_ehr/resources/queries/ehr/tasks/Review Required.qview.xml @@ -1,4 +1,4 @@ - + diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/ProcedureOrderCompleteButton.js b/nirc_ehr/resources/web/nirc_ehr/buttons/ProcedureOrderCompleteButton.js index af2d69e3..8e2097af 100644 --- a/nirc_ehr/resources/web/nirc_ehr/buttons/ProcedureOrderCompleteButton.js +++ b/nirc_ehr/resources/web/nirc_ehr/buttons/ProcedureOrderCompleteButton.js @@ -44,6 +44,7 @@ Ext4.define('NIRC_EHR.window.ProcedureOrderCompleteWindow', { queryName: 'QCState', filterArray: [LABKEY.Filter.create('label', 'Completed', LABKEY.Filter.Types.EQUALS)], scope: this, + ignoreFilter: true, columns: 'RowId', success: function (data) { const rowsToInsert = []; diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/RecordProcedureButton.js b/nirc_ehr/resources/web/nirc_ehr/buttons/RecordProcedureButton.js index 65677869..91fab419 100644 --- a/nirc_ehr/resources/web/nirc_ehr/buttons/RecordProcedureButton.js +++ b/nirc_ehr/resources/web/nirc_ehr/buttons/RecordProcedureButton.js @@ -73,6 +73,7 @@ Ext4.define('NIRC_EHR.window.RecordProcedureWindow', { queryName: 'prc_order', filterArray: [LABKEY.Filter.create('lsid', selectedRows.join(';'), LABKEY.Filter.Types.EQUALS_ONE_OF)], scope: this, + ignoreFilter: true, columns: 'Id,objectid,procedure,category,caseid,orderedby,lsid', success: function (data) { const rowsToInsert = []; diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/RecordTreatmentButton.js b/nirc_ehr/resources/web/nirc_ehr/buttons/RecordTreatmentButton.js index c354b895..04bf5673 100644 --- a/nirc_ehr/resources/web/nirc_ehr/buttons/RecordTreatmentButton.js +++ b/nirc_ehr/resources/web/nirc_ehr/buttons/RecordTreatmentButton.js @@ -74,6 +74,7 @@ Ext4.define('NIRC_EHR.window.RecordTreatmentWindow', { queryName: 'treatment_order', filterArray: [LABKEY.Filter.create('objectid', objectIds.join(';'), LABKEY.Filter.Types.EQUALS_ONE_OF)], scope: this, + ignoreFilter: true, columns: 'Id,objectid,code,reason,route,amount,amount_units,concentration,volume,vol_units,conc_units,dosage,dosage_units,orderedby,category,caseid', success: function (data) { const rowsToInsert = []; diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/addClinicalObsButton.js b/nirc_ehr/resources/web/nirc_ehr/buttons/addClinicalObsButton.js index 9d6311ac..fb75911f 100644 --- a/nirc_ehr/resources/web/nirc_ehr/buttons/addClinicalObsButton.js +++ b/nirc_ehr/resources/web/nirc_ehr/buttons/addClinicalObsButton.js @@ -7,6 +7,7 @@ EHR.DataEntryUtils.registerGridButton('NIRC_DAILY_CLINICAL_OBS', function(config LABKEY.Query.selectRows({ schemaName: 'ehr', queryName: 'observation_types', + ignoreFilter: true, success: function (results) { var grid = btn.up('gridpanel'); if (results?.rows?.length > 0) { @@ -46,6 +47,7 @@ EHR.DataEntryUtils.registerGridButton('NIRC_DAILY_CLINICAL_OBS_ORDERS', function LABKEY.Query.selectRows({ schemaName: 'ehr', queryName: 'observation_types', + ignoreFilter: true, success: function (results) { var grid = btn.up('gridpanel'); if (results?.rows?.length > 0) { diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/clinicalObsGridButton.js b/nirc_ehr/resources/web/nirc_ehr/buttons/clinicalObsGridButton.js index f9fb277d..fda4a068 100644 --- a/nirc_ehr/resources/web/nirc_ehr/buttons/clinicalObsGridButton.js +++ b/nirc_ehr/resources/web/nirc_ehr/buttons/clinicalObsGridButton.js @@ -13,6 +13,7 @@ EHR.DataEntryUtils.registerGridButton('NIRC_AUTO_POPULATE_DAILY_OBS', function(c LABKEY.Query.selectRows({ schemaName: 'ehr', queryName: 'observation_types', + ignoreFilter: true, success: function (results) { var grid = btn.up('gridpanel'); if (grid?.store?.data?.getCount() === 0) { diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/necropsyGridButtons.js b/nirc_ehr/resources/web/nirc_ehr/buttons/necropsyGridButtons.js index dab752a9..b407309c 100644 --- a/nirc_ehr/resources/web/nirc_ehr/buttons/necropsyGridButtons.js +++ b/nirc_ehr/resources/web/nirc_ehr/buttons/necropsyGridButtons.js @@ -8,6 +8,7 @@ EHR.DataEntryUtils.registerGridButton('ADDGROSSPATHOLOGY', function(config){ LABKEY.Query.selectRows({ schemaName: 'ehr_lookups', queryName: 'necropsy_organ_systems', + ignoreFilter: true, success: function (results) { var grid = btn.up('gridpanel'); if (grid && grid.store && grid.store.data && grid.store.data.getCount() === 0) { diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/treatmentSubmit.js b/nirc_ehr/resources/web/nirc_ehr/buttons/treatmentSubmit.js index 8169af83..2d50f75f 100644 --- a/nirc_ehr/resources/web/nirc_ehr/buttons/treatmentSubmit.js +++ b/nirc_ehr/resources/web/nirc_ehr/buttons/treatmentSubmit.js @@ -38,6 +38,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('NIRC_TREATMENT_SUBMIT', { filterArray: filters, columns: 'problemSubcategory', scope: this, + ignoreFilter: true, failure: LDK.Utils.getErrorCallback(), success: function (results) { if (results.rows.length > 0) { @@ -150,6 +151,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('NIRC_TREATMENT_SUBMIT', { columns: 'Id,meaning,code,qualifier,route,concentration,conc_units,amount,amount_units,dosage,dosage_units,volume,vol_units,remark,category,objectid,orderedby', filterArray: [LABKEY.Filter.create('objectid', treatmentid, LABKEY.Filter.Types.EQUAL)], scope: this, + ignoreFilter: true, success: onSuccess, failure: LDK.Utils.getErrorCallback() }); @@ -207,6 +209,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('NIRC_TREATMENT_SUBMIT', { LABKEY.Filter.create('id', id, LABKEY.Filter.Types.EQUAL), LABKEY.Filter.create('category', observations, LABKEY.Filter.Types.EQUALS_ONE_OF)], scope: this, + ignoreFilter: true, success: onObsSuccess, failure: LDK.Utils.getErrorCallback() }); @@ -251,6 +254,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('NIRC_TREATMENT_SUBMIT', { queryName: 'prc_order', columns: 'Id,procedure,remark,category,objectid,orderedby,caseid', filterArray: [LABKEY.Filter.create('objectid', prcOrderId, LABKEY.Filter.Types.EQUAL)], + ignoreFilter: true, scope: this, success: onSuccess, failure: LDK.Utils.getErrorCallback() diff --git a/nirc_ehr/resources/web/nirc_ehr/model/sources/MedicationEndDate.js b/nirc_ehr/resources/web/nirc_ehr/model/sources/MedicationEndDate.js index 08abf3b9..5c4dfd82 100644 --- a/nirc_ehr/resources/web/nirc_ehr/model/sources/MedicationEndDate.js +++ b/nirc_ehr/resources/web/nirc_ehr/model/sources/MedicationEndDate.js @@ -15,6 +15,7 @@ EHR.model.DataModelManager.registerMetadata('MedicationEndDate', { queryName: 'drug_defaults', columns: ['duration','offset'], scope: this, + ignoreFilter: true, filterArray: [LABKEY.Filter.create('code', newVal)], success: function (data) { if (data.rows && data.rows.length > 0) { diff --git a/nirc_ehr/resources/web/nirc_ehr/model/sources/TreatmentSchedule.js b/nirc_ehr/resources/web/nirc_ehr/model/sources/TreatmentSchedule.js index d900c56f..67c12aa7 100644 --- a/nirc_ehr/resources/web/nirc_ehr/model/sources/TreatmentSchedule.js +++ b/nirc_ehr/resources/web/nirc_ehr/model/sources/TreatmentSchedule.js @@ -18,7 +18,8 @@ EHR.model.DataModelManager.registerMetadata('TreatmentSchedule', { schemaName: 'ehr_lookups', queryName: 'snomed', columns: 'code,meaning', - sort: 'sort_order', + sort: 'meaning,code', + filterArray: [LABKEY.Filter.create('dateDisabled', null, LABKEY.Filter.Types.ISBLANK)], autoLoad: true, getRecordForCode: function(code){ debugger diff --git a/nirc_ehr/resources/web/nirc_ehr/window/MarkTreatmentCompletedWindow.js b/nirc_ehr/resources/web/nirc_ehr/window/MarkTreatmentCompletedWindow.js index 63ffb083..42ae2f57 100644 --- a/nirc_ehr/resources/web/nirc_ehr/window/MarkTreatmentCompletedWindow.js +++ b/nirc_ehr/resources/web/nirc_ehr/window/MarkTreatmentCompletedWindow.js @@ -115,6 +115,7 @@ Ext4.define('NIRC_EHR.window.MarkTreatmentCompletedWindow', { LABKEY.Filter.create(this.pkColName, checked.join(';'), LABKEY.Filter.Types.EQUALS_ONE_OF) ], scope: this, + ignoreFilter: true, success: this.onSuccess, failure: LDK.Utils.getErrorCallback() }); diff --git a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java index 0a897e96..03d6f463 100644 --- a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java +++ b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java @@ -886,8 +886,11 @@ public void testDeathNecropsyForm() throws IOException, CommandException Window submitForReview = new Window<>("Submit For Review", getDriver()); // Make sure to find the element in submitForReview window. + waitForElement(Locator.tagWithNameContaining("input", "assignedTo")); + click(Locator.tagWithNameContaining("input", "assignedTo")); WebElement assignedToElement = Locator.tagWithNameContaining("input", "assignedTo").findWhenNeeded(submitForReview); setFormElement(assignedToElement, _userHelper.getDisplayNameForEmail(NIRC_FULL_SUBMITTER_VET)); + click(Locator.tagWithNameContaining("input", "assignedTo")); // Entering the text leaves the selection list visible, send 'Enter' to remove it. assignedToElement.sendKeys(Keys.ENTER); @@ -963,8 +966,12 @@ public void testClinicalCasesWorkflow() Ext4FieldRef problem = _helper.getExt4FieldForFormSection("Clinical Case", "Problem Area"); problem.clickTrigger(); problem.setValue("Circulatory abnormality"); + click(Locator.textarea("openRemark")); setFormElement(Locator.textarea("openRemark"), "Clinical Case WorkFlow - Test"); + click(Locator.textarea("plan")); setFormElement(Locator.textarea("plan"), "Case plan"); + waitForElement(Locator.name("Id")); + click(Locator.name("Id")); setFormElement(Locator.name("Id"), animalId); _helper.getExt4FieldForFormSection("Clinical Case", "Open Date").setValue(LocalDateTime.now().minusDays(1).format(_dateFormat)); Assert.assertEquals("Performed by is incorrect ", "vet tech fs", getFormElement(Locator.name("performedby")));