From 2625f08bd68be0b7569c99fbc3622f4c92db674c Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 13 May 2026 09:51:58 -0700 Subject: [PATCH 1/2] Modified Compliance Public reports --- .../resources/views/employeeDetailsPublic.html | 16 ++++++++++++++++ .../views/employeeDetailsPublic.view.xml | 7 +++++++ .../resources/views/onprcPublicPage.html | 2 +- .../panel/EmployeeDetailsPanel.js | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html create mode 100644 ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.view.xml diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html new file mode 100644 index 000000000..35b2a10df --- /dev/null +++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.view.xml b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.view.xml new file mode 100644 index 000000000..2d2c973a7 --- /dev/null +++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.view.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html b/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html index 7b5acb4c6..6a1d919b5 100644 --- a/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html +++ b/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html @@ -21,7 +21,7 @@ },{ xtype: 'ldk-linkbutton', text: '
  • View Employee List
  • ', - href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'EmployeeData', 'query.queryName': 'Employees'}) + href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr_compliancedb', 'query.queryName': 'Employees'}) },{ xtype: 'ldk-linkbutton', text: '
  • View Respirator Protection Quarantine Report
  • ', 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 f0ae92228..249db1f0d 100644 --- a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js +++ b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js @@ -32,7 +32,7 @@ Ext4.define('EHR_ComplianceDB.panel.EmployeeDetailsPanel', { }, { xtype: 'ldk-querypanel', queryConfig: { - title: 'Training / Requirement Summary', + title: 'Training / Requirement SummaryX', schemaName: this.schemaName, queryName: 'ComplianceProcedureRecentTests', //exclude employee training exemptions filterArray: filterArray, From 5e24b863cfb88dc839807a4b5dbb5b407f14054d Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 13 May 2026 12:19:45 -0700 Subject: [PATCH 2/2] Modified Compliance Employees Public reports. --- .../resources/views/employeeDetailsPublic.html | 2 +- ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html | 2 +- .../web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html index 35b2a10df..fd1dbddf8 100644 --- a/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html +++ b/ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html @@ -9,7 +9,7 @@ var webpart = <%=webpartContext%>; Ext4.create('EHR_ComplianceDB.panel.EmployeeDetailsPanel', { employeeId: LABKEY.ActionURL.getParameter('employeeid'), - schemaName: 'ehr_compliancedb' + schemaName: 'EmployeeData' }).render(webpart.wrapperDivId); }); diff --git a/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html b/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html index 6a1d919b5..7b5acb4c6 100644 --- a/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html +++ b/ONPRC_EHR_ComplianceDB/resources/views/onprcPublicPage.html @@ -21,7 +21,7 @@ },{ xtype: 'ldk-linkbutton', text: '
  • View Employee List
  • ', - href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'ehr_compliancedb', 'query.queryName': 'Employees'}) + href: LABKEY.ActionURL.buildURL('query', 'executeQuery', null, {schemaName: 'EmployeeData', 'query.queryName': 'Employees'}) },{ xtype: 'ldk-linkbutton', text: '
  • View Respirator Protection Quarantine Report
  • ', 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 249db1f0d..f0ae92228 100644 --- a/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js +++ b/ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js @@ -32,7 +32,7 @@ Ext4.define('EHR_ComplianceDB.panel.EmployeeDetailsPanel', { }, { xtype: 'ldk-querypanel', queryConfig: { - title: 'Training / Requirement SummaryX', + title: 'Training / Requirement Summary', schemaName: this.schemaName, queryName: 'ComplianceProcedureRecentTests', //exclude employee training exemptions filterArray: filterArray,