Skip to content

Removing obsolete code that was hitting a deleted table #7688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-klum wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Removing obsolete code that was hitting a deleted table #7688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17795e0
Removing obsolete code that was hitting the non-existant Visualizatio…
labkey-klum May 22, 2026
4478f11
Merge branch 'develop' into fb_visualizationSQLGenerator_clean_up
labkey-klum May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions api/src/org/labkey/api/visualization/VisDataRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
10 changes: 0 additions & 10 deletions api/src/org/labkey/api/visualization/VisualizationSourceColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion visualization/src/org/labkey/visualization/VisualizationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
16 changes: 1 addition & 15 deletions visualization/src/org/labkey/visualization/sql/VisualizationSQLGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down