Add Events Widget to Animal History Page

snprc_ehr/resources/queries/snd/AdmitChargeIdProtocolInfo.sql

@@ -0,0 +1,17 @@
+SELECT e.EventId,
+       e.AdmitId,
+       c.problem as Diagnosis,
+       c.admitcomplaint as AdmittingComplaint,
+       c.date as AdmitDate,
+       c.enddate as ReleaseDate,
+       c.AssignedVet,
+       c.Resolution,
+       e.ParentObjectId.ReferenceId as ChargeId,
+       e.ParentObjectId.ReferenceId.protocol as Protocol,
+       e.ParentObjectId.ReferenceId.displayName as IacucDescription,
+       a.date as AssignmentDate,
+       e.ParentObjectId.ReferenceId.title as Description,
+       e.ParentObjectId.ReferenceId.protocol.veterinarian as Veterinarian,
+
+FROM Events e left outer join study.cases c on e.AdmitId = c.caseid
+left join study.assignment a on a.protocol = e.ParentObjectId.ReferenceId.protocol and e.Date between a.date and coalesce(a.enddate, curdate()) and a.id = e.subjectID

snprc_ehr/resources/queries/snd/ProcedureEventListing.query.xml

@@ -0,0 +1,38 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="ProcedureEventListing" tableDbType="NOT_IN_DB">
+                <tableTitle>Procedure Event Listing</tableTitle>
+                <pkColumnName>EventId</pkColumnName>
+                <columns>
+                    <column columnName="EventId">
+                        <isKeyField>true</isKeyField>
+                        <columnTitle>Event</columnTitle>
+                        <isHidden>true</isHidden>
+                        <fk>
+                            <fkDbSchema>snd</fkDbSchema>
+                            <fkTable>Events</fkTable>
+                            <fkColumnName>EventId</fkColumnName>
+                            <fkDisplayColumnName>eventId</fkDisplayColumnName>
+                        </fk>
+                    </column>
+                    <column columnName="HTMLNarrative">
+                        <columnTitle>Narrative</columnTitle>
+                    </column>
+                    <column columnName="AdmitChargeId">
+                        <columnTitle>Admit / Charge ID</columnTitle>
+                    </column>
+                    <column columnName="SubjectId">
+                        <columnTitle>ID</columnTitle>
+                        <fk>
+                            <fkDbSchema>study</fkDbSchema>
+                            <fkTable>Animal</fkTable>
+                            <fkColumnName>Id</fkColumnName>
+                            <fkDisplayColumnName>ID</fkDisplayColumnName>
+                        </fk>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>

snprc_ehr/resources/queries/snd/ProcedureEventListing.sql

@@ -0,0 +1,14 @@
+SELECT
+    e.EventId,
+    e.SubjectId,
+    e.Date,
+    c.HtmlNarrative,
+    COALESCE(e.AdmitId, e.ParentObjectId.ReferenceId) AS AdmitChargeId,
+
+FROM snd.Events e
+         left outer join snd.Projects p
+                         on e.ParentObjectId = p.ObjectId
+         left outer join ehr.project ep
+                         on p.ReferenceId = ep.project
+         left outer join snd.EventsCache c
+                         on c.EventId = e.EventId

snprc_ehr/resources/queries/snd/ProcedureEventListing/.qview.xml

@@ -0,0 +1,5 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <sorts>
+        <sort column="Date" descending="true"/>
+    </sorts>
+</customView>

snprc_ehr/resources/source_queries/create_v_snd_events.sql

@@ -28,6 +28,7 @@ SELECT ae.ANIMAL_EVENT_ID AS EventId,
        CASE WHEN b1.budget_ID IS NOT NULL THEN b1.OBJECT_ID WHEN b2.BUDGET_ID IS NOT NULL THEN b2.OBJECT_ID ELSE b3.OBJECT_ID END AS parentObjectId,
        ae.EVENT_DATE_TM AS Date,
        ae.OBJECT_ID AS ObjectId,
+       ae.ADMIT_ID AS AdmitId,
        ae.entry_date_tm                        AS modified,
        dbo.f_map_username(ae.user_name)        AS modifiedby,
        tc.created                             AS created,