diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests.query.xml b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests.query.xml
index 63925bc28..75260293e 100644
--- a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests.query.xml
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests.query.xml
@@ -19,7 +19,6 @@
Requirement Name
- 250
ehr_compliancedb
requirements
@@ -29,7 +28,6 @@
Times Completed
- 50
/query/executeQuery.view?schemaName=ehr_compliancedb&
query.queryName=CompletionDates&
query.EmployeeId~eq=${employeeId}&
@@ -38,66 +36,52 @@
Expire Period (Months)
- 70
New Expire Period (Months)
- 70
Email
- 70
Last Name
- 110
First Name
- 110
Host
- 110
Supervisor
- 150
Unit
- 210
Most Recent Date
yyyy-MM-dd
- 70
Comments
- 70
Category
- 70
Trainee Type
- 70
Requirement Name Type
- 180
Months Until Renewal
- 60
@@ -110,12 +94,11 @@
Essential
- 60
ALWAYS_OFF
Snooze Until
- 60
+ yyyy-MM-dd
ALWAYS_OFF
diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml
index d85eb7bac..6e634ad8b 100644
--- a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml
@@ -19,7 +19,6 @@
Requirement Name
- 90
ehr_compliancedb
requirements
@@ -29,7 +28,6 @@
Times Completed
- 50
/query/executeQuery.view?schemaName=ehr_compliancedb&
query.queryName=CompletionDates&
query.EmployeeId~eq=${employeeId}&
@@ -38,66 +36,51 @@
Expire Period (Months)
- 70
New Expire Period (Months)
- 70
Email
- 70
-
Last Name
- 110
First Name
- 110
Host
- 110
Supervisor
- 150
Unit
- 210
Most Recent Date
yyyy-MM-dd
- 70
Comments
- 70
Category
- 70
Trainee Type
- 70
Requirement Name Type
- 180
Months Until Renewal
- 60
@@ -110,12 +93,11 @@
Essential
- 60
ALWAYS_OFF
Snooze Until
- 60
+ yyyy-MM-dd
ALWAYS_OFF
diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html
new file mode 100644
index 000000000..d5de04cf2
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml
new file mode 100644
index 000000000..ab66d427b
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js
new file mode 100644
index 000000000..f0ae92228
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013-2019 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+/**
+ * @cfg employeeId
+ * @cfg schemaName
+ */
+Ext4.define('EHR_ComplianceDB.panel.EmployeeDetailsPanel', {
+ extend: 'Ext.panel.Panel',
+ schemaName: 'ehr_complianceDB',
+
+ initComponent: function(){
+ var filterArray = [LABKEY.Filter.create('employeeid', this.employeeId, LABKEY.Filter.Types.EQUAL)];
+
+ Ext4.apply(this, {
+ border: false,
+ defaults: {
+ border: false,
+ style: 'margin-bottom: 20px;'
+ },
+ items: [{
+ xtype: 'ldk-detailspanel',
+ store: {
+ schemaName: this.schemaName,
+ queryName: 'employees',
+ filterArray: filterArray
+ },
+ showBackBtn: false,
+ title: 'Employee Details'
+ }, {
+ xtype: 'ldk-querypanel',
+ queryConfig: {
+ title: 'Training / Requirement Summary',
+ schemaName: this.schemaName,
+ queryName: 'ComplianceProcedureRecentTests', //exclude employee training exemptions
+ filterArray: filterArray,
+ failure: LDK.Utils.getErrorCallback()
+ }
+ },{
+ xtype: 'ldk-querypanel',
+ queryConfig: {
+ title: 'Exemptions From Training Requirements',
+ schemaName: this.schemaName,
+ queryName: 'employeerequirementexemptions',
+ filterArray: filterArray,
+ failure: LDK.Utils.getErrorCallback()
+ }
+ },{
+ xtype: 'ldk-querypanel',
+ queryConfig: {
+ title: 'Training History',
+ schemaName: this.schemaName,
+ queryName: 'completionDates',
+ filterArray: filterArray,
+ failure: LDK.Utils.getErrorCallback()
+ }
+ }]
+ });
+
+ this.callParent();
+ }
+});
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
index ffa8320d2..4ee6b9e89 100644
--- a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
+++ b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
@@ -110,7 +110,8 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
// Added: 10-24-2022 R.Blasa
EHRService.get().registerMoreActionsButton(new ShowEditUIButton(this, "ehr_compliancedb", "completiondates", ONPRC_ComplianceDBEntryPermission.class), "ehr_compliancedb", "completiondates");
-
+ // Added 1-8-2026
+ EHRService.get().registerActionOverride("employeeDetails", this, "employeeDetails.html");
}