From 72ddf71e3aa62d29483fe027be0f0124031c6fbc Mon Sep 17 00:00:00 2001
From: aschmidt34 <aschmidt34@wisc.edu>
Date: Tue, 11 Aug 2026 15:43:29 -0500
Subject: [PATCH 1/3] datasets_manifest.xml: Added 'anesthesiaRecovery' dataset
 to the list to fix TeamCity 'WNPRC_EHRTest' issue. datasets_metadata.xml:
 Added 'anesthesiaRecovery column data to the list to fix TeamCity
 'WNPRC_EHRTest' issue. wnprc_ios_appModule.java: Incremented version number
 so upgrade script executes correctly to fix TeamCity 'SchemaXMLTestCase'
 issue.

---
 .../study/datasets/datasets_manifest.xml      |   3 +
 .../study/datasets/datasets_metadata.xml      | 113 ++++++++++++++++++
 .../wnprc_ios_app/wnprc_ios_appModule.java    |   2 +-
 3 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_manifest.xml b/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_manifest.xml
index af54a8e9d..06e96046e 100644
--- a/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_manifest.xml
+++ b/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_manifest.xml
@@ -232,5 +232,8 @@
     <dataset name="cases" id="6020" category="Clinical" type="Standard">
       <tags/>
     </dataset>
+    <dataset name="anesthesiaRecovery" id="4440" category="Clinical" type="Standard">
+      <tags/>
+    </dataset>
   </datasets>
 </datasets>
\ No newline at end of file
diff --git a/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml b/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml
index 82b520229..288640447 100644
--- a/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml
+++ b/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml
@@ -16334,4 +16334,117 @@
       </index>
     </indices>
   </table>
+  <table tableName="anesthesiaRecovery" tableDbType="TABLE">
+          <columns>
+            <column columnName="Id">
+              <datatype>varchar</datatype>
+              <columnTitle>Id</columnTitle>
+              <description>Subject identifier</description>
+              <propertyURI>http://cpas.labkey.com/Study#ParticipantId</propertyURI>
+              <conceptURI>http://cpas.labkey.com/Study#ParticipantId</conceptURI>
+              <nullable>false</nullable>
+              <url replaceMissing="blankValue">/ehr/participantView.view?participantId=${id}</url>
+              <importAliases>
+                <importAlias>ptid</importAlias>
+                <importAlias>participantid</importAlias>
+              </importAliases>
+              <fk>
+                <fkDbSchema>study</fkDbSchema>
+                <fkTable>Animal</fkTable>
+                <fkColumnName>Id</fkColumnName>
+              </fk>
+              <facetingBehavior>ALWAYS_OFF</facetingBehavior>
+              <scale>32</scale>
+            </column>
+            <column columnName="uniqueRowId">
+              <datatype>integer</datatype>
+            </column>
+            <column columnName="date">
+              <datatype>timestamp</datatype>
+            </column>
+            <column columnName="recoveryStart">
+              <datatype>timestamp</datatype>
+            </column>
+            <column columnName="observerComments">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="observer">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="recoveryId">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="room">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="observation">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="assignedTo">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="recoverySpeed">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="recoveryCondition">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="recoveryReason">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="submitterInitials">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="groupId">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="finalizeComments">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="location">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="cage">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="cageLockSecure">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="deviceId">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="recoveryReasonFinal">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="groupIdFinal">
+              <datatype>varchar</datatype>
+            </column>
+            <column columnName="recoveryStartTime">
+              <datatype>timestamp</datatype>
+            </column>
+            <column columnName="cageFinal">
+              <datatype>timestamp</datatype>
+            </column>
+            <column columnName="roomFinal">
+              <datatype>timestamp</datatype>
+            </column>
+            <column columnName="taskid">
+              <datatype>varchar</datatype>
+              <columnTitle>Task Id</columnTitle>
+              <propertyURI>urn:ehr.labkey.org/#TaskId</propertyURI>
+              <rangeURI>http://www.w3.org/2001/XMLSchema#string</rangeURI>
+              <shownInUpdateView>false</shownInUpdateView>
+              <shownInDetailsView>false</shownInDetailsView>
+              <dimension>false</dimension>
+              <url replaceMissing="blankValue"><![CDATA[/ehr/taskDetails.view?formtype=${taskid/formtype}&taskid=${taskid}]]></url>
+              <fk>
+                <fkDbSchema>ehr</fkDbSchema>
+                <fkTable>tasks</fkTable>
+                <fkColumnName>taskid</fkColumnName>
+              </fk>
+              <facetingBehavior>ALWAYS_OFF</facetingBehavior>
+              <scale>100</scale>
+            </column>
+          </columns>
+  </table>
 </tables>
\ No newline at end of file
diff --git a/wnprc_ios_app/src/org/labkey/wnprc_ios_app/wnprc_ios_appModule.java b/wnprc_ios_app/src/org/labkey/wnprc_ios_app/wnprc_ios_appModule.java
index 3025a5961..a8e555886 100644
--- a/wnprc_ios_app/src/org/labkey/wnprc_ios_app/wnprc_ios_appModule.java
+++ b/wnprc_ios_app/src/org/labkey/wnprc_ios_app/wnprc_ios_appModule.java
@@ -53,7 +53,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.001;
+        return 26.001;
     }
 
     @Override

From 13142745e688f5d47295ac88ad9cee370544952e Mon Sep 17 00:00:00 2001
From: aschmidt34 <aschmidt34@wisc.edu>
Date: Wed, 12 Aug 2026 10:23:33 -0500
Subject: [PATCH 2/3] Removed all columns created by WNPRC_EHRCustomizer.java.

---
 .../study/datasets/datasets_metadata.xml      | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml b/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml
