From 8699104979de89ccbf114b068cdea1ddaf870993 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:04:58 -0400
Subject: [PATCH] Add time display picker (Local/UTC/Server) and parameterize
 SQL

- Time display ComboBox on QS grid toolbar: Local, UTC, Server modes
- TimeDisplayHelper shared across grid, slicer, and history window
- Server UTC offset fetched on connect via DATEDIFF(MINUTE, GETUTCDATE(), GETDATE())
- All timestamps update live when switching modes
- Parameterized hoursBack and daysBack in QueryStoreService SQL queries

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../Controls/QuerySessionControl.axaml.cs     | 17 +++++++
 .../Controls/QueryStoreGridControl.axaml      |  9 ++++
 .../Controls/QueryStoreGridControl.axaml.cs   | 28 +++++++++++-
 .../Controls/TimeRangeSlicerControl.axaml.cs  |  9 ++--
 .../Dialogs/QueryStoreHistoryWindow.axaml.cs  |  6 +--
 .../Models/QueryStoreHistoryRow.cs            |  5 ++-
 .../Services/QueryStoreService.cs             | 10 +++--
 .../Services/TimeDisplayHelper.cs             | 45 +++++++++++++++++++
 8 files changed, 115 insertions(+), 14 deletions(-)
 create mode 100644 src/PlanViewer.Core/Services/TimeDisplayHelper.cs

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 3cb0528..2764dc9 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -362,6 +362,7 @@ private async Task ShowConnectionDialogAsync()
 
             await PopulateDatabases();
             await FetchServerMetadataAsync();
+            await FetchServerUtcOffset();
 
             if (_selectedDatabase != null)
             {
@@ -439,6 +440,22 @@ private async Task FetchServerMetadataAsync()
         }
     }
 
+    private async Task FetchServerUtcOffset()
+    {
+        if (_connectionString == null) return;
+        try
+        {
+            await using var conn = new SqlConnection(_connectionString);
+            await conn.OpenAsync();
+            await using var cmd = new SqlCommand(
+                "SELECT DATEDIFF(MINUTE, GETUTCDATE(), GETDATE())", conn);
+            var offset = await cmd.ExecuteScalarAsync();
+            if (offset is int mins)
+                PlanViewer.Core.Services.TimeDisplayHelper.ServerUtcOffsetMinutes = mins;
+        }
+        catch { }
+    }
+
     private async Task FetchDatabaseMetadataAsync()
     {
         if (_connectionString == null || _serverMetadata == null) return;
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index bff0fb5..697ad74 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -67,6 +67,15 @@
                              Watermark="0x1AB2C3, dbo.MyProc"
                              KeyDown="SearchValue_KeyDown"/>
                 </StackPanel>
+                <StackPanel Spacing="4">
+                    <TextBlock Text="Time display" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
+                    <ComboBox x:Name="TimeDisplayBox" Width="100" Height="36" FontSize="13"
+                              SelectedIndex="0" SelectionChanged="TimeDisplay_SelectionChanged">
+                        <ComboBoxItem Content="Local" Tag="Local"/>
+                        <ComboBoxItem Content="UTC" Tag="Utc"/>
+                        <ComboBoxItem Content="Server" Tag="Server"/>
+                    </ComboBox>
+                </StackPanel>
                 <StackPanel Spacing="2" VerticalAlignment="Center">
                     <Button x:Name="FetchButton" Content="Fetch" Click="Fetch_Click"
                             Height="28" Padding="16,0" FontSize="12"
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index 7240088..e6b6b3c 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -299,6 +299,29 @@ private async void OrderBy_SelectionChanged(object? sender, SelectionChangedEven
         }
     }
 
