Skip to content

[bot] Fast-forward for 25.7.19 #1728

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
github-actions merged 31 commits into from
May 25, 2026
Merged

[bot] Fast-forward for 25.7.19 #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8e1d934
EHR data validation alert update (#1530)
kollil Dec 1, 2025
a9b0fc3
Add master problems to vet assignment main view (#1557)
brentlogan Dec 3, 2025
3888df0
Add Master Problems to defined views (#1565)
brentlogan Dec 4, 2025
9c30240
25.7 New med with no end date (#1563)
kollil Dec 4, 2025
e8a9c42
25.7 fb compliance requirements view (#1560)
Ohsudev Dec 8, 2025
4a6c71e
Created a new permission group that prevents the NHP Training input f…
Ohsudev Dec 9, 2025
ab3e1ba
Add afternoon schedule to EHR Data Validation notification (#1570)
brentlogan Dec 10, 2025
13664fd
Fix schedule (#1576)
brentlogan Dec 15, 2025
5f255c4
Created a new Clinical permission group called "Form MedSignOff SF". …
Ohsudev Dec 16, 2025
764d818
Created a new Compliance Exception report that identifies (#1544)
Ohsudev Dec 16, 2025
e016677
25.7 fb genetic test current location (#1542)
Ohsudev Dec 17, 2025
d39a04a
Assignment updates in Behavior alert (#1547)
kollil Dec 23, 2025
70f673d
MOdifed flag program to include the time settings when entering start…
Ohsudev Dec 23, 2025
33811ef
BSU Assignment dashboard alert update (#1588)
kollil Dec 24, 2025
077ea0d
Added clause to exclude dead animals in a query (#1591)
kollil Dec 30, 2025
86937a7
Created a new reporting program called "Tissue Distribution by Animal…
Ohsudev Jan 8, 2026
af38dcc
Update to ChargeRate.js and active view xml to have end time at the e…
jonesgaise Jan 12, 2026
f192fc6
Fix source display in invoiced Items (#1603)
brentlogan Jan 13, 2026
1c983e3
25.7 fb training summary report (#1605)
Ohsudev Jan 15, 2026
395e85c
Created a new permission group for accessing the Clinical surgical Ro…
Ohsudev Jan 21, 2026
5c7c8bf
25.7 fb parentage reports (#1601)
Ohsudev Jan 21, 2026
d4ae1a0
Created a new program to modify every active compliance requirement n…
Ohsudev Jan 21, 2026
d768382
Modified Offspring reporting to include surrogate mom. (#1612)
Ohsudev Jan 22, 2026
e7f7893
Modified Compliance reports to remove subquery results errors. (#1617)
Ohsudev Jan 23, 2026
8b42f94
Update of dateFinalized when Status code is complete in clinPathRuns …
jonesgaise Jan 28, 2026
1462774
BSU assignment dashboard additions (#1622)
kollil Feb 2, 2026
20cf8d7
Behavior alert assignment pool note link update (#1626)
kollil Feb 3, 2026
801333e
Suppress restricted issue exception on search (#1629)
labkey-klum Feb 6, 2026
3c3bb64
Changed the animal age to under 3 instead 2.5 years (#1635)
kollil Feb 11, 2026
65b720a
Made change to Billing Customizer to format total cost as a decimal (…
jonesgaise Feb 12, 2026
e104040
Parentage dam mismatch in Colony alert (#1643)
kollil Feb 25, 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
19 changes: 1 addition & 18 deletions ..._ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
</column>
<column columnName="requirementname">
<columnTitle>Requirement Name</columnTitle>
<displayWidth>250</displayWidth>
<fk>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>requirements</fkTable>
Expand All @@ -29,7 +28,6 @@
</column>
<column columnName="times_completed">
<columnTitle>Times Completed</columnTitle>
<displayWidth>50</displayWidth>
<url>/query/executeQuery.view?schemaName=ehr_compliancedb&amp;
query.queryName=CompletionDates&amp;
query.EmployeeId~eq=${employeeId}&amp;
Expand All @@ -38,66 +36,52 @@
</column>
<column columnName="expired_period">
<columnTitle>Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="new_expired_period">
<columnTitle>New Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="email">
<columnTitle>Email</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="lastname">
<columnTitle>Last Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="firstname">
<columnTitle>First Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="host">
<columnTitle>Host</columnTitle>
<displayWidth>110</displayWidth>
</column>
<column columnName="supervisor">
<columnTitle>Supervisor</columnTitle>
<displayWidth>150</displayWidth>
</column>

<column columnName="unit">
<columnTitle>Unit</columnTitle>
<displayWidth>210</displayWidth>
</column>
<column columnName="mostrecentcompleted_date">
<columnTitle>Most Recent Date</columnTitle>
<formatString>yyyy-MM-dd</formatString>
<displayWidth>70</displayWidth>
</column>
<column columnName="comment">
<columnTitle>Comments</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="category">
<columnTitle>Category</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="trainee_type">
<columnTitle>Trainee Type</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="requirement_name_type">
<columnTitle>Requirement Name Type</columnTitle>
<displayWidth>180</displayWidth>
</column>
<column columnName="months_until_renewal">
<columnTitle>Months Until Renewal</columnTitle>
<displayWidth>60</displayWidth>
<conditionalFormats>
<conditionalFormat>
<filters>
Expand All @@ -110,12 +94,11 @@

<column columnName="trackingflag">
<columnTitle>Essential</columnTitle>
<displayWidth>60</displayWidth>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>
<column columnName="snooze_date">
<columnTitle>Snooze Until</columnTitle>
<displayWidth>60</displayWidth>
<formatString>yyyy-MM-dd</formatString>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>

Expand Down
20 changes: 1 addition & 19 deletions ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
</column>
<column columnName="requirementname">
<columnTitle>Requirement Name</columnTitle>
<displayWidth>90</displayWidth>
<fk>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>requirements</fkTable>
Expand All @@ -29,7 +28,6 @@
</column>
<column columnName="times_completed">
<columnTitle>Times Completed</columnTitle>
<displayWidth>50</displayWidth>
<url>/query/executeQuery.view?schemaName=ehr_compliancedb&amp;
query.queryName=CompletionDates&amp;
query.EmployeeId~eq=${employeeId}&amp;
Expand All @@ -38,66 +36,51 @@
</column>
<column columnName="expired_period">
<columnTitle>Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="new_expired_period">
<columnTitle>New Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="email">
<columnTitle>Email</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="lastname">
<columnTitle>Last Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="firstname">
<columnTitle>First Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="host">
<columnTitle>Host</columnTitle>
<displayWidth>110</displayWidth>
</column>
<column columnName="supervisor">
<columnTitle>Supervisor</columnTitle>
<displayWidth>150</displayWidth>
</column>

<column columnName="unit">
<columnTitle>Unit</columnTitle>
<displayWidth>210</displayWidth>
</column>
<column columnName="mostrecentcompleted_date">
<columnTitle>Most Recent Date</columnTitle>
<formatString>yyyy-MM-dd</formatString>
<displayWidth>70</displayWidth>
</column>
<column columnName="comment">
<columnTitle>Comments</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="category">
<columnTitle>Category</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="trainee_type">
<columnTitle>Trainee Type</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="requirement_name_type">
<columnTitle>Requirement Name Type</columnTitle>
<displayWidth>180</displayWidth>
</column>
<column columnName="months_until_renewal">
<columnTitle>Months Until Renewal</columnTitle>
<displayWidth>60</displayWidth>
<conditionalFormats>
<conditionalFormat>
<filters>
Expand All @@ -110,12 +93,11 @@

<column columnName="trackingflag">
<columnTitle>Essential</columnTitle>
<displayWidth>60</displayWidth>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>
<column columnName="snooze_date">
<columnTitle>Snooze Until</columnTitle>
<displayWidth>60</displayWidth>
<formatString>yyyy-MM-dd</formatString>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>

Expand Down
38 changes: 38 additions & 0 deletions ..._EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="complianceEmployeelist_rpt" tableDbType="NOT_IN_DB">
<tableTitle>Category/Unit Comparison</tableTitle>
<columns>

<column columnName="employeeid">
</column>
<column columnName="lastName">
</column>
<column columnName="firstName">
</column>
<column columnName="email">
</column>
<column columnName="type">
</column>
<column columnName="majorudds">
</column>
<column columnName="title">
</column>
<column columnName="unit">
</column>
<column columnName="category">
</column>
<column columnName="supervisor">
</column>
<column columnName="location">
</column>
<column columnName="startdate">
</column>
<column columnName="enddate">
</column>
</columns>
</table>
</tables>
</metadata>
</query>
23 changes: 23 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
select a.employeeid, a.unit, null as category, a.enddate, a.lastName, a.firstName, a.email, a.type, a.title, a.category
from ehr_compliancedb.employees a
where a.unit not in (select unit from ehr_compliancedb.employeeperUnit j where j.EmployeeId = a.employeeid)
and a.unit is not null
and a.enddate is null



group by a.employeeid, a.unit, a.enddate, a.lastName, a.firstName, a.email, a.type, a.title, a.category


union

select a.employeeid, null as unit, a.category, a.enddate, a.lastName,
a.firstName, a.email, a.type, a.title, a.category
from ehr_compliancedb.employees a where
a.category not in (select category from ehr_compliancedb.employeeperUnit j where j.EmployeeId = a.employeeid)
and a.category is not null
and a.enddate is null

group by a.employeeid, a.category, a.enddate, a.lastName, a.firstName, a.email, a.type, a.title, a.category

order by a.employeeid
21 changes: 21 additions & 0 deletions ...EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="employeeid"/>
<column name="lastName"/>
<column name="firstName"/>
<column name="email"/>
<column name="type"/>
<column name="majorudds"/>
<column name="title"/>
<column name="unit"/>
<column name="category"/>
<column name="supervisor"/>
<column name="location"/>
<column name="startdate"/>
<column name="enddate"/>
</columns>
<sorts>
<sort column="lastName" descending="false"/>
<sort column="firstName" descending="false"/>
</sorts>
</customView>
4 changes: 1 addition & 3 deletions ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
<sorts>
<sort column="requirementname" descending="false"/>
</sorts>
<filters>
<filter column="datedisabled" operator="isblank" value=""/>
</filters>

</customView>
8 changes: 8 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements/Active.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" hidden = "false" >
<sorts>
<sort column="requirementname" descending="false"/>
</sorts>
<filters>
<filter column="datedisabled" operator="isblank" value=""/>
</filters>
</customView>
Loading
Loading