Validation testing feedback (#486)

labkey-martyp · web-flow · commit 769299d1c772 · 2025-02-20T10:18:02.000-08:00
- Frequency fk refactor
- Procedure Schedule to Clinical Rounds
- Remove Discard option from forms
- Notes Report
- Remove Label from Cases
- Frequency lookup refactor
- Location search
diff --git a/nirc_ehr/resources/queries/study/observation_order.query.xml b/nirc_ehr/resources/queries/study/observation_order.query.xml
@@ -29,7 +29,7 @@
                         <fk>
                             <fkDbSchema>ehr_lookups</fkDbSchema>
                             <fkTable>treatment_frequency</fkTable>
-                            <fkColumnName>rowid</fkColumnName>
+                            <fkColumnName>meaning</fkColumnName>
                         </fk>
                     </column>
                     <column columnName="performedby">
diff --git a/nirc_ehr/resources/queries/study/prcOverdue.sql b/nirc_ehr/resources/queries/study/prcOverdue.sql
@@ -7,6 +7,7 @@ SELECT
     timestampdiff('SQL_TSI_DAY', po.windowEnd, now()) as daysOverdue,
     po.orderedby,
     po.remark,
+    po.caseid,
     po.objectid,
     CASE WHEN po.qcstate.label = 'Completed' THEN 'Completed' ELSE '' END as status
 FROM prc_order po
diff --git a/nirc_ehr/resources/queries/study/prcSchedule.sql b/nirc_ehr/resources/queries/study/prcSchedule.sql
@@ -7,6 +7,7 @@ SELECT
     po.windowEnd,
     po.orderedby,
     po.remark,
+    po.caseid,
     po.objectid,
     CASE WHEN po.qcstate.label = 'Completed' THEN 'Completed' ELSE '' END as status
 FROM prc_order po
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule.query.xml b/nirc_ehr/resources/queries/study/treatmentSchedule.query.xml
@@ -42,7 +42,7 @@
                         <fk>
                           <fkDbSchema>ehr_lookups</fkDbSchema>
                           <fkTable>treatment_frequency</fkTable>
-                          <fkColumnName>rowid</fkColumnName>
+                          <fkColumnName>meaning</fkColumnName>
                         </fk>
                     </column>
                     <column columnName="remark">
diff --git a/nirc_ehr/resources/queries/study/treatment_order.query.xml b/nirc_ehr/resources/queries/study/treatment_order.query.xml
@@ -48,7 +48,7 @@
                         <fk>
                             <fkDbSchema>ehr_lookups</fkDbSchema>
                             <fkTable>treatment_frequency</fkTable>
-                            <fkColumnName>rowid</fkColumnName>
+                            <fkColumnName>meaning</fkColumnName>
                             <filters>
                                 <filterGroup>
                                     <filter column="active" operator="eq" value="true"/> <!-- filter applied only during insert and update, will not be used during grid view -->
diff --git a/nirc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml b/nirc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
@@ -1459,7 +1459,7 @@
                 <datatype>integer</datatype>
             </column>
             <column columnName="frequency">
-                <datatype>integer</datatype>
+                <datatype>varchar</datatype>
             </column>
             <column columnName="type">
                 <datatype>varchar</datatype>
diff --git a/nirc_ehr/resources/reports/additionalReports.tsv b/nirc_ehr/resources/reports/additionalReports.tsv
@@ -8,6 +8,7 @@ foster	Reproductive Management	query	Fostering	TRUE		study	foster				FALSE	FALSE
 projects	Colony Management	query	Project Assignment	TRUE		study	assignment				FALSE	FALSE		qcstate/publicdata	This is for project assignments
 chemistry	Clinical	query	Chemistry	TRUE		study	chemistryResults				FALSE	FALSE		qcstate/publicdata	This is for chemistry results
 alias	Colony Management	query	Aliases	true		study	demographicsAliases				false	false		qcstate/publicdata	This report shows the animal aliases
+notes	Colony Management	query	Notes	true		study	notes				false	false		qcstate/publicdata	This report shows the animal notes
 activeClinTreatmentOrders	Clinical	query	Active Clinical Medication Orders	true		study	treatment_order	Clinical Active Treatment Orders		date	false	false		qcstate/publicdata	This report contains the treatment orders entered for each animal
 activeBehaviorTreatmentOrders	Behavior	query	Active Behavior Medication Orders	true		study	treatment_order	Behavior Active Treatment Orders		date	false	false		qcstate/publicdata	This report contains the treatment orders entered for each animal
 allTreatments	Clinical	query	All Treatment Orders	true		study	treatment_order				false	false		qcstate/publicdata	This report shows all treatment orders
diff --git a/nirc_ehr/resources/scripts/nirc_triggers.js b/nirc_ehr/resources/scripts/nirc_triggers.js
@@ -19,6 +19,10 @@ exports.init = function (EHR) {
         EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'blood', EHR.Server.TriggerManager.Events.BEFORE_UPSERT);
         EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'cases', EHR.Server.TriggerManager.Events.AFTER_UPSERT);
         EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'cases', EHR.Server.TriggerManager.Events.AFTER_DELETE);
