Merge remote-tracking branch 'origin/23.11_fb_eIACUCtoPrimeEndDate' i…

…nto 23.11_fb_eIACUCtoPrimeEndDate
LabKey · Jan 3, 2025 · a1fda73 · a1fda73
2 parents 87c47ef + 62407a0
commit a1fda73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/...esources/etls/eIACUCtoPrimteProtocols.xml → ...ehr/resources/etls/UpdateEhrProtocols.xml b/...esources/etls/eIACUCtoPrimteProtocols.xml → ...ehr/resources/etls/UpdateEhrProtocols.xml
@@ -2,36 +2,31 @@
 
 <etl xmlns="http://labkey.org/etl/xml">
 
-    <name>eIACUC to Prime Protocols</name>
-
-    <description>Runs stored Procedure to update eiACUC Protocols in ehr</description>
+    <name>Update Protocols in EHR</name>
 
+    <description>Runs stored procedures to update the protocol table in schema ehr.</description>
 
     <transforms>
 
         <transform id="UpdateBaseProtocol" type="StoredProcedure">
-            <description>Runs a stored procedure that generates lab values</description>
+            <description>Determines and populates BaseProtocol and RevisionNumber data for the protocol table in schema onprc_ehr.</description>
             <procedure schemaName="onprc_ehr" procedureName="BaseProtocol">
             </procedure>
         </transform>
 
         <transform id="enddateExpiredProtocolsProtocol" type="StoredProcedure">
-            <description>Runs a stored procedure that generates lab values</description>
+            <description>Adds enddate data to the protocol table in ehr.</description>
             <procedure schemaName="onprc_ehr" procedureName="ExpiredProtocolUpdate">
             </procedure>
         </transform>
 
-
-
-
     </transforms>
 
-    <!-- <schedule>
- &#45;&#45;Runs at 8:30 AM each day
-         <cron expression="0 50 04 * * "/>
-
+    <!--
+    <schedule>
+        <cron expression="0 50 04 * * "/>
      </schedule>
- -->
+     -->
 
 </etl>
 

diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-24.004-24.005.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-24.004-24.005.sql
@@ -15,7 +15,7 @@ WITH ApprovedProtocols AS (
     FROM
         onprc_ehr.eIACUC_PRIME_VIEW_PROTOCOLS
     WHERE
-        Protocol_State IN ('approved','expired', 'terminated', 'withdrawn')
+        Protocol_State IN ('approved','expired', 'terminated')
     GROUP BY
         BaseProtocol
 ),
@@ -44,4 +44,4 @@ Update p
 Set p.enddate = getDate() , p.contacts = 'EndDated based on Protocol_State ' + e.PROTOCOL_State
 
     from ehr.protocol p inner join expiredProtocol e on p.external_id = e.BaseProtocol
-END
+END