Skip to content

25.7 fb training summary report #1605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ohsudev merged 8 commits into from
Jan 15, 2026
Merged

25.7 fb training summary report #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dce56ff
Modified Compliance Training/Summary report to use the same report as
Ohsudev Jan 10, 2026
9a769de
Modified Compliance Training/Summary report to use the same report as
Ohsudev Jan 10, 2026
6620784
Modified Compliance Training/Summary report to use the same report as
Ohsudev Jan 10, 2026
85ab51f
Modified Compliance Employee detailed reports
Ohsudev Jan 13, 2026
811f392
Merge branch 'release25.7-SNAPSHOT' into 25.7_fb_TrainingSummaryReport
Ohsudev Jan 13, 2026
28205b7
Modified Compliance Employee detailed reports
Ohsudev Jan 13, 2026
1a3cbe6
Modified Compliance Employee detailed reports
Ohsudev Jan 13, 2026
a636554
Modified Compliance Employee detailed reports
Ohsudev Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions ..._ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
</column>
<column columnName="requirementname">
<columnTitle>Requirement Name</columnTitle>
<displayWidth>250</displayWidth>
<fk>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>requirements</fkTable>
Expand All @@ -29,7 +28,6 @@
</column>
<column columnName="times_completed">
<columnTitle>Times Completed</columnTitle>
<displayWidth>50</displayWidth>
<url>/query/executeQuery.view?schemaName=ehr_compliancedb&amp;
query.queryName=CompletionDates&amp;
query.EmployeeId~eq=${employeeId}&amp;
Expand All @@ -38,66 +36,52 @@
</column>
<column columnName="expired_period">
<columnTitle>Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="new_expired_period">
<columnTitle>New Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="email">
<columnTitle>Email</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="lastname">
<columnTitle>Last Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="firstname">
<columnTitle>First Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="host">
<columnTitle>Host</columnTitle>
<displayWidth>110</displayWidth>
</column>
<column columnName="supervisor">
<columnTitle>Supervisor</columnTitle>
<displayWidth>150</displayWidth>
</column>

<column columnName="unit">
<columnTitle>Unit</columnTitle>
<displayWidth>210</displayWidth>
</column>
<column columnName="mostrecentcompleted_date">
<columnTitle>Most Recent Date</columnTitle>
<formatString>yyyy-MM-dd</formatString>
<displayWidth>70</displayWidth>
</column>
<column columnName="comment">
<columnTitle>Comments</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="category">
<columnTitle>Category</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="trainee_type">
<columnTitle>Trainee Type</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="requirement_name_type">
<columnTitle>Requirement Name Type</columnTitle>
<displayWidth>180</displayWidth>
</column>
<column columnName="months_until_renewal">
<columnTitle>Months Until Renewal</columnTitle>
<displayWidth>60</displayWidth>
<conditionalFormats>
<conditionalFormat>
<filters>
Expand All @@ -110,12 +94,11 @@

<column columnName="trackingflag">
<columnTitle>Essential</columnTitle>
<displayWidth>60</displayWidth>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>
<column columnName="snooze_date">
<columnTitle>Snooze Until</columnTitle>
<displayWidth>60</displayWidth>
<formatString>yyyy-MM-dd</formatString>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>

Expand Down
20 changes: 1 addition & 19 deletions ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
</column>
<column columnName="requirementname">
<columnTitle>Requirement Name</columnTitle>
<displayWidth>90</displayWidth>
<fk>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>requirements</fkTable>
Expand All @@ -29,7 +28,6 @@
</column>
<column columnName="times_completed">
<columnTitle>Times Completed</columnTitle>
<displayWidth>50</displayWidth>
<url>/query/executeQuery.view?schemaName=ehr_compliancedb&amp;
query.queryName=CompletionDates&amp;
query.EmployeeId~eq=${employeeId}&amp;
Expand All @@ -38,66 +36,51 @@
</column>
<column columnName="expired_period">
<columnTitle>Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="new_expired_period">
<columnTitle>New Expire Period (Months)</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="email">
<columnTitle>Email</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="lastname">
<columnTitle>Last Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="firstname">
<columnTitle>First Name</columnTitle>
<displayWidth>110</displayWidth>
</column>

<column columnName="host">
<columnTitle>Host</columnTitle>
<displayWidth>110</displayWidth>
</column>
<column columnName="supervisor">
<columnTitle>Supervisor</columnTitle>
<displayWidth>150</displayWidth>
</column>

<column columnName="unit">
<columnTitle>Unit</columnTitle>
<displayWidth>210</displayWidth>
</column>
<column columnName="mostrecentcompleted_date">
<columnTitle>Most Recent Date</columnTitle>
<formatString>yyyy-MM-dd</formatString>
<displayWidth>70</displayWidth>
</column>
<column columnName="comment">
<columnTitle>Comments</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="category">
<columnTitle>Category</columnTitle>
<displayWidth>70</displayWidth>
</column>

<column columnName="trainee_type">
<columnTitle>Trainee Type</columnTitle>
<displayWidth>70</displayWidth>
</column>
<column columnName="requirement_name_type">
<columnTitle>Requirement Name Type</columnTitle>
<displayWidth>180</displayWidth>
</column>
<column columnName="months_until_renewal">
<columnTitle>Months Until Renewal</columnTitle>
<displayWidth>60</displayWidth>
<conditionalFormats>
<conditionalFormat>
<filters>
Expand All @@ -110,12 +93,11 @@

<column columnName="trackingflag">
<columnTitle>Essential</columnTitle>
<displayWidth>60</displayWidth>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>
<column columnName="snooze_date">
<columnTitle>Snooze Until</columnTitle>
<displayWidth>60</displayWidth>
<formatString>yyyy-MM-dd</formatString>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
</column>

Expand Down
15 changes: 15 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<script type="text/javascript" nonce="<%=scriptNonce%>">

Ext4.onReady(function (){
if (!LABKEY.ActionURL.getParameter('employeeid')){
alert('Must Provide An Employee Id');
return;
}

var webpart = <%=webpartContext%>;
Ext4.create('EHR_ComplianceDB.panel.EmployeeDetailsPanel', {
employeeId: LABKEY.ActionURL.getParameter('employeeid')
}).render(webpart.wrapperDivId);
});

</script>
8 changes: 8 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<view xmlns="http://labkey.org/data/xml/view" title="Employee Details" frame="none">
<dependencies>
<dependency path="Ext4"/>
<dependency path="LDK/LDKApi"/>
<dependency path="ehr_complianceDB\panel\EmployeeDetailsPanel.js"/>

</dependencies>
</view>
64 changes: 64 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
});
3 changes: 2 additions & 1 deletion ...C_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");


}
Expand Down