Skip to content

[bot] Fast-forward for 26.5.0 #1725

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
github-actions merged 15 commits into from
May 20, 2026
Merged

[bot] Fast-forward for 26.5.0 #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dd09a04
25.11 fb room layout issues (#1700)
Ohsudev Apr 27, 2026
440b17b
25.11 fb clinical template (#1699)
Ohsudev Apr 27, 2026
706b762
Update dates for columns (#1697)
brentlogan Apr 30, 2026
d93aea1
Prevent submit before validation complete (#1683)
labkey-bpatel Apr 30, 2026
d871986
Merge 25.11 to 26.3
labkey-teamcity May 4, 2026
7edf4ba
Merge 26.3 to 26.5
labkey-teamcity May 5, 2026
b4eb275
Modified Print mode Cage Layout to prevent (#1706)
Ohsudev May 6, 2026
ba0baf0
Merge 25.11 to 26.3
labkey-teamcity May 11, 2026
ca742fb
Merge 26.3 to 26.5
labkey-teamcity May 12, 2026
eaf335e
Project enddate validation. (#1705)
kollil May 12, 2026
d577409
25.11 fb caging notification updates (#1701)
Ohsudev May 13, 2026
c5e045a
Modified Compliance Public reports (#1717)
Ohsudev May 13, 2026
4a44b4e
Removed "Behaviors"as a BSU Observation category selection item. (#1718)
Ohsudev May 13, 2026
22ec25d
Merge 25.11 to 26.3
labkey-teamcity May 18, 2026
019cf17
Merge 26.3 to 26.5
labkey-teamcity May 19, 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
16 changes: 16 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<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'),
schemaName: 'EmployeeData'
}).render(webpart.wrapperDivId);
});

</script>
7 changes: 7 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<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>
19 changes: 9 additions & 10 deletions onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,51 @@
<column name="Name"/>
<column name = "CurrentYear">
<properties>
<property name="columnTitle" value="YR66: Current Year"/>
<property name="columnTitle" value="YR67: Current Year"/>
</properties>
</column>

<column name = "year1">
<properties>
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
</properties>
</column>
<column name = "year2">
<properties>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
</properties>
</column>
<column name = "year3">
<properties>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
</properties>
</column>
<column name = "year4">
<properties>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
</properties>
</column>
<column name = "year5">
<properties>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
</properties>
</column>
<column name = "year6">
<properties>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
</properties>
</column>
<column name = "year7">
<properties>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
</properties>
</column>
<column name = "year8">
<properties>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
<property name="columnTitle" value="YR74: 5/1/34-4/30/35"/>
</properties>
</column>


<column name = "DatePosted">
<properties>
<property name="columnTitle" value="Date Calculated"/>
Expand Down
19 changes: 9 additions & 10 deletions onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateSheet/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,51 @@
<column name="Name"/>
<column name = "UnitCost">
<properties>
<property name="columnTitle" value="YR66: Current Year"/>
<property name="columnTitle" value="YR67: Current Year"/>
</properties>
</column>

<column name = "year1">
<properties>
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
</properties>
</column>
<column name = "year2">
<properties>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
</properties>
</column>
<column name = "year3">
<properties>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
</properties>
</column>
<column name = "year4">
<properties>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
</properties>
</column>
<column name = "year5">
<properties>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
</properties>
</column>
<column name = "year6">
<properties>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
</properties>
</column>
<column name = "year7">
<properties>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
</properties>
</column>
<column name = "year8">
<properties>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
<property name="columnTitle" value="YR74: 5/1/34-4/30/35"/>
</properties>
</column>


<column name = "DatePosted">
<properties>
<property name="columnTitle" value="Date Calculated"/>
Expand Down
19 changes: 9 additions & 10 deletions onprc_billingpublic/resources/queries/onprc_billing_public/NIHRates_ReducedFA/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,51 @@
<column name="Name"/>
<column name = "CurrentYear">
<properties>
<property name="columnTitle" value="YR66: Current Year"/>
<property name="columnTitle" value="YR67: Current Year"/>
</properties>
</column>

<column name = "year1">
<properties>
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
</properties>
</column>
<column name = "year2">
<properties>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
</properties>
</column>
<column name = "year3">
<properties>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
</properties>
</column>
<column name = "year4">
<properties>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
</properties>
</column>
<column name = "year5">
<properties>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
</properties>
</column>
<column name = "year6">
<properties>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
</properties>
</column>
<column name = "year7">
<properties>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
</properties>
</column>
<column name = "year8">
<properties>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
<property name="columnTitle" value="YR74: 5/1/34-4/30/35"/>
</properties>
</column>


<column name = "DatePosted">
<properties>
<property name="columnTitle" value="Date Calculated"/>
Expand Down
24 changes: 20 additions & 4 deletions onprc_ehr/resources/queries/ehr_lookups/cageReview.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ SELECT
t.totalWeightExempt,
t.totalHeightExempt


FROM (

SELECT
Expand All @@ -68,6 +69,8 @@ SELECT
sum(CASE WHEN t0.weightExemption IS NULL THEN 0 ELSE 1 END) as totalWeightExempt,
count(t0.heightExemption) as totalHeightExempt



FROM (

SELECT
Expand All @@ -82,11 +85,14 @@ SELECT
group_concat(c1.height) as heights,
f.heightExemption,
CASE
WHEN hf.Id is not null AND c1.height >= pc.cage_type.height THEN 'ERROR: According to the monkeys weight-- it needs a height step taller than required.'
WHEN hf.Id is not null AND c1.height < pc.cage_type.height THEN 'NOTE: According to the monkeys weight-- it needs a height step taller than required.'
WHEN (pc.cage_type.height < c1.height AND f.heightExemption IS NULL) THEN ('ERROR: Insufficient height, ' || h.id ||' needs at least: ' || cast(c1.height AS varchar(50)))
WHEN (pc.cage_type.height < c1.height AND f.heightExemption IS NOT NULL) THEN cast(('NOTE: Height Exemption: ' || h.Id) as varchar(500))
ELSE null
END as heightStatus,
wf.weightExemption
wf.weightExemption,
hf.height_error

FROM ehr_lookups.connectedCages pc

Expand All @@ -98,17 +104,27 @@ LEFT JOIN (
f.id,
min(f.flag.value) as heightExemption
FROM study.flags f
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and f.flag.description like '%exempt%'
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and (f.flag.description like '%height-exempt%' or f.flag.description like '%Medical-exempt%')
GROUP BY f.Id
) f on (f.Id = h.Id)

--weight flags
--height flags
LEFT JOIN (
SELECT
f.id,
min(f.flag.value) as height_error
FROM study.flags f
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and (f.flag.description like '%height-error%')
GROUP BY f.Id
) hf on (hf.Id = h.Id)

---weight flags
LEFT JOIN (
SELECT
f.id,
min(f.flag.value) as weightExemption
FROM study.flags f
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and f.flag.description like '%exempt%'
WHERE f.isActive = true AND f.flag.category = 'Caging Note' and (f.flag.description like '%weight-exempt%' or f.flag.description like '%Medical-exempt%')
GROUP BY f.Id
) wf on (wf.Id = h.Id)

Expand Down
Loading
Loading