+
+        helper.setScriptOptions({
+            datasetsToClose: ['assignment', 'protocolAssignment' , 'housing', 'treatment_order', 'observation_order', 'cases', 'pairings', 'exemptions', 'flags']
+        });
     });
 
     EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.INIT, 'study', 'assignment', function(event, helper) {
diff --git a/nirc_ehr/resources/views/animalHistory.html b/nirc_ehr/resources/views/animalHistory.html
@@ -44,11 +44,57 @@
                 xtype: 'ehr-locationfiltertype',
                 inputValue: EHR.panel.LocationFilterType.filterName,
                 label: EHR.panel.LocationFilterType.label,
-                searchOptions: {
-                    area: true,
-                    room: true,
-                    cage: false
-                }
+                getItems: function() {
+                    var toAdd = [], searchItems = [];
+                    var ctx = this.filterContext;
+
+                    toAdd.push({
+                        width: 200,
+                        html: 'Search By Location:<br>'
+                                + '<div style="width: 175px;"></div>'
+                    });
+
+                    searchItems.push({
+                        xtype: 'ehr-simplecombo',
+                        itemId: 'cageField',
+                        fieldLabel: 'Cage',
+                        name: 'cageField',
+                        value: ctx.cage,
+                        schemaName: 'ehr_lookups',
+                        queryName: 'cage',
+                        displayField: 'cage',
+                        valueField: 'location'
+
+                    })
+
+                    toAdd.push({
+                        xtype: 'panel',
+                        defaults: {
+                            border: false,
+                            width: 200,
+                            labelWidth: 90,
+                            labelAlign: 'top'
+                        },
+                        keys: [{
+                            key: Ext4.EventObject.ENTER,
+                            handler: this.tabbedReportPanel.onSubmit,
+                            scope: this.tabbedReportPanel
+                        }],
+                        items: searchItems
+                    });
+
+                    return toAdd;
+                },
+                isValid: function(){
+                    if(!this.down('#cageField').getValue()){
+                        return false;
+                    }
+
+                    return true;
+                },
+                getTitle: function(){
+                    return 'Cage: ' + this.down('#cageField').getDisplayValue();
+                },
             },{
                 xtype: 'ldk-nofiltersfiltertype',
                 inputValue: LDK.panel.NoFiltersFilterType.filterName,
diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/addClinicalObsButton.js b/nirc_ehr/resources/web/nirc_ehr/buttons/addClinicalObsButton.js
@@ -2,7 +2,7 @@
 EHR.DataEntryUtils.registerGridButton('NIRC_DAILY_CLINICAL_OBS', function(config){
     return Ext4.Object.merge({
         text: 'Daily Observations',
-        tooltip: 'Click to delete selected rows',
+        tooltip: 'Click to add daily observations',
         handler: function(btn) {
             LABKEY.Query.selectRows({
                 schemaName: 'ehr',
@@ -40,58 +40,39 @@ EHR.DataEntryUtils.registerGridButton('NIRC_DAILY_CLINICAL_OBS', function(config
 EHR.DataEntryUtils.registerGridButton('NIRC_DAILY_CLINICAL_OBS_ORDERS', function(config){
     return Ext4.Object.merge({
         text: 'Daily Observations',
-        tooltip: 'Click to delete selected rows',
+        tooltip: 'Click to add daily observation orders',
         handler: function(btn) {
+
             LABKEY.Query.selectRows({
-                schemaName: 'ehr_lookups',
-                queryName: 'treatment_frequency',
-                columns: 'rowid',
-                filterArray: [LABKEY.Filter.create('meaning', 'SID', LABKEY.Filter.Types.EQUAL)],
-                scope: this,
+                schemaName: 'ehr',
+                queryName: 'observation_types',
                 success: function (results) {
+                    var grid = btn.up('gridpanel');
                     if (results?.rows?.length > 0) {
-                        const sidRowId = results.rows[0].rowid;
-                        LABKEY.Query.selectRows({
-                            schemaName: 'ehr',
-                            queryName: 'observation_types',
-                            success: function (results) {
-                                var grid = btn.up('gridpanel');
-                                if (results?.rows?.length > 0) {
-                                    for (var i = 0; i < results.rows.length; i++) {
-                                        var row = results.rows[i];
-                                        if (row.value === 'Verified Id?' || row.value === 'Stool' || row.value === 'Activity' ||
-                                                row.value === 'Appetite' || row.value === 'Hydration' || row.value === 'BCS') {
+                        for (var i = 0; i < results.rows.length; i++) {
+                            var row = results.rows[i];
+                            if (row.value === 'Verified Id?' || row.value === 'Stool' || row.value === 'Activity' ||
+                                    row.value === 'Appetite' || row.value === 'Hydration' || row.value === 'BCS') {
 
-                                            var newRecord = grid.store.createModel({});
-                                            newRecord.set({
-                                                category: row.value,
-                                                frequency: sidRowId
-                                            });
-                                            grid.store.add(newRecord);
-                                        }
-                                    }
-                                }
-                                else {
-                                    Ext4.Msg.alert('Unable to load observation types. Please contact the system administrator.');
-                                }
-                            },
-                            failure: function (error) {
-                                Ext4.Msg.alert('Unable to load observation types. Please contact the system administrator.');
-                                console.log('Error loading observation types: ' + error);
-                            },
-                            scope: this
-                        });
+                                var newRecord = grid.store.createModel({});
+                                newRecord.set({
+                                    category: row.value,
+                                    frequency: 'SID'
+                                });
+                                grid.store.add(newRecord);
+                            }
+                        }
                     }
                     else {
-                        Ext4.Msg.alert('Unable to load treatment frequencies. Please contact the system administrator.');
+                        Ext4.Msg.alert('Unable to load observation types. Please contact the system administrator.');
                     }
                 },
                 failure: function (error) {
-                    Ext4.Msg.alert('Unable to load treatment frequencies. Please contact the system administrator.');
-                    console.log('Error loading treatment frequencies: ' + error);
-                }
+                    Ext4.Msg.alert('Unable to load observation types. Please contact the system administrator.');
+                    console.log('Error loading observation types: ' + error);
+                },
+                scope: this
             });
-
         }
     }, config);
 });
diff --git a/nirc_ehr/resources/web/nirc_ehr/buttons/treatmentSubmit.js b/nirc_ehr/resources/web/nirc_ehr/buttons/treatmentSubmit.js
@@ -15,7 +15,8 @@ EHR.DataEntryUtils.registerDataEntryFormButton('NIRC_TREATMENT_SUBMIT', {
         if (casesStore) {
             const rec = casesStore.getAt(0);
             const caseid = casesStore.getAt(0).get('caseid');
-            if (!caseid) { // only check for new cases
+            const qcstate = casesStore.getAt(0).get('qcstate/label');
+            if (!caseid || (qcstate && qcstate !== 'Completed')) { // only check for new cases or cases going from some other state to Completed
                 const id = rec.get('Id');
                 const problemCategory = rec.get('problemCategory');
                 const category = rec.get('category');
diff --git a/nirc_ehr/resources/web/nirc_ehr/model/sources/NIRCDefault.js b/nirc_ehr/resources/web/nirc_ehr/model/sources/NIRCDefault.js
@@ -66,12 +66,26 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             },
         },
         QCState: {
+            hidden: true,
+            editable: false,
+            editorConfig: {
+                hidden: true,
+                editable: false
+            },
             getInitialValue: function (v) {
                 var qc;
                 if (!v && EHR.Security.getQCStateByLabel('In Progress'))
                     qc = EHR.Security.getQCStateByLabel('In Progress').RowId;
                 return v || qc || 'In Progress';
             }
+        },
+        'qcstate/label': {
+            hidden: true,
+            editable: false,
+            editorConfig: {
+                hidden: true,
+                editable: false
+            }
         }
     },
     byQuery: {
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBaseTaskFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBaseTaskFormType.java
@@ -36,6 +36,7 @@ protected List<String> getMoreActionButtonConfigs()
     {
         List<String> configs = super.getMoreActionButtonConfigs();
         configs.remove("REVIEW");
+        configs.remove("DISCARD");
         return configs;
     }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBirthFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBirthFormType.java
@@ -9,8 +9,6 @@
 import org.labkey.nirc_ehr.dataentry.section.NIRCAnimalDetailsFormSection;
 import org.labkey.nirc_ehr.dataentry.section.NIRCBirthFormSection;
 import org.labkey.nirc_ehr.dataentry.section.NIRCBirthInstructionsFormSection;
-import org.labkey.nirc_ehr.dataentry.section.NIRCProjectAssignmentFormSection;
-import org.labkey.nirc_ehr.dataentry.section.NIRCProtocolAssignmentFormSection;
 import org.labkey.nirc_ehr.dataentry.section.NIRCTaskFormSection;
 
 import java.util.ArrayList;
@@ -49,4 +47,13 @@ protected List<String> getButtonConfigs()
 
         return defaultButtons;
     }
+
+    @Override
+    protected List<String> getMoreActionButtonConfigs()
+    {
+        List<String> configs = super.getMoreActionButtonConfigs();
+        configs.remove("REVIEW");
+        configs.remove("DISCARD");
+        return configs;
+    }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java b/nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java
@@ -678,16 +678,11 @@ public void closeDailyClinicalObs(String caseid, String enddate) throws SQLExcep
 
     public void ensureDailyClinicalObservationOrders(String id, String caseid, final Date date, String performedby, String qcstate, String taskid, List<Map<String, Object>> ordersInTransaction) throws SQLException
     {
-        TableInfo freqTi = getTableInfo("ehr_lookups", "treatment_frequency");
-        SimpleFilter filter = new SimpleFilter(FieldKey.fromString("meaning"), "SID");
-        TableSelector ts = new TableSelector(freqTi, PageFlowUtil.set("rowid"), filter, null);
-        Integer sidRowid = ts.getObject(Integer.class);
-
         TableInfo ti = getTableInfo("study", "observation_order");
-        filter = new SimpleFilter(FieldKey.fromParts("category","value"), "Activity");
+        SimpleFilter filter = new SimpleFilter(FieldKey.fromParts("category","value"), "Activity");
         filter.addCondition(FieldKey.fromString("caseid"), caseid);
-        filter.addCondition(FieldKey.fromParts("frequency"), sidRowid);
-        ts = new TableSelector(ti, PageFlowUtil.set("category","frequency"), filter, null);
+        filter.addCondition(FieldKey.fromParts("frequency"), "SID");
+        TableSelector ts = new TableSelector(ti, PageFlowUtil.set("category","frequency"), filter, null);
 
         List<String> missing = new ArrayList<>(NIRC_EHRManager.DAILY_CLINICAL_OBS);
         ts.forEach(row -> {
@@ -696,7 +691,7 @@ public void ensureDailyClinicalObservationOrders(String id, String caseid, final
         });
 
         ordersInTransaction.forEach(row -> {
-            if (row.get("category") != null && row.get("frequency") != null && row.get("frequency").equals(sidRowid))
+            if (row.get("category") != null && row.get("frequency") != null && row.get("frequency").equals("SID"))
                 missing.remove((String)row.get("category"));
         });
 
@@ -722,7 +717,7 @@ public void ensureDailyClinicalObservationOrders(String id, String caseid, final
                 {
                     Map<String, Object> row = new CaseInsensitiveHashMap<>();
                     row.put("category", category);
-                    row.put("frequency", sidRowid);
+                    row.put("frequency", "SID");
                     row.put("caseid", caseid);
                     row.put("date", obsDate);
                     row.put("Id", id);
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/table/NIRC_EHRCustomizer.java b/nirc_ehr/src/org/labkey/nirc_ehr/table/NIRC_EHRCustomizer.java
@@ -220,20 +220,7 @@ private void customizeCases(AbstractTableInfo ti)
         if (null == ti.getColumn("objectid") || null == ti.getColumn("lsid") || null == ti.getColumn("enddate"))
             return;
 
-        String isActive = "isActive";
-        ColumnInfo isActiveCol = ti.getColumn(isActive);
-        if (isActiveCol != null)
-        {
-            ti.removeColumn(isActiveCol);
-        }
-
-        SQLFragment sql = new SQLFragment("(CASE " +
-                " WHEN (" + ExprColumn.STR_TABLE_ALIAS + ".lsid) IS NULL THEN " + ti.getSqlDialect().getBooleanFALSE() +
-                " WHEN (" + ExprColumn.STR_TABLE_ALIAS + ".enddate IS NOT NULL AND " + ExprColumn.STR_TABLE_ALIAS + ".enddate <= {fn curdate()}) THEN " + ti.getSqlDialect().getBooleanFALSE() +
-                " ELSE " + ti.getSqlDialect().getBooleanTRUE() + " END)");
-        ExprColumn newCol = new ExprColumn(ti, isActive, sql, JdbcType.BOOLEAN, ti.getColumn("lsid"), ti.getColumn("enddate"));
-        newCol.setLabel("Is Active?");
-        ti.addColumn(newCol);
+        EHRService.get().addIsActiveCol(ti, false, EHRService.EndingOption.activeAfterMidnightTonight, EHRService.EndingOption.activeAfterMidnightTonight);
 
         String isOpen = "isOpen";
         if (ti.getColumn(isOpen) == null)
