Skip to content

Commit 25fdaa4

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 26.1 to develop
2 parents ffb1020 + d0c36da commit 25fdaa4

11 files changed

Lines changed: 119 additions & 46 deletions

File tree

‎ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceProcedureRecentTests.query.xml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
</column>
2020
<column columnName="requirementname">
2121
<columnTitle>Requirement Name</columnTitle>
22-
<displayWidth>250</displayWidth>
2322
<fk>
2423
<fkDbSchema>ehr_compliancedb</fkDbSchema>
2524
<fkTable>requirements</fkTable>
@@ -29,7 +28,6 @@
2928
</column>
3029
<column columnName="times_completed">
3130
<columnTitle>Times Completed</columnTitle>
32-
<displayWidth>50</displayWidth>
3331
<url>/query/executeQuery.view?schemaName=ehr_compliancedb&amp;
3432
query.queryName=CompletionDates&amp;
3533
query.EmployeeId~eq=${employeeId}&amp;
@@ -38,66 +36,52 @@
3836
</column>
3937
<column columnName="expired_period">
4038
<columnTitle>Expire Period (Months)</columnTitle>
41-
<displayWidth>70</displayWidth>
4239
</column>
4340
<column columnName="new_expired_period">
4441
<columnTitle>New Expire Period (Months)</columnTitle>
45-
<displayWidth>70</displayWidth>
4642
</column>
4743

4844
<column columnName="email">
4945
<columnTitle>Email</columnTitle>
50-
<displayWidth>70</displayWidth>
5146
</column>
5247

5348
<column columnName="lastname">
5449
<columnTitle>Last Name</columnTitle>
55-
<displayWidth>110</displayWidth>
5650
</column>
5751

5852
<column columnName="firstname">
5953
<columnTitle>First Name</columnTitle>
60-
<displayWidth>110</displayWidth>
6154
</column>
6255

6356
<column columnName="host">
6457
<columnTitle>Host</columnTitle>
65-
<displayWidth>110</displayWidth>
6658
</column>
6759
<column columnName="supervisor">
6860
<columnTitle>Supervisor</columnTitle>
69-
<displayWidth>150</displayWidth>
7061
</column>
7162

7263
<column columnName="unit">
7364
<columnTitle>Unit</columnTitle>
74-
<displayWidth>210</displayWidth>
7565
</column>
7666
<column columnName="mostrecentcompleted_date">
7767
<columnTitle>Most Recent Date</columnTitle>
7868
<formatString>yyyy-MM-dd</formatString>
79-
<displayWidth>70</displayWidth>
8069
</column>
8170
<column columnName="comment">
8271
<columnTitle>Comments</columnTitle>
83-
<displayWidth>70</displayWidth>
8472
</column>
8573
<column columnName="category">
8674
<columnTitle>Category</columnTitle>
87-
<displayWidth>70</displayWidth>
8875
</column>
8976

9077
<column columnName="trainee_type">
9178
<columnTitle>Trainee Type</columnTitle>
92-
<displayWidth>70</displayWidth>
9379
</column>
9480
<column columnName="requirement_name_type">
9581
<columnTitle>Requirement Name Type</columnTitle>
96-
<displayWidth>180</displayWidth>
9782
</column>
9883
<column columnName="months_until_renewal">
9984
<columnTitle>Months Until Renewal</columnTitle>
100-
<displayWidth>60</displayWidth>
10185
<conditionalFormats>
10286
<conditionalFormat>
10387
<filters>
@@ -110,12 +94,11 @@
11094

11195
<column columnName="trackingflag">
11296
<columnTitle>Essential</columnTitle>
113-
<displayWidth>60</displayWidth>
11497
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
11598
</column>
11699
<column columnName="snooze_date">
117100
<columnTitle>Snooze Until</columnTitle>
118-
<displayWidth>60</displayWidth>
101+
<formatString>yyyy-MM-dd</formatString>
119102
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
120103
</column>
121104

‎ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/ComplianceRecentTests.query.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
</column>
2020
<column columnName="requirementname">
2121
<columnTitle>Requirement Name</columnTitle>
22-
<displayWidth>90</displayWidth>
2322
<fk>
2423
<fkDbSchema>ehr_compliancedb</fkDbSchema>
2524
<fkTable>requirements</fkTable>
@@ -29,7 +28,6 @@
2928
</column>
3029
<column columnName="times_completed">
3130
<columnTitle>Times Completed</columnTitle>
32-
<displayWidth>50</displayWidth>
3331
<url>/query/executeQuery.view?schemaName=ehr_compliancedb&amp;
3432
query.queryName=CompletionDates&amp;
3533
query.EmployeeId~eq=${employeeId}&amp;
@@ -38,66 +36,51 @@
3836
</column>
3937
<column columnName="expired_period">
4038
<columnTitle>Expire Period (Months)</columnTitle>
41-
<displayWidth>70</displayWidth>
4239
</column>
4340
<column columnName="new_expired_period">
4441
<columnTitle>New Expire Period (Months)</columnTitle>
45-
<displayWidth>70</displayWidth>
4642
</column>
4743

