From dce56ff0d0099c1ca0ef2917dcb43e94421d933b Mon Sep 17 00:00:00 2001 From: ohsudev Date: Fri, 9 Jan 2026 21:16:14 -0800 Subject: [PATCH 1/7] Modified Compliance Training/Summary report to use the same report as Overdue/Soon report version. --- .../resources/views/employeeDetails.html | 15 +++++ .../panel/EmployeeDetailsPanel.js | 64 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html create mode 100644 ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html new file mode 100644 index 000000000..60a438758 --- /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/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js new file mode 100644 index 000000000..0618541bb --- /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('ONPRC_EHR_ComplianceDB.panel.EmployeeDetailsPanel', { + extend: 'Ext.panel.Panel', + schemaName: 'onprc_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 From 9a769de283b6cb50b4884d884cdf626db0de5e58 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Fri, 9 Jan 2026 21:27:47 -0800 Subject: [PATCH 2/7] Modified Compliance Training/Summary report to use the same report as Overdue/Soon report version. --- .../resources/views/employeeDetails.view.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml 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..9ceee1443 --- /dev/null +++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file From 6620784c8f4eabdc6e3e0b9554b374fc66bff4cd Mon Sep 17 00:00:00 2001 From: ohsudev Date: Fri, 9 Jan 2026 21:58:24 -0800 Subject: [PATCH 3/7] Modified Compliance Training/Summary report to use the same report as Overdue/Soon report version. --- .../ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..150ef5272 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, "views/empoyeeDetails.html"); } From 85ab51f9257b8db49457175c36c4519e21bf1b26 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Mon, 12 Jan 2026 22:05:43 -0800 Subject: [PATCH 4/7] Modified Compliance Employee detailed reports --- ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html | 2 +- .../resources/views/employeeDetails.view.xml | 3 ++- .../web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js | 4 ++-- .../ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html index 60a438758..d5de04cf2 100644 --- a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html +++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html @@ -7,7 +7,7 @@ } var webpart = <%=webpartContext%>; - Ext4.create('ONPRC_EHR_ComplianceDB.panel.EmployeeDetailsPanel', { + Ext4.create('EHR_ComplianceDB.panel.EmployeeDetailsPanel', { employeeId: LABKEY.ActionURL.getParameter('employeeid') }).render(webpart.wrapperDivId); }); diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml index 9ceee1443..ab66d427b 100644 --- a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml +++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml @@ -2,6 +2,7 @@ - + + \ 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 index 0618541bb..2cb31500c 100644 --- a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js +++ b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js @@ -7,9 +7,9 @@ * @cfg employeeId * @cfg schemaName */ -Ext4.define('ONPRC_EHR_ComplianceDB.panel.EmployeeDetailsPanel', { +Ext4.define('EHR_ComplianceDB.panel.EmployeeDetailsPanel', { extend: 'Ext.panel.Panel', - schemaName: 'onprc_ehr_compliancedb', + schemaName: 'ehr_compliancedb', initComponent: function(){ var filterArray = [LABKEY.Filter.create('employeeid', this.employeeId, LABKEY.Filter.Types.EQUAL)]; 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 150ef5272..6a3488d0c 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 @@ -111,7 +111,7 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext) EHRService.get().registerMoreActionsButton(new ShowEditUIButton(this, "ehr_compliancedb", "completiondates", ONPRC_ComplianceDBEntryPermission.class), "ehr_compliancedb", "completiondates"); // Added 1-8-2026 - EHRService.get().registerActionOverride("employeeDetails", this, "views/empoyeeDetails.html"); +// EHRService.get().registerActionOverride("employeeDetails", this, "employeeDetails.html"); } From 28205b7b5683e5fc3050c1575f1bdf9ad1507666 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 13 Jan 2026 11:22:02 -0800 Subject: [PATCH 5/7] Modified Compliance Employee detailed reports --- .../web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js | 2 +- .../ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js index 2cb31500c..342d3ea2c 100644 --- a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js +++ b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js @@ -9,7 +9,7 @@ */ Ext4.define('EHR_ComplianceDB.panel.EmployeeDetailsPanel', { extend: 'Ext.panel.Panel', - schemaName: 'ehr_compliancedb', + schemaName: 'ehr_complianceDB', initComponent: function(){ var filterArray = [LABKEY.Filter.create('employeeid', this.employeeId, LABKEY.Filter.Types.EQUAL)]; 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 6a3488d0c..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 @@ -111,7 +111,7 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext) 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"); + EHRService.get().registerActionOverride("employeeDetails", this, "employeeDetails.html"); } From 1a3cbe6dc073178fd69f9f2a5fdf703b2ec6cec6 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 13 Jan 2026 14:04:15 -0800 Subject: [PATCH 6/7] Modified Compliance Employee detailed reports --- .../ComplianceProcedureRecentTests.query.xml | 36 +++++++++---------- .../ComplianceRecentTests.query.xml | 19 ---------- .../panel/EmployeeDetailsPanel.js | 2 +- 3 files changed, 19 insertions(+), 38 deletions(-) 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..74979bc84 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,7 @@ Requirement Name - 250 + ehr_compliancedb requirements @@ -29,7 +29,7 @@ Times Completed - 50 + /query/executeQuery.view?schemaName=ehr_compliancedb& query.queryName=CompletionDates& query.EmployeeId~eq=${employeeId}& @@ -38,66 +38,66 @@ 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 +110,12 @@ Essential - 60 + ALWAYS_OFF Snooze Until - 60 + 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..0e1f7f50d 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,10 @@ Essential - 60 ALWAYS_OFF Snooze Until - 60 ALWAYS_OFF diff --git a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js index 342d3ea2c..f0ae92228 100644 --- a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js +++ b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js @@ -29,7 +29,7 @@ Ext4.define('EHR_ComplianceDB.panel.EmployeeDetailsPanel', { }, showBackBtn: false, title: 'Employee Details' - },{ + }, { xtype: 'ldk-querypanel', queryConfig: { title: 'Training / Requirement Summary', From a6365544499095c997e22d26ebbdc3faafbcc12e Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 13 Jan 2026 15:46:01 -0800 Subject: [PATCH 7/7] Modified Compliance Employee detailed reports --- .../ComplianceProcedureRecentTests.query.xml | 19 +------------------ .../ComplianceRecentTests.query.xml | 1 + 2 files changed, 2 insertions(+), 18 deletions(-) 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 74979bc84..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 - ehr_compliancedb requirements @@ -29,7 +28,6 @@ Times Completed - /query/executeQuery.view?schemaName=ehr_compliancedb& query.queryName=CompletionDates& query.EmployeeId~eq=${employeeId}& @@ -38,66 +36,52 @@ Expire Period (Months) - New Expire Period (Months) - Email - Last Name - First Name - Host - Supervisor - Unit - Most Recent Date yyyy-MM-dd - Comments - Category - Trainee Type - Requirement Name Type - Months Until Renewal - @@ -110,12 +94,11 @@ Essential - ALWAYS_OFF Snooze Until - + 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 0e1f7f50d..6e634ad8b 100644 --- a/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml +++ b/ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml @@ -97,6 +97,7 @@ Snooze Until + yyyy-MM-dd ALWAYS_OFF