diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.query.xml b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.query.xml new file mode 100644 index 000000000..7c9812b7d --- /dev/null +++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.query.xml @@ -0,0 +1,38 @@ + + + + + Category/Unit Comparison + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.sql b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.sql new file mode 100644 index 000000000..65198effc --- /dev/null +++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt.sql @@ -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 \ No newline at end of file diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt/.qview.xml b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt/.qview.xml new file mode 100644 index 000000000..b52373e0b --- /dev/null +++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/complianceEmployeelist_rpt/.qview.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ONPRC_EHR_ComplianceDB/resources/views/begin.html b/ONPRC_EHR_ComplianceDB/resources/views/begin.html index 6712a429e..73efe6821 100644 --- a/ONPRC_EHR_ComplianceDB/resources/views/begin.html +++ b/ONPRC_EHR_ComplianceDB/resources/views/begin.html @@ -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' }] },{ diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MedSignoffFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MedSignoffFormType.java index 86312e8a4..4a221596b 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MedSignoffFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MedSignoffFormType.java @@ -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; diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/notification/DataValidationNotification.java b/onprc_ehr/src/org/labkey/onprc_ehr/notification/DataValidationNotification.java index 6e5cda088..11080a1de 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/notification/DataValidationNotification.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/notification/DataValidationNotification.java @@ -48,7 +48,7 @@ public String getEmailSubject(Container c) @Override public String getCronString() { - return "0 50 6/15 * * ?"; + return "0 50 6,15 * * ?"; } @Override diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHREnvironmentalPermission.java b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHREnvironmentalPermission.java index 95ca1815e..0a909fed7 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHREnvironmentalPermission.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHREnvironmentalPermission.java @@ -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"); } } diff --git a/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.query.xml b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.query.xml new file mode 100644 index 000000000..15aa08c77 --- /dev/null +++ b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.query.xml @@ -0,0 +1,36 @@ + + + + + Genetic Testing w/ Location + + + + Id + + + Sample Date + + + Area + + + Room + + + Room + + + Label + + + Comments + + + Status + + +
+ + + diff --git a/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.sql b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.sql new file mode 100644 index 000000000..0cfa39eae --- /dev/null +++ b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation.sql @@ -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 \ No newline at end of file diff --git a/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/.qview.xml b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/.qview.xml new file mode 100644 index 000000000..35442b9d8 --- /dev/null +++ b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/.qview.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/Genetic Testing with Current Locations.qview.xml b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/Genetic Testing with Current Locations.qview.xml new file mode 100644 index 000000000..0b1c76d53 --- /dev/null +++ b/onprc_reports/resources/queries/GeneticTests/genotypesWithSignificancewithLocation/Genetic Testing with Current Locations.qview.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file