4844
<column columnName="email">
4945
<columnTitle>Email</columnTitle>
50-
<displayWidth>70</displayWidth>
5146
</column>
52-
5347
<column columnName="lastname">
5448
<columnTitle>Last Name</columnTitle>
55-
<displayWidth>110</displayWidth>
5649
</column>
5750

5851
<column columnName="firstname">
5952
<columnTitle>First Name</columnTitle>
60-
<displayWidth>110</displayWidth>
6153
</column>
6254

6355
<column columnName="host">
6456
<columnTitle>Host</columnTitle>
65-
<displayWidth>110</displayWidth>
6657
</column>
6758
<column columnName="supervisor">
6859
<columnTitle>Supervisor</columnTitle>
69-
<displayWidth>150</displayWidth>
7060
</column>
7161

7262
<column columnName="unit">
7363
<columnTitle>Unit</columnTitle>
74-
<displayWidth>210</displayWidth>
7564
</column>
7665
<column columnName="mostrecentcompleted_date">
7766
<columnTitle>Most Recent Date</columnTitle>
7867
<formatString>yyyy-MM-dd</formatString>
79-
<displayWidth>70</displayWidth>
8068
</column>
8169
<column columnName="comment">
8270
<columnTitle>Comments</columnTitle>
83-
<displayWidth>70</displayWidth>
8471
</column>
8572
<column columnName="category">
8673
<columnTitle>Category</columnTitle>
87-
<displayWidth>70</displayWidth>
8874
</column>
8975

9076
<column columnName="trainee_type">
9177
<columnTitle>Trainee Type</columnTitle>
92-
<displayWidth>70</displayWidth>
9378
</column>
9479
<column columnName="requirement_name_type">
9580
<columnTitle>Requirement Name Type</columnTitle>
96-
<displayWidth>180</displayWidth>
9781
</column>
9882
<column columnName="months_until_renewal">
9983
<columnTitle>Months Until Renewal</columnTitle>
100-
<displayWidth>60</displayWidth>
10184
<conditionalFormats>
10285
<conditionalFormat>
10386
<filters>
@@ -110,12 +93,11 @@
11093

11194
<column columnName="trackingflag">
11295
<columnTitle>Essential</columnTitle>
113-
<displayWidth>60</displayWidth>
11496
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
11597
</column>
11698
<column columnName="snooze_date">
11799
<columnTitle>Snooze Until</columnTitle>
118-
<displayWidth>60</displayWidth>
100+
<formatString>yyyy-MM-dd</formatString>
119101
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
120102
</column>
121103

‎ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<script type="text/javascript" nonce="<%=scriptNonce%>">
2+
3+
Ext4.onReady(function (){
4+
if (!LABKEY.ActionURL.getParameter('employeeid')){
5+
alert('Must Provide An Employee Id');
6+
return;
7+
}
8+
9+
var webpart = <%=webpartContext%>;
10+
Ext4.create('EHR_ComplianceDB.panel.EmployeeDetailsPanel', {
11+
employeeId: LABKEY.ActionURL.getParameter('employeeid')
12+
}).render(webpart.wrapperDivId);
13+
});
14+
15+
</script>

‎ONPRC_EHR_ComplianceDB/resources/views/employeeDetails.view.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<view xmlns="http://labkey.org/data/xml/view" title="Employee Details" frame="none">
2+
<dependencies>
3+
<dependency path="Ext4"/>
4+
<dependency path="LDK/LDKApi"/>
5+
<dependency path="ehr_complianceDB\panel\EmployeeDetailsPanel.js"/>
6+
7+
</dependencies>
8+
</view>

‎ONPRC_EHR_ComplianceDB/resources/web/EHR_ComplianceDB/panel/EmployeeDetailsPanel.js‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Copyright (c) 2013-2019 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
5+
*/
6+
/**
7+
* @cfg employeeId
8+
* @cfg schemaName
9+
*/
10+
Ext4.define('EHR_ComplianceDB.panel.EmployeeDetailsPanel', {
11+
extend: 'Ext.panel.Panel',
12+
schemaName: 'ehr_complianceDB',
13+
14+
initComponent: function(){
15+
var filterArray = [LABKEY.Filter.create('employeeid', this.employeeId, LABKEY.Filter.Types.EQUAL)];
16+
17+
Ext4.apply(this, {
18+
border: false,
19+
defaults: {
20+
border: false,
21+
style: 'margin-bottom: 20px;'
22+
},
23+
items: [{
24+
xtype: 'ldk-detailspanel',
25+
store: {
26+
schemaName: this.schemaName,
27+
queryName: 'employees',
28+
filterArray: filterArray
29+
},
30+
showBackBtn: false,
31+
title: 'Employee Details'
32+
}, {
33+
xtype: 'ldk-querypanel',
34+
queryConfig: {
35+
title: 'Training / Requirement Summary',
36+
schemaName: this.schemaName,
37+
queryName: 'ComplianceProcedureRecentTests', //exclude employee training exemptions
38+
filterArray: filterArray,
39+
failure: LDK.Utils.getErrorCallback()
40+
}
41+
},{
42+
xtype: 'ldk-querypanel',
43+
queryConfig: {
44+
title: 'Exemptions From Training Requirements',
45+
schemaName: this.schemaName,
46+
queryName: 'employeerequirementexemptions',
47+
filterArray: filterArray,
48+
failure: LDK.Utils.getErrorCallback()
49+
}
50+
},{
51+
xtype: 'ldk-querypanel',
52+
queryConfig: {
53+
title: 'Training History',
54+
schemaName: this.schemaName,
55+
queryName: 'completionDates',
56+
filterArray: filterArray,
57+
failure: LDK.Utils.getErrorCallback()
58+
}
59+
}]
60+
});
61+
62+
this.callParent();
63+
}
64+
});

