Merge 24.3 to 24.7

Author: labkey-teamcity

ehr/resources/web/ehr/panel/BloodSummaryPanel.js

@@ -309,6 +309,16 @@ Ext4.define('EHR.panel.BloodSummaryPanel', {
             return text;
         });
     },
+    getMaxBloodAvailValue: function(allowableBloodVals){
+        var maxVal = Math.max(...allowableBloodVals);
+        var tenPercent = maxVal * .10;
+        return maxVal + tenPercent;
+    },
+    getMinBloodAvailValue: function(allowableBloodVals){
+        var minVal = Math.min(...allowableBloodVals);
+        var tenPercent = minVal * .10;
+        return minVal < 0 ? minVal + tenPercent : 0;
+    },
 
     getTickValues: function(rows){
         var ticks = [], msPerDay = 86400000, totalTicks = 10;
@@ -385,12 +395,18 @@ Ext4.define('EHR.panel.BloodSummaryPanel', {
                 html: '<p>Total volume of blood collected in the past ' + currentRow.blood_draw_interval.value + ' days: <b>'
                     + Ext4.util.Format.round(currentRow.bloodPrevious.value, 1) + ' mL</b>. '
                     + 'The amount of blood available if drawn today is: <b>' + Ext4.util.Format.round(currentRow.allowableDisplay.value, 1) + ' mL</b>.</p>'
-                    + '<p>The graph below shows how the amount of blood available will change over time, including when previous draws will drop off.</p>',
+                    + '<p>The graph below shows how the amount of blood available will change over time, including when previous draws will drop off. Hover over the timepoints for more information.</p>',
                 border: false,
                 style: 'margin-bottom: 20px'
             });
         }
 
+        //for use later when getting max/min vals for y-axis scale
+        var allowableBloodVals = [];
+        for (var i = 0; i < results.rows.length; i++){
+            allowableBloodVals.push(results.rows[i].allowableDisplay.value);
+        }
+
         var layerName = "Volume";
         toAdd.push({
             xtype: 'container',
@@ -426,6 +442,9 @@ Ext4.define('EHR.panel.BloodSummaryPanel', {
                         },
                         x: {
                             tickValues: this.getTickValues(results.rows)
+                        },
+                        y: {
+                            domain: [this.getMinBloodAvailValue(allowableBloodVals), this.getMaxBloodAvailValue(allowableBloodVals)],
                         }
                     },
                     layers: [{
@@ -455,7 +474,18 @@ Ext4.define('EHR.panel.BloodSummaryPanel', {
                 },
                 getPlotConfig: function(){
                     var cfg = LDK.panel.GraphPanel.prototype.getPlotConfig.call(this);
-                    cfg.legendPos = 'none';
+                    cfg.legendData = [
+                        {
+                            color:'#FC8D62',
+                            text:'Blood Draw',
+                            shape: LABKEY.vis.Scale.Shape()[1]
+                        },
+                        {
+                            color:'#66C2A5',
+                            text:'Reconstitution Status',
+                            shape: LABKEY.vis.Scale.Shape()[0]
+                        }
+                    ]
                     cfg.aes.color = null;
                     cfg.aes.shape = null;
 

ehr/src/org/labkey/ehr/EHRController.java

@@ -40,6 +40,7 @@
 import org.labkey.api.data.JsonWriter;
 import org.labkey.api.data.RuntimeSQLException;
 import org.labkey.api.data.SimpleFilter;
+import org.labkey.api.data.Sort;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.dataiterator.DataIteratorContext;
@@ -2191,7 +2192,7 @@ public ApiResponse execute(IdForm idForm, BindException errors)
             SimpleFilter filter = new SimpleFilter();
             filter.addCondition(FieldKey.fromParts("id"), idForm.getIdList(), CompareType.IN);
 
-            TableSelector selector = new TableSelector(bloodDrawsTable, filter, null);
+            TableSelector selector = new TableSelector(bloodDrawsTable, filter, new Sort("date"));
 
             Map<String, Object> params = new HashMap<>();
             params.put("DATE_INTERVAL", idForm.getInterval());