+    private void TimeDisplay_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (!IsInitialized) return;
+        var tag = (TimeDisplayBox.SelectedItem as ComboBoxItem)?.Tag?.ToString();
+        if (tag == null) return;
+        TimeDisplayHelper.Current = tag switch
+        {
+            "Utc" => TimeDisplayMode.Utc,
+            "Server" => TimeDisplayMode.Server,
+            _ => TimeDisplayMode.Local
+        };
+        // Refresh grid display
+        if (_filteredRows.Count > 0)
+        {
+            foreach (var row in _filteredRows)
+                row.NotifyTimeDisplayChanged();
+            ResultsGrid.ItemsSource = null;
+            ResultsGrid.ItemsSource = _filteredRows;
+        }
+        // Refresh slicer labels
+        TimeRangeSlicer.Redraw();
+    }
+
     private void ClearSearch_Click(object? sender, RoutedEventArgs e)
     {
         SearchTypeBox.SelectedIndex = 0;
@@ -943,7 +966,10 @@ public void SetBar(string columnId, double ratio, bool isSorted)
     public long TotalMemSort => Plan.TotalMemoryGrantPages;
     public double AvgMemSort => Plan.AvgMemoryGrantPages;
 
-    public string LastExecutedLocal => Plan.LastExecutedUtc.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
+    public string LastExecutedLocal => TimeDisplayHelper.FormatForDisplay(Plan.LastExecutedUtc);
+
+    public void NotifyTimeDisplayChanged() => OnPropertyChanged(nameof(LastExecutedLocal));
+
     public string QueryPreview => Plan.QueryText.Length > 80
         ? Plan.QueryText[..80].Replace("\n", " ").Replace("\r", "") + "..."
         : Plan.QueryText.Replace("\n", " ").Replace("\r", "");
diff --git a/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs b/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs
index eb3a3f3..ca0d453 100644
--- a/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs
@@ -8,6 +8,7 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using PlanViewer.Core.Models;
+using PlanViewer.Core.Services;
 
 namespace PlanViewer.App.Controls;
 
@@ -167,7 +168,7 @@ private string GetMetricLabel()
 
     // ── Drawing ────────────────────────────────────────────────────────────
 
-    private void Redraw()
+    public void Redraw()
     {
         SlicerCanvas.Children.Clear();
         if (_data.Count < 2) return;
@@ -238,7 +239,7 @@ private void Redraw()
         for (int i = 0; i < n; i += labelInterval)
         {
             var x = i * stepX + stepX / 2;
-            var dt = _data[i].IntervalStartUtc.ToLocalTime();
+            var dt = TimeDisplayHelper.ConvertForDisplay(_data[i].IntervalStartUtc);
             var label = dt.ToString("MM/dd HH:mm");
             var tb = new TextBlock
             {
@@ -531,8 +532,8 @@ private void UpdateRangeLabel()
             RangeLabel.Text = "";
             return;
         }
-        var start = GetDateTimeAtNorm(_rangeStart).ToLocalTime();
-        var end = GetDateTimeAtNorm(_rangeEnd).ToLocalTime();
+        var start = TimeDisplayHelper.ConvertForDisplay(GetDateTimeAtNorm(_rangeStart));
+        var end = TimeDisplayHelper.ConvertForDisplay(GetDateTimeAtNorm(_rangeEnd));
         var span = end - start;
         RangeLabel.Text = $"{start:yyyy-MM-dd HH:mm} → {end:yyyy-MM-dd HH:mm}  ({span.TotalHours:F0}h)";
     }
diff --git a/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml.cs b/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml.cs
index 39c2361..f3b51af 100644
--- a/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml.cs
@@ -107,8 +107,8 @@ private async System.Threading.Tasks.Task LoadHistoryAsync()
             {
                 var planCount = _historyData.Select(r => r.PlanId).Distinct().Count();
                 var totalExec = _historyData.Sum(r => r.CountExecutions);
-                var first = _historyData.Min(r => r.IntervalStartUtc).ToLocalTime();
-                var last = _historyData.Max(r => r.IntervalStartUtc).ToLocalTime();
+                var first = TimeDisplayHelper.ConvertForDisplay(_historyData.Min(r => r.IntervalStartUtc));
+                var last = TimeDisplayHelper.ConvertForDisplay(_historyData.Max(r => r.IntervalStartUtc));
                 StatusText.Text = $"{_historyData.Count} intervals, {planCount} plan(s), " +
                                   $"{totalExec:N0} total executions | " +
                                   $"{first:MM/dd HH:mm} to {last:MM/dd HH:mm}";
@@ -158,7 +158,7 @@ private void UpdateChart()
         foreach (var group in planGroups)
         {
             var ordered = group.OrderBy(r => r.IntervalStartUtc).ToList();
-            var xs = ordered.Select(r => r.IntervalStartUtc.ToLocalTime().ToOADate()).ToArray();
+            var xs = ordered.Select(r => TimeDisplayHelper.ConvertForDisplay(r.IntervalStartUtc).ToOADate()).ToArray();
             var ys = ordered.Select(r => GetMetricValue(r, tag)).ToArray();
 
             var scatter = HistoryChart.Plot.Add.Scatter(xs, ys);
diff --git a/src/PlanViewer.Core/Models/QueryStoreHistoryRow.cs b/src/PlanViewer.Core/Models/QueryStoreHistoryRow.cs
index f2b691f..b38c6ba 100644
--- a/src/PlanViewer.Core/Models/QueryStoreHistoryRow.cs
+++ b/src/PlanViewer.Core/Models/QueryStoreHistoryRow.cs
@@ -1,4 +1,5 @@
 using System;
+using PlanViewer.Core.Services;
 
 namespace PlanViewer.Core.Models;
 
@@ -27,6 +28,6 @@ public class QueryStoreHistoryRow
     public int MaxDop { get; set; }
     public DateTime? LastExecutionUtc { get; set; }
 
-    public string IntervalStartLocal => IntervalStartUtc.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
-    public string LastExecutionLocal => LastExecutionUtc?.ToLocalTime().ToString("yyyy-MM-dd HH:mm") ?? "";
+    public string IntervalStartLocal => TimeDisplayHelper.FormatForDisplay(IntervalStartUtc);
+    public string LastExecutionLocal => LastExecutionUtc.HasValue ? TimeDisplayHelper.FormatForDisplay(LastExecutionUtc.Value) : "";
 }
diff --git a/src/PlanViewer.Core/Services/QueryStoreService.cs b/src/PlanViewer.Core/Services/QueryStoreService.cs
index 0420fbe..1f59c07 100644
--- a/src/PlanViewer.Core/Services/QueryStoreService.cs
+++ b/src/PlanViewer.Core/Services/QueryStoreService.cs
@@ -139,7 +139,8 @@ public static async Task<List<QueryStorePlan>> FetchTopPlansAsync(
         }
         else
         {
-            timeWhereClause = $"WHERE rs.last_execution_time >= DATEADD(HOUR, -{hoursBack}, GETUTCDATE())";
+            timeWhereClause = "WHERE rs.last_execution_time >= DATEADD(HOUR, -@hoursBack, GETUTCDATE())";
+            parameters.Add(new SqlParameter("@hoursBack", hoursBack));
         }
 
         // 1. plan_agg: aggregate runtime_stats by plan_id only (cheapest grouping,
@@ -374,7 +375,7 @@ public static async Task<List<QueryStoreTimeSlice>> FetchTimeSliceDataAsync(
         int daysBack = 30,
         CancellationToken ct = default)
     {
-        var sql = $@"
+        var sql = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
 SELECT
@@ -389,8 +390,8 @@ public static async Task<List<QueryStoreTimeSlice>> FetchTimeSliceDataAsync(
 FROM sys.query_store_runtime_stats rs
 JOIN sys.query_store_runtime_stats_interval rsi
     ON rs.runtime_stats_interval_id = rsi.runtime_stats_interval_id
-WHERE rsi.start_time >= DATEADD(DAY, -{daysBack}, GETUTCDATE())
-AND   rs.first_execution_time >= DATEADD(DAY, -{daysBack}, GETUTCDATE()) --performance: filter runtime_stats directly
+WHERE rsi.start_time >= DATEADD(DAY, -@daysBack, GETUTCDATE())
+AND   rs.first_execution_time >= DATEADD(DAY, -@daysBack, GETUTCDATE()) --performance: filter runtime_stats directly
 GROUP BY DATEADD(HOUR, DATEDIFF(HOUR, 0, rsi.start_time), 0)
 ORDER BY bucket_hour DESC;";
 
@@ -399,6 +400,7 @@ GROUP BY DATEADD(HOUR, DATEDIFF(HOUR, 0, rsi.start_time), 0)
         await using var conn = new SqlConnection(connectionString);
         await conn.OpenAsync(ct);
         await using var cmd = new SqlCommand(sql, conn) { CommandTimeout = 120 };
+        cmd.Parameters.Add(new SqlParameter("@daysBack", daysBack));
         await using var reader = await cmd.ExecuteReaderAsync(ct);
 
         while (await reader.ReadAsync(ct))
diff --git a/src/PlanViewer.Core/Services/TimeDisplayHelper.cs b/src/PlanViewer.Core/Services/TimeDisplayHelper.cs
new file mode 100644
index 0000000..b5dd608
--- /dev/null
+++ b/src/PlanViewer.Core/Services/TimeDisplayHelper.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace PlanViewer.Core.Services;
+
+public enum TimeDisplayMode
+{
+    Local,
+    Utc,
+    Server
+}
+
+public static class TimeDisplayHelper
+{
+    public static TimeDisplayMode Current { get; set; } = TimeDisplayMode.Local;
+
+    /// <summary>
+    /// Offset in minutes from UTC to the connected SQL Server's local time.
+    /// Set after connecting to a server.
+    /// </summary>
+    public static int ServerUtcOffsetMinutes { get; set; }
+
+    public static DateTime ConvertForDisplay(DateTime utcTime)
+    {
+        return Current switch
+        {
+            TimeDisplayMode.Local => utcTime.ToLocalTime(),
+            TimeDisplayMode.Utc => DateTime.SpecifyKind(utcTime, DateTimeKind.Utc),
+            TimeDisplayMode.Server => utcTime.AddMinutes(ServerUtcOffsetMinutes),
+            _ => utcTime.ToLocalTime()
+        };
+    }
+
+    public static string FormatForDisplay(DateTime utcTime, string format = "yyyy-MM-dd HH:mm")
+    {
+        return ConvertForDisplay(utcTime).ToString(format);
+    }
+
+    public static string Suffix => Current switch
+    {
+        TimeDisplayMode.Local => "",
+        TimeDisplayMode.Utc => " (UTC)",
+        TimeDisplayMode.Server => " (Server)",
+        _ => ""
+    };
+}