Merge 24.7 to 24.11

Author: labkey-teamcity

ehr/api-src/org/labkey/api/ehr/buttons/MarkCompletedButton.java

@@ -85,7 +85,7 @@ protected String getJsHandler(TableInfo ti)
         // but the dataset-specific query.xml file will apply a different format to the enddate column.  as a result, defer creating the JS handler as long as we can.
         ColumnInfo col = ti.getColumn("enddate");
         String xtype = "datefield";
-        if (!_forceDateOnlyField && col != null && col.getFormat() != null && col.getFormat().contains("HH"))
+        if (!_forceDateOnlyField && col != null && col.getFormat() != null && (col.getFormat().contains("HH") || col.getFormat().equals("DateTime")))
             xtype = "xdatetime";
 
         String pkColName = null;

ehr/resources/web/ehr/DataEntryUtils.js

@@ -669,7 +669,6 @@ EHR.DataEntryUtils = new function(){
             if (EHR._observationTypesStore)
                 return EHR._observationTypesStore;
 
-            //TODO: this really belongs in ONPRC_EHR module, not here.  We should also move ClinicalObservationsGrid/EditingPlugin as well
             EHR._observationTypesStore = Ext4.create('LABKEY.ext4.data.Store', {
                 type: 'labkey-store',
                 schemaName: 'ehr',

ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsImportTask.java

@@ -144,7 +144,7 @@ public RecordedActionSet run() throws PipelineJobException
         int hourOfDay = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
         if (!"true".equals(paramVal) && hourOfDay >= 7 && hourOfDay <= 19)
         {
-            throw new PipelineJobException("The genetics import task should only run outside of business hours.  Either wait for the next scheduled job or retry this task before 7AM or after 6PM.  You can also run this manually from the EHR admin page.");
+            throw new PipelineJobException("The genetics import task should only run outside of business hours.  Either wait for the next scheduled job or retry this task before 7AM or after 8PM.  You can also run this manually from the EHR admin page.");
         }
         else
         {