From afc83e5360f86c24bb6a3ac147e8eb89106b9968 Mon Sep 17 00:00:00 2001
From: bbimber <bbimber@gmail.com>
Date: Wed, 25 Jun 2025 06:28:18 -0700
Subject: [PATCH] Refactor TabbedReport to allow a distributed provider model

---
 .../resources/queries/study/chemistryPivot.query.xml       | 2 +-
 .../resources/queries/study/hematologyPivot.query.xml      | 2 +-
 .../org/labkey/sivstudies/query/SivStudiesCustomizer.java  | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/SivStudies/resources/queries/study/chemistryPivot.query.xml b/SivStudies/resources/queries/study/chemistryPivot.query.xml
index 4146eac0..92c8a738 100644
--- a/SivStudies/resources/queries/study/chemistryPivot.query.xml
+++ b/SivStudies/resources/queries/study/chemistryPivot.query.xml
@@ -3,7 +3,7 @@
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="chemistryPivot" tableDbType="TABLE">
                 <tableTitle>Chemistry Results</tableTitle>
-
+                <javaCustomizer class="org.labkey.sivstudies.query.SivStudiesCustomizer"/>
                 <columns>
                     <column columnName="Id">
                         <conceptURI>http://cpas.labkey.com/Study#ParticipantId</conceptURI>
diff --git a/SivStudies/resources/queries/study/hematologyPivot.query.xml b/SivStudies/resources/queries/study/hematologyPivot.query.xml
index 7daa8ac3..92d4b22f 100644
--- a/SivStudies/resources/queries/study/hematologyPivot.query.xml
+++ b/SivStudies/resources/queries/study/hematologyPivot.query.xml
@@ -3,7 +3,7 @@
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="hematologyPivot" tableDbType="TABLE">
                 <tableTitle>Hematology Results</tableTitle>
-
+                <javaCustomizer class="org.labkey.sivstudies.query.SivStudiesCustomizer"/>
                 <columns>
                     <column columnName="Id">
                         <conceptURI>http://cpas.labkey.com/Study#ParticipantId</conceptURI>
diff --git a/SivStudies/src/org/labkey/sivstudies/query/SivStudiesCustomizer.java b/SivStudies/src/org/labkey/sivstudies/query/SivStudiesCustomizer.java
index 44f4cfd8..43841a6e 100644
--- a/SivStudies/src/org/labkey/sivstudies/query/SivStudiesCustomizer.java
+++ b/SivStudies/src/org/labkey/sivstudies/query/SivStudiesCustomizer.java
@@ -43,6 +43,13 @@ public void customize(TableInfo tableInfo)
         {
             performDatasetCustomization(ds);
         }
+        else if ("chemistryPivot".equalsIgnoreCase(tableInfo.getName()) | "hematologyPivot".equalsIgnoreCase(tableInfo.getName()))
+        {
+            if (tableInfo instanceof AbstractTableInfo ati)
+            {
+                appendDemographicsColumns(ati);
+            }
+        }
     }
 
     public void performDatasetCustomization(DatasetTable ds)