Skip to content

Commit 86230e4

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 25.7 to 25.11
2 parents ed2f621 + e016677 commit 86230e4

File tree

11 files changed

+160
-4
lines changed

11 files changed

+160
-4
lines changed

‎ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.query.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="complianceEmployeelist_rpt" tableDbType="NOT_IN_DB">
5+
<tableTitle>Category/Unit Comparison</tableTitle>
6+
<columns>
7+
8+
<column columnName="employeeid">
9+
</column>
10+
<column columnName="lastName">
11+
</column>
12+
<column columnName="firstName">
13+
</column>
14+
<column columnName="email">
15+
</column>
16+
<column columnName="type">
17+
</column>
18+
<column columnName="majorudds">
19+
</column>
20+
<column columnName="title">
21+
</column>
22+
<column columnName="unit">
23+
</column>
24+
<column columnName="category">
25+
</column>
26+
<column columnName="supervisor">
27+
</column>
28+
<column columnName="location">
29+
</column>
30+
<column columnName="startdate">
31+
</column>
32+
<column columnName="enddate">
33+
</column>
34+
</columns>
35+
</table>
36+
</tables>
37+
</metadata>
38+
</query>

‎ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.sql‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
select a.employeeid, a.unit, null as category, a.enddate, a.lastName, a.firstName, a.email, a.type, a.title, a.category
2+
from ehr_compliancedb.employees a
3+
where a.unit not in (select unit from ehr_compliancedb.employeeperUnit j where j.EmployeeId = a.employeeid)
4+
and a.unit is not null
5+
and a.enddate is null
6+
7+
8+
9+
group by a.employeeid, a.unit, a.enddate, a.lastName, a.firstName, a.email, a.type, a.title, a.category
10+
11+
12+
union
13+
14+
select a.employeeid, null as unit, a.category, a.enddate, a.lastName,
15+
a.firstName, a.email, a.type, a.title, a.category
16+
from ehr_compliancedb.employees a where
17+
a.category not in (select category from ehr_compliancedb.employeeperUnit j where j.EmployeeId = a.employeeid)
18+
and a.category is not null
19+
and a.enddate is null
20+
21+
group by a.employeeid, a.category, a.enddate, a.lastName, a.firstName, a.email, a.type, a.title, a.category
22+
23+
order by a.employeeid

‎ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt/.qview.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<columns>
3+
<column name="employeeid"/>
4+
<column name="lastName"/>
5+
<column name="firstName"/>
6+
<column name="email"/>
7+
<column name="type"/>
8+
<column name="majorudds"/>
9+
<column name="title"/>
10+
<column name="unit"/>
11+
<column name="category"/>
12+
<column name="supervisor"/>
13+
<column name="location"/>
14+
<column name="startdate"/>
15+
<column name="enddate"/>
16+
</columns>
17+
<sorts>
18+
<sort column="lastName" descending="false"/>
19+
<sort column="firstName" descending="false"/>
20+
</sorts>
21+
</customView>

‎ONPRC_EHR_ComplianceDB/resources/views/begin.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
name: 'List of Unused Training Names', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fCompliance%2fCompliance_Unassigned_requirements&rs:Command=Render'
9393
},{
9494
name: 'List of Duplicate Completion Dates', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fCompliance%2fCompliance_Duplicate_CompletedDates&rs:Command=Render'
95+
},{
96+
name: 'Category/Unit Comparison', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=complianceEmployeelist_rpt'
9597
}]
9698
},{
9799

‎onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MedSignoffFormType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ protected boolean canInsert()
7272
return super.canInsert();
7373
}
7474

75-
//Modified: 12-5-2019 R.Blasa
75+
//Modified: 12-11-2025 R.Blasa
7676
@Override
7777
public boolean isVisible()
7878
{
79-
Group g = GroupManager.getGroup(getCtx().getContainer(), "ASB Support", GroupEnumType.SITE);
79+
Group g = GroupManager.getGroup(getCtx().getContainer(), "Clinical Entry", GroupEnumType.SITE);
8080
if (g != null && getCtx().getUser().isInGroup(g.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class))
8181
{
8282
return false;

‎onprc_ehr/src/org/labkey/onprc_ehr/notification/DataValidationNotification.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public String getEmailSubject(Container c)
4848
@Override
4949
public String getCronString()
5050
{
51-
return "0 50 6/15 * * ?";
51+
return "0 50 6,15 * * ?";
5252
}
5353

5454
@Override

‎onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHREnvironmentalPermission.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ public class ONPRC_EHREnvironmentalPermission extends AbstractPermission
2424
{
2525
public ONPRC_EHREnvironmentalPermission()
2626
{
27-
super("ONPRC_EHREnvironmentalPermission", "This is the base permission used to control editing of the Envioenmental Assessment");
27+
super("ONPRC_EHREnvironmentalPermission", "This is the base permission used to control editing of the Environmental Assessment");
2828
}
2929
}

‎onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.query.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="" tableDbType="NOT_IN_DB">
5+
<tableTitle>Genetic Testing w/ Location</tableTitle>
6+
<columns>
7+
8+
<column columnName="Id">
9+
<columnTitle>Id</columnTitle>
10+
</column>
11+
<column columnName="date">
12+
<columnTitle>Sample Date</columnTitle>
13+
</column>
14+
<column columnName="Id/curLocation/area">
15+
<columnTitle>Area</columnTitle>
16+
</column>
17+
<column columnName="Id/curLocation/room">
18+
<columnTitle>Room</columnTitle>
19+
</column>
20+
<column columnName="Id/curLocation/cage">
21+
<columnTitle>Room</columnTitle>
22+
</column>
23+
<column columnName="label">
24+
<columnTitle>Label</columnTitle>
25+
</column>
26+
<column columnName="comment">
27+
<columnTitle>Comments</columnTitle>
28+
</column>
29+
<column columnName="LiveStatus">
30+
<columnTitle>Status</columnTitle>
31+
</column>
32+
</columns>
33+
</table>
34+
</tables>
35+
</metadata>
36+
</query>

‎onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.sql‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
select a.Id,
2+
a.date,
3+
b.Id.curLocation.area as area,
4+
b.Id.curLocation.room as room,
5+
b.Id.curLocation.cage as cage,
6+
a.label,
7+
a.comment,
8+
b.calculated_status as LiveStatus
9+
10+
from genotypesWithSignificance a, study.demographics b where a.Id = b.Id

‎onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/.qview.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<columns>
3+
<column name="Id"/>
4+
<column name="date"/>
5+
<column name="label"/>
6+
<column name="comment"/>
7+
</columns>
8+
<sorts>
9+
<sort column="Id" />
10+
</sorts>
11+
</customView>

0 commit comments

Comments
 (0)