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