Skip to content

[bot] Fast-forward for 25.11.5 #1587

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 5 commits into from
Dec 23, 2025
Merged

[bot] Fast-forward for 25.11.5 #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
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
86230e4
Merge 25.7 to 25.11
labkey-teamcity Dec 22, 2025
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
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>
2 changes: 2 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/views/begin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@
name: 'List of Unused Training Names', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fCompliance%2fCompliance_Unassigned_requirements&rs:Command=Render'
},{
name: 'List of Duplicate Completion Dates', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fCompliance%2fCompliance_Duplicate_CompletedDates&rs:Command=Render'
},{
name: 'Category/Unit Comparison', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=complianceEmployeelist_rpt'
}]
},{

Expand Down
4 changes: 2 additions & 2 deletions onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MedSignoffFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ protected boolean canInsert()
return super.canInsert();
}

//Modified: 12-5-2019 R.Blasa
//Modified: 12-11-2025 R.Blasa
@Override
public boolean isVisible()
{
Group g = GroupManager.getGroup(getCtx().getContainer(), "ASB Support", GroupEnumType.SITE);
Group g = GroupManager.getGroup(getCtx().getContainer(), "Clinical Entry", GroupEnumType.SITE);
if (g != null && getCtx().getUser().isInGroup(g.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class))
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/src/org/labkey/onprc_ehr/notification/DataValidationNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public String getEmailSubject(Container c)
@Override
public String getCronString()
{
return "0 50 6/15 * * ?";
return "0 50 6,15 * * ?";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHREnvironmentalPermission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public class ONPRC_EHREnvironmentalPermission extends AbstractPermission
{
public ONPRC_EHREnvironmentalPermission()
{
super("ONPRC_EHREnvironmentalPermission", "This is the base permission used to control editing of the Envioenmental Assessment");
super("ONPRC_EHREnvironmentalPermission", "This is the base permission used to control editing of the Environmental Assessment");
}
}
36 changes: 36 additions & 0 deletions onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="" tableDbType="NOT_IN_DB">
<tableTitle>Genetic Testing w/ Location</tableTitle>
<columns>

<column columnName="Id">
<columnTitle>Id</columnTitle>
</column>
<column columnName="date">
<columnTitle>Sample Date</columnTitle>
</column>
<column columnName="Id/curLocation/area">
<columnTitle>Area</columnTitle>
</column>
<column columnName="Id/curLocation/room">
<columnTitle>Room</columnTitle>
</column>
<column columnName="Id/curLocation/cage">
<columnTitle>Room</columnTitle>
</column>
<column columnName="label">
<columnTitle>Label</columnTitle>
</column>
<column columnName="comment">
<columnTitle>Comments</columnTitle>
</column>
<column columnName="LiveStatus">
<columnTitle>Status</columnTitle>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
10 changes: 10 additions & 0 deletions onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
select a.Id,
a.date,
b.Id.curLocation.area as area,
b.Id.curLocation.room as room,
b.Id.curLocation.cage as cage,
a.label,
a.comment,
b.calculated_status as LiveStatus

from genotypesWithSignificance a, study.demographics b where a.Id = b.Id
11 changes: 11 additions & 0 deletions ...c_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="label"/>
<column name="comment"/>
</columns>
<sorts>
<sort column="Id" />
</sorts>
</customView>
15 changes: 15 additions & 0 deletions ...ts/genotypesWithSignificancewithLocation/Genetic Testing with Current Locations.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="area"/>
<column name="room"/>
<column name="cage"/>
<column name="label"/>
<column name="comment"/>
<column name="LiveStatus"/>
</columns>
<sorts>
<sort column="Id" />
</sorts>
</customView>