Option to make x-axis calendar-scaled

src/org/labkey/targetedms/TargetedMSController.java

@@ -817,6 +817,7 @@ public static class LeveyJenningsPlotOptions
         private String _metric2;
         private String _yAxisScale;
         private Boolean _groupedX;
+        private Boolean _calendarX;
         private Boolean _singlePlot;
         private Boolean _showExcluded;
         private Boolean _showExcludedPrecursors;
@@ -842,6 +843,8 @@ public Map<String, String> getAsMapOfStrings()
                 valueMap.put("yAxisScale", _yAxisScale);
             if (_groupedX != null)
                 valueMap.put("groupedX", Boolean.toString(_groupedX));
+            if (_calendarX != null)
+                valueMap.put("calendarX", Boolean.toString(_calendarX));
             if (_singlePlot != null)
                 valueMap.put("singlePlot", Boolean.toString(_singlePlot));
             if (_showExcluded != null)
@@ -888,6 +891,11 @@ public void setGroupedX(Boolean groupedX)
             _groupedX = groupedX;
         }
 
+        public void setCalendarX(Boolean calendarX)
+        {
+            _calendarX = calendarX;
+        }
+
         public void setSinglePlot(Boolean singlePlot)
         {
             _singlePlot = singlePlot;

test/src/org/labkey/test/components/targetedms/QCPlotsWebPart.java

@@ -270,6 +270,30 @@ public boolean isGroupXAxisValuesByDateChecked()
         }
     }
 
+    public void setGroupXAxisValuesByCalendar(boolean check)
+    {
+        if (isGroupXAxisValuesByCalendarChecked() != check)
+        {
+            if (check)
+                doAndWaitForUpdate(() -> elementCache().xAxisGroupingCalendarRadio.check());
+            else
+                doAndWaitForUpdate(() -> elementCache().xAxisGroupingReplicateRadio.check());
+        }
+    }
+
+    public boolean isGroupXAxisValuesByCalendarChecked()
+    {
+        try
+        {
+            return elementCache().xAxisGroupingCalendarRadio.isSelected();
+        }
+        catch (NoSuchElementException | StaleElementReferenceException e)
+        {
+            // Fallback: if radios are not present yet, assume unchecked
+            return false;
+        }
+    }
+
     public void setShowAllPeptidesInSinglePlot(boolean check)
     {
         // 'check' means show all series combined in a single plot
@@ -918,6 +942,7 @@ public class Elements extends BodyWebPart<?>.ElementCache
 
         RadioButton xAxisGroupingReplicateRadio = new RadioButton.RadioButtonFinder().withLabel("per replicate").findWhenNeeded(getDriver());
         RadioButton xAxisGroupingDateRadio = new RadioButton.RadioButtonFinder().withLabel("per date").findWhenNeeded(getDriver());
+        RadioButton xAxisGroupingCalendarRadio = new RadioButton.RadioButtonFinder().withLabel("calendar").findWhenNeeded(getDriver());
 
         RadioButton plotsCombinedRadio = new RadioButton.RadioButtonFinder().withLabel("combined").findWhenNeeded(getDriver());
         RadioButton plotsPerPrecursorRadio = new RadioButton.RadioButtonFinder().withLabel("per precursor").findWhenNeeded(getDriver());

test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java

@@ -307,6 +307,12 @@ public void testQCPlotInputs()
         assertNotEquals(initialSVGText, qcPlotsWebPart.getSVGPlotText("precursorPlot0"));
         qcPlotsWebPart.setGroupXAxisValuesByDate(false);
 
+        // test option to group X-Axis values by Calendar (time-scaled date axis)
+        initialSVGText = qcPlotsWebPart.getSVGPlotText("precursorPlot0");
+        qcPlotsWebPart.setGroupXAxisValuesByCalendar(true);
+        assertNotEquals(initialSVGText, qcPlotsWebPart.getSVGPlotText("precursorPlot0"));
+        qcPlotsWebPart.setGroupXAxisValuesByCalendar(false);
+
         // test that plot0 changes based on scale
         for (QCPlotsWebPart.Scale scale : QCPlotsWebPart.Scale.values())
         {
@@ -410,6 +416,13 @@ public void testQCPlotInputsPersistence()
         goToProjectHome();
         qcPlotsWebPart = qcDashboard.getQcPlotsWebPart();
 
+        // verify the Calendar X-axis grouping option also round-trips on refresh
+        qcPlotsWebPart.setGroupXAxisValuesByCalendar(true);
+        refresh();
+        qcPlotsWebPart = qcDashboard.getQcPlotsWebPart();
+        qcPlotsWebPart.waitForPlots(2);
+        assertTrue("Calendar X-Axis grouping not round tripped as expected", qcPlotsWebPart.isGroupXAxisValuesByCalendarChecked());
+
         // reset plot type selection
         qcPlotsWebPart.resetInitialQCPlotFields();
     }

webapp/TargetedMS/js/QCPlotHelperBase.js

@@ -781,6 +781,7 @@ Ext4.define("LABKEY.targetedms.QCPlotHelperBase", {
             mouseOutFn: this.plotPointMouseOut,
             mouseOutFnScope: this,
             position: this.groupedX ? 'sequential' : undefined,
+            timeBasedXTick: this.calendarX === true,
             legendMouseOverFn: this.legendMouseOver,
             legendMouseOverFnScope: this,
             legendMouseOutFn: this.plotPointMouseOut,
@@ -931,6 +932,7 @@ Ext4.define("LABKEY.targetedms.QCPlotHelperBase", {
             mouseOverFn: this.plotPointMouseOver,
             mouseOverFnScope: this,
             position: this.groupedX ? 'sequential' : undefined,
+            timeBasedXTick: this.calendarX === true,
             disableRangeDisplay: this.isMultiSeries(),
             hoverTextFn: !showDataPoints ? function() { return 'Narrow the date range to show individual data points.' } : undefined,
             hideSDLines: true,