‎ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
110110
// Added: 10-24-2022 R.Blasa
111111
EHRService.get().registerMoreActionsButton(new ShowEditUIButton(this, "ehr_compliancedb", "completiondates", ONPRC_ComplianceDBEntryPermission.class), "ehr_compliancedb", "completiondates");
112112

113-
113+
// Added 1-8-2026
114+
EHRService.get().registerActionOverride("employeeDetails", this, "employeeDetails.html");
114115

115116

116117
}

‎onprc_billing/resources/queries/onprc_billing/chargeRates.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,18 @@ function beforeUpdate(row, errors){
1616

1717
function beforeUpsert(row, errors){
1818
if (row.startDate){
19+
// normalize to date-only (00:00)
1920
row.startDate = ldkUtils.removeTimeFromDate(row.startDate);
2021
}
2122

2223
if (row.endDate){
23-
row.endDate = ldkUtils.removeTimeFromDate(row.endDate);
24+
// normalize to date-only first
25+
var cleanDate = ldkUtils.removeTimeFromDate(row.endDate);
26+
27+
// create a new date object set to 23:59
28+
var endOfDay = new Date(cleanDate);
29+
endOfDay.setHours(23, 59, 0, 0);
30+
31+
row.endDate = endOfDay;
2432
}
2533
}

‎onprc_billing/resources/queries/onprc_billing/chargeRates/Active Rates.qview.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<sort column="startDate" descending="true"/>
55
</sorts>
66
<filters>
7-
<filter column="enddateCoalesced" operator="dategte" value="-0d"/>
7+
<filter column="enddateCoalesced" operator="dategte" value="-0d"/> <!--changed to overwright is Active-->
88
</filters>
99
</customView>

‎onprc_billing/resources/queries/onprc_billing/miscCharges.query.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<fkDbSchema>core</fkDbSchema>
1717
<fkTable>qcstate</fkTable>
1818
<fkColumnName>rowid</fkColumnName>
19-
</fk>
19+
</fk>
2020
</column>
2121
<column columnName="chargetype">
2222
<columnTitle>Charge Unit</columnTitle>
@@ -27,6 +27,17 @@
2727
<fkDisplayColumnName useRawValue="true"/>
2828
</fk>
2929
</column>
30+
<column columnName="sourceInvoicedItem">
31+
<columnTitle>Source Transaction</columnTitle>
32+
<isHidden>false</isHidden>
33+
<fk>
34+
<fkFolderPath>/ONPRC/Admin/Finance</fkFolderPath>
35+
<fkDbSchema>onprc_billing</fkDbSchema>
36+
<fkTable>invoicedItems</fkTable>
37+
<fkColumnName>objectid</fkColumnName>
38+
<fkDisplayColumnName>transactionNumber</fkDisplayColumnName>
39+
</fk>
40+
</column>
3041
<column columnName="chargecategory">
3142
<fk>
3243
<fkDbSchema>onprc_billing</fkDbSchema>

‎onprc_billing/resources/schemas/onprc_billing.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,11 @@
419419
<columnTitle>Source Transaction</columnTitle>
420420
<isHidden>true</isHidden>
421421
<fk>
422+
<fkFolderPath>/ONPRC/Admin/Finance</fkFolderPath>
422423
<fkDbSchema>onprc_billing</fkDbSchema>
423424
<fkTable>invoicedItems</fkTable>
424425
<fkColumnName>objectid</fkColumnName>
425-
<fkDisplayColumnName>rowid</fkDisplayColumnName>
426+
<fkDisplayColumnName>transactionNumber</fkDisplayColumnName> <!--Changed to allow Transaction number to display-->
426427
</fk>
427428
</column>
428429
<column columnName="chargeCategory">
@@ -1152,11 +1153,11 @@
11521153
</column>
11531154
<column columnName="grantNumber">
11541155
<columnTitle>OGA Grant Number</columnTitle>
1155-
1156+
11561157
</column>
11571158
<column columnName="agencyAwardNumber">
11581159
<columnTitle>Agency Award Number</columnTitle>
1159-
1160+
11601161
</column>
11611162
<column columnName="investigatorId">
11621163
<columnTitle>Investigator</columnTitle>
@@ -1641,4 +1642,4 @@
16411642

16421643
</columns>
16431644
</table>
1644-
</tables>
1645+
</tables>

0 commit comments

Comments
 (0)