Skip to content

26.3 fb ios app integration #1002

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

Merged
aschmidt34 merged 14 commits into from
Aug 5, 2026
Merged

26.3 fb ios app integration #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ae25669
Started form validation for the anesthesia recovery dataset.
aschmidt34 Sep 26, 2025
7ef1419
Updated WNPRC_EHRController with anesthesia recovery validation funct…
aschmidt34 Oct 6, 2025
bf26df2
Updated permission for wnprc_ehrController anesthesia upload api action.
aschmidt34 Oct 10, 2025
7655824
Added line to validate animal is at the center.
aschmidt34 Oct 31, 2025
dad0ff2
-Updated the anesthesiaRecovery validation to include a time-check wh…
aschmidt34 Apr 24, 2026
0af314c
Merge branch 'release25.7-SNAPSHOT' into 25.7_fb_ios_app_integration
aschmidt34 Apr 27, 2026
666f92e
anesthesiaRecovery.query.xml: Created XML for anesthesia recovery dat…
aschmidt34 Jun 8, 2026
14fe655
- AnesthesiaRecoveryReviewNotification.java: Created this new notific…
aschmidt34 Jun 22, 2026
56eb37f
- WNPRC_EHR/resources/queries/study/anesthesiaRecovery.query.xml: Upd…
aschmidt34 Jul 9, 2026
ddc35ad
anesthesiaRecoveriesFullHistory.sql: Added data to show in 'full hist…
aschmidt34 Aug 3, 2026
529f55c
Merge remote-tracking branch 'origin/25.7_fb_ios_app_integration' int…
aschmidt34 Aug 4, 2026
b161466
Added all necessary files from external module.
aschmidt34 Aug 4, 2026
004a48b
Removed placeholders README and begin.html.
aschmidt34 Aug 5, 2026
14fe7c6
Re-added README (with some text now) and module landing page (so it d…
aschmidt34 Aug 5, 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
12 changes: 12 additions & 0 deletions WNPRC_EHR/resources/queries/study/anesthesiaRecoveriesFullHistory.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
SELECT
Id,
date,
recoveryStartTime,
submitterInitials,
qcstate,
taskid,
observation,
recoverySpeed,
recoveryCondition,
totalRecoveryTime
FROM study.anesthesiaRecovery
75 changes: 75 additions & 0 deletions WNPRC_EHR/resources/queries/study/anesthesiaRecovery.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="anesthesiaRecovery" tableDbType="TABLE" useColumnOrder="false">
<columns>
<column columnName="Id">
<required>true</required>
<nullable>false</nullable>
</column>

<column columnName="observer">
<required>true</required>
<nullable>false</nullable>
</column>

<column columnName="recoveryStartTime">
<columnTitle>Recovery Start Time Final</columnTitle>
</column>

<column columnName="taskid">
<columnTitle>Task Id</columnTitle>
<fk>
<fkDbSchema>ehr</fkDbSchema>
<fkTable>tasks</fkTable>
<fkColumnName>taskid</fkColumnName>
</fk>
<url>/ehr/WNPRC/EHR/taskDetails.view?formtype=Anesthesia%20Recovery&amp;taskid=${taskid}</url>
<required>true</required>
<nullable>false</nullable>
</column>

<column columnName="observation">
<required>true</required>
<nullable>false</nullable>
</column>

<column columnName="recoveryReason">
<required>true</required>
<nullable>false</nullable>
</column>

<column columnName="submitterInitials">
<required>true</required>
<nullable>false</nullable>
</column>

<column columnName="recoveryReasonFinal">
<columnTitle>Recovery Reason Final</columnTitle>
</column>

<column columnName="groupIdFinal">
<columnTitle>Group ID Final</columnTitle>
</column>

<column columnName="cageFinal">
<columnTitle>Cage Final</columnTitle>
</column>

<column columnName="locationFinal">
<columnTitle>Location Final</columnTitle>
</column>

<column columnName="roomFinal">
<columnTitle>Room Final</columnTitle>
</column>

<column columnName="QCState">
<columnTitle>Status</columnTitle>
</column>

</columns>
</table>
</tables>
</metadata>
</query>
37 changes: 37 additions & 0 deletions WNPRC_EHR/resources/queries/study/anesthesiaRecovery/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!--Defines the default qview for the anesthesiaRecovery dataset.-->

<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="observation"/>
<column name="observer"/>
<column name="submitterInitials"/>
<!-- <column name="room"/>-->
<!-- <column name="assignedTo"/>-->
<column name="recoverySpeed"/>
<column name="recoveryCondition"/>
<column name="cageLockSecure"/>
<!-- <column name="recoveryReason"/>-->
<!-- <column name="groupId"/>-->
<column name="observerComments"/>
<column name="finalizeComments"/>
<!-- <column name="location"/>-->
<!-- <column name="cage"/>-->
<column name="recoveryId"/>
<column name="deviceId"/>
<column name="groupIdFinal"/>
<column name="recoveryStartTime"/>
<column name="recoveryReasonFinal"/>
<column name="cageFinal"/>
<column name="locationFinal"/>
<column name="roomFinal"/>
<column name="container"/>
<column name="history"/>
<column name="taskid"/>
<column name="QCState"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
</customView>
28 changes: 28 additions & 0 deletions WNPRC_EHR/resources/queries/study/anesthesiaRecovery/Full History.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!--Defines the full history qview for the anesthesiaRecovery dataset.-->

<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="recoveryStartTime"/>
<column name="observerComments"/>
<column name="observer"/>
<column name="recoveryId"/>
<column name="room"/>
<column name="observation"/>
<column name="assignedTo"/>
<column name="recoverySpeed"/>
<column name="recoveryCondition"/>
<column name="recoveryReason"/>
<column name="submitterInitials"/>
<column name="groupId"/>
<column name="finalizeComments"/>
<column name="location"/>
<column name="cage"/>
<column name="cageLockSecure"/>
<column name="deviceId"/>
<column name="taskid"/>
<column name="container"/>
<column name="history"/>
</columns>
</customView>
12 changes: 12 additions & 0 deletions WNPRC_EHR/resources/queries/study/anesthesiaRecovery/Summary.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!--Defines the summary qview for the anesthesiaRecovery dataset.-->

<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="recoveryStartTime"/>
<column name="totalRecoveryTime"/>
</columns>
<filters>
<filter column="observation" operator="eq" value="Fully Recovered"/>
</filters>
</customView>
21 changes: 20 additions & 1 deletion WNPRC_EHR/resources/queries/study/wnprcFullHistory.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,23 @@ SELECT
null AS requestid

FROM study.waterTotalByDate
WHERE TotalWater IS NOT NULL
WHERE TotalWater IS NOT NULL

UNION ALL
SELECT
Id AS Id,
date,
null AS project,
'Anesthesia Recovery' AS dataset,
'anesthesiarecovery' AS DataSetName,
'Animal fully recovered.' AS remark,
'Total Recovery Time: ' || CAST(CEILING(totalRecoveryTime) AS VARCHAR) || ' minutes' || CHR(10) ||
'Recovery Speed: ' || CAST(recoverySpeed AS VARCHAR) || CHR(10) ||
'Recovery Condition: ' || CAST(recoveryCondition AS VARCHAR)
AS description,
submitterInitials AS performedBy,
qcstate AS qcstate,
taskid AS taskid,
null AS requestid
FROM study.anesthesiaRecoveriesFullHistory
WHERE observation = 'Fully Recovered'
2 changes: 1 addition & 1 deletion WNPRC_EHR/resources/queries/study/wnprcFullHistory/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="datasetname" operator="in" value="assignments;behavetrem;biopsy;blood;clinremarks;deaths;encounters;drug;housing;necropsy;problem;weight;tb;clinpathRuns;foodDeprives;ultrasounds;pregnancy_outcomes;breeding_encounters;research_ultrasounds;chairing;restraint;watertotal"/>
<filter column="datasetname" operator="in" value="assignments;behavetrem;biopsy;blood;clinremarks;deaths;encounters;drug;housing;necropsy;problem;weight;tb;clinpathRuns;foodDeprives;ultrasounds;pregnancy_outcomes;breeding_encounters;research_ultrasounds;chairing;restraint;watertotal;anesthesiarecovery"/>
<!--<filter column="qcstate/publicdata" operator="eq" value="true"/>-->
</filters>
</customView>
10 changes: 10 additions & 0 deletions WNPRC_EHR/resources/queries/wnprc_ios_app/session_log.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="session_log" tableDbType="TABLE" useColumnOrder="false">
<javaCustomizer class="org.labkey.wnprc_ehr.table.WNPRC_EHRCustomizer"/>

</table>
</tables>
</metadata>
</query>
Loading