From 17795e0e8ba8a2042defa308e809fe2a7d1e34ab Mon Sep 17 00:00:00 2001
From: lum <klum@labkey.com>
Date: Fri, 22 May 2026 11:55:48 -0700
Subject: [PATCH] Removing obsolete code that was hitting the non-existant
 VisualizationVisitTag table.

---
 .../api/visualization/VisDataRequest.java     | 19 -------------------
 .../VisualizationSourceColumn.java            | 10 ----------
 .../VisualizationController.java              |  1 -
 .../sql/VisualizationSQLGenerator.java        | 16 +---------------
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/api/src/org/labkey/api/visualization/VisDataRequest.java b/api/src/org/labkey/api/visualization/VisDataRequest.java
index 0d9e9d8b8c9..02a2de99f31 100644
--- a/api/src/org/labkey/api/visualization/VisDataRequest.java
+++ b/api/src/org/labkey/api/visualization/VisDataRequest.java
@@ -476,8 +476,6 @@ public static class DateOptions
         String interval;
         Measure dateCol;
         Measure zeroDateCol;
-        String zeroDayVisitTag;
-        boolean isZeroDayVisitTagSet=false;  // for json compatibility
         boolean useProtocolDay=true;
         String altQueryName;
 
@@ -514,23 +512,6 @@ public DateOptions setZeroDateCol(Measure zeroDateCol)
             return this;
         }
 
-        public String getZeroDayVisitTag()
-        {
-            return zeroDayVisitTag;
-        }
-
-        public DateOptions setZeroDayVisitTag(String zeroDayVisitTag)
-        {
-            this.isZeroDayVisitTagSet = true;
-            this.zeroDayVisitTag = zeroDayVisitTag;
-            return this;
-        }
-
-        public boolean isZeroDayVisitTagSet()
-        {
-            return isZeroDayVisitTagSet;
-        }
-
         public boolean isUseProtocolDay()
         {
             return useProtocolDay;
diff --git a/api/src/org/labkey/api/visualization/VisualizationSourceColumn.java b/api/src/org/labkey/api/visualization/VisualizationSourceColumn.java
index 977f55753e3..c4811ed0e63 100644
--- a/api/src/org/labkey/api/visualization/VisualizationSourceColumn.java
+++ b/api/src/org/labkey/api/visualization/VisualizationSourceColumn.java
@@ -135,16 +135,6 @@ public VisualizationSourceColumn create(ViewContext context, VisDataRequest.Meas
             return findOrAdd(col);
         }
 
-        public VisualizationSourceColumn create(UserSchema schema, String queryName, String name, Boolean allowNullResults, VisDataRequest.DateOptions dateOptions)
-        {
-            String encodedQueryName = queryName + "-" + (dateOptions.isUseProtocolDay() ? "true" : "false") + "-" + dateOptions.getZeroDayVisitTag();
-            if (dateOptions.getAltQueryName() != null)
-                encodedQueryName += "-" + dateOptions.getAltQueryName();
-
-            VisualizationSourceColumn col = new VisualizationSourceColumn(schema, encodedQueryName, name, allowNullResults, false);
-            return findOrAdd(col);
-        }
-
         public VisualizationSourceColumn getByAlias(String alias)
         {
             return _aliasMap.get(alias);
diff --git a/visualization/src/org/labkey/visualization/VisualizationController.java b/visualization/src/org/labkey/visualization/VisualizationController.java
index 22a566ce07e..897434d0b1f 100644
--- a/visualization/src/org/labkey/visualization/VisualizationController.java
+++ b/visualization/src/org/labkey/visualization/VisualizationController.java
@@ -1732,7 +1732,6 @@ public void testJacksonBinding() throws Exception
             assertEquals("day",dopt.getInterval());
             assertEquals("visitday", dopt.getDateCol().getName());
             assertEquals("enrolldate", dopt.getZeroDateCol().getName());
-            assertEquals("ZERO", dopt.getZeroDayVisitTag());
             assertFalse(dopt.isUseProtocolDay());
             assertEquals(0,mi.getFilterArray().size());
             assertEquals(1, vs.getSorts().size());
diff --git a/visualization/src/org/labkey/visualization/sql/VisualizationSQLGenerator.java b/visualization/src/org/labkey/visualization/sql/VisualizationSQLGenerator.java
index dd7d491082d..27ad6f12bd8 100644
--- a/visualization/src/org/labkey/visualization/sql/VisualizationSQLGenerator.java
+++ b/visualization/src/org/labkey/visualization/sql/VisualizationSQLGenerator.java
@@ -241,23 +241,9 @@ else if ("visit".equalsIgnoreCase(timeAxis))
 
                                 newInterval = new VisualizationIntervalColumn(zeroDateCol, dateCol, interval, false);
                             }
-                            else if (dateOptions.isZeroDayVisitTagSet())
-                            {
-                                VisualizationSourceColumn zeroDayCol = null;
-                                boolean useProtocolDay = dateOptions.isUseProtocolDay();
-
-                                //  Issue 20459: handle 'Unaligned' (i.e. null zero day) case for calculating weeks/months
-                                if (null != dateOptions.getZeroDayVisitTag())
-                                {
-                                    zeroDayCol = _columnFactory.create(getPrimarySchema(), "VisualizationVisitTag", "ZeroDay", false, dateOptions);
-                                    ensureSourceQuery(_viewContext.getContainer(), zeroDayCol, query).addSelect(zeroDayCol, false);
-                                }
-
-                                newInterval = new VisualizationIntervalColumn(zeroDayCol, measureCol, interval, true);
-                            }
                             else
                             {
-                                throw new IllegalArgumentException("The 'zeroDayVisitTag' property or the 'dateCol' and 'zeroDateCol' properties are required.");
+                                throw new IllegalArgumentException("Either 'dateCol' or 'zeroDateCol' must be specified for date-based charts");
                             }
 
                             if (interval != null)