index 288640447..e1680dd5d 100644
--- a/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml
+++ b/WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml
@@ -16413,38 +16413,38 @@
             <column columnName="deviceId">
               <datatype>varchar</datatype>
             </column>
-            <column columnName="recoveryReasonFinal">
-              <datatype>varchar</datatype>
-            </column>
-            <column columnName="groupIdFinal">
-              <datatype>varchar</datatype>
-            </column>
-            <column columnName="recoveryStartTime">
-              <datatype>timestamp</datatype>
-            </column>
-            <column columnName="cageFinal">
-              <datatype>timestamp</datatype>
-            </column>
-            <column columnName="roomFinal">
-              <datatype>timestamp</datatype>
-            </column>
-            <column columnName="taskid">
-              <datatype>varchar</datatype>
-              <columnTitle>Task Id</columnTitle>
-              <propertyURI>urn:ehr.labkey.org/#TaskId</propertyURI>
-              <rangeURI>http://www.w3.org/2001/XMLSchema#string</rangeURI>
-              <shownInUpdateView>false</shownInUpdateView>
-              <shownInDetailsView>false</shownInDetailsView>
-              <dimension>false</dimension>
-              <url replaceMissing="blankValue"><![CDATA[/ehr/taskDetails.view?formtype=${taskid/formtype}&taskid=${taskid}]]></url>
-              <fk>
-                <fkDbSchema>ehr</fkDbSchema>
-                <fkTable>tasks</fkTable>
-                <fkColumnName>taskid</fkColumnName>
-              </fk>
-              <facetingBehavior>ALWAYS_OFF</facetingBehavior>
-              <scale>100</scale>
-            </column>
+<!--            <column columnName="recoveryReasonFinal">-->
+<!--              <datatype>varchar</datatype>-->
+<!--            </column>-->
+<!--            <column columnName="groupIdFinal">-->
+<!--              <datatype>varchar</datatype>-->
+<!--            </column>-->
+<!--            <column columnName="recoveryStartTime">-->
+<!--              <datatype>timestamp</datatype>-->
+<!--            </column>-->
+<!--            <column columnName="cageFinal">-->
+<!--              <datatype>timestamp</datatype>-->
+<!--            </column>-->
+<!--            <column columnName="roomFinal">-->
+<!--              <datatype>timestamp</datatype>-->
+<!--            </column>-->
+<!--            <column columnName="taskid">-->
+<!--              <datatype>varchar</datatype>-->
+<!--              <columnTitle>Task Id</columnTitle>-->
+<!--              <propertyURI>urn:ehr.labkey.org/#TaskId</propertyURI>-->
+<!--              <rangeURI>http://www.w3.org/2001/XMLSchema#string</rangeURI>-->
+<!--              <shownInUpdateView>false</shownInUpdateView>-->
+<!--              <shownInDetailsView>false</shownInDetailsView>-->
+<!--              <dimension>false</dimension>-->
+<!--              <url replaceMissing="blankValue"><![CDATA[/ehr/taskDetails.view?formtype=${taskid/formtype}&taskid=${taskid}]]></url>-->
+<!--              <fk>-->
+<!--                <fkDbSchema>ehr</fkDbSchema>-->
+<!--                <fkTable>tasks</fkTable>-->
+<!--                <fkColumnName>taskid</fkColumnName>-->
+<!--              </fk>-->
+<!--              <facetingBehavior>ALWAYS_OFF</facetingBehavior>-->
+<!--              <scale>100</scale>-->
+<!--            </column>-->
           </columns>
   </table>
 </tables>
\ No newline at end of file

From 066e5949bc32645ded91571d97b7e8c5d561403f Mon Sep 17 00:00:00 2001
From: aschmidt34 <aschmidt34@wisc.edu>
Date: Thu, 13 Aug 2026 10:01:59 -0500
Subject: [PATCH 3/3] Updated automated testing permissions for
 anesthesiaRecovery table (to fix issue with TeamCity testMprDataEntry issue).

---
 .../test/sampledata/wnprc_ehr/wnprcEhrTestStudyPolicy.xml   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WNPRC_EHR/test/sampledata/wnprc_ehr/wnprcEhrTestStudyPolicy.xml b/WNPRC_EHR/test/sampledata/wnprc_ehr/wnprcEhrTestStudyPolicy.xml
index 69867afde..b91d36ea9 100644
--- a/WNPRC_EHR/test/sampledata/wnprc_ehr/wnprcEhrTestStudyPolicy.xml
+++ b/WNPRC_EHR/test/sampledata/wnprc_ehr/wnprcEhrTestStudyPolicy.xml
@@ -443,5 +443,11 @@
     <ns:datasetPermission datasetName="BehaviorAbstract" groupName="EHR Full Updaters" role="org.labkey.ehr.security.EHRFullUpdaterRole"/>
     <ns:datasetPermission datasetName="BehaviorAbstract" groupName="EHR Request Admins" role="org.labkey.ehr.security.EHRRequestAdminRole"/>
     <ns:datasetPermission datasetName="BehaviorAbstract" groupName="EHR Requestors" role="org.labkey.ehr.security.EHRRequestorRole"/>
+    <ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Administrators" role="org.labkey.ehr.security.EHRDataAdminRole"/>
+    <ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Basic Submitters" role="org.labkey.ehr.security.EHRBasicSubmitterRole"/>
+    <ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Full Submitters" role="org.labkey.ehr.security.EHRFullSubmitterRole"/>
+    <ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Full Updaters" role="org.labkey.ehr.security.EHRFullUpdaterRole"/>
+    <ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Request Admins" role="org.labkey.ehr.security.EHRRequestAdminRole"/>
+    <ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Requestors" role="org.labkey.ehr.security.EHRRequestorRole"/>
   </ns:perDatasetPermissions>
 </ns:studySecurityPolicy>