[bot] Fast-forward for 25.11.9

nirc_ehr/resources/queries/ehr/my_tasks.query.xml

@@ -2,6 +2,7 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="my_tasks" tableDbType="TABLE">
+                <tableTitle>My Tasks</tableTitle>
                 <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <insertUrl />
                 <updateUrl />

nirc_ehr/resources/queries/ehr/my_tasks/.qview.xml

@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All Tasks">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All Tasks" canOverride="true">
    <columns>
        <column name="rowid"/>
        <column name="updateTitle" />

nirc_ehr/resources/queries/ehr/my_tasks/Active Tasks.qview.xml

@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
    <columns>
        <column name="rowid"/>
        <column name="updateTitle" />

nirc_ehr/resources/queries/ehr/my_tasks/Review Required.qview.xml

@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
    <columns>
        <column name="rowid"/>
        <column name="updateTitle" />

nirc_ehr/resources/queries/ehr/tasks/.qview.xml

@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All Tasks">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All Tasks" canOverride="true">
    <columns>
        <column name="rowid"/>
        <column name="updateTitle" />

nirc_ehr/resources/queries/ehr/tasks/Active Tasks.qview.xml

@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
    <filters>
        <filter column="qcstate/PublicData" operator="eq" value="false"/>
    </filters>

nirc_ehr/resources/queries/ehr/tasks/Review Required.qview.xml

@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
    <columns>
        <column name="rowid"/>
        <column name="updateTitle" />

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 = [];

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 = [];

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 = [];

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) {

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) {

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) {

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()

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) {

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

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()
         });

nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java

@@ -884,8 +884,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);
@@ -961,8 +964,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")));