Skip to content

[bot] Merge 25.11 to 26.3 #1708

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 5 commits into from
May 4, 2026
Merged

[bot] Merge 25.11 to 26.3 #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 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
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: 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
8 changes: 4 additions & 4 deletions onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {

var rooms = Ext4.Object.getKeys(roomMap).sort();
var dividerWidth = 3;
var height = 115;
var cageWidth = 51; //Modified: 10-15-2020
var height = 75;
var cageWidth = 60;
var hasCages = false;

Ext4.each(rooms, function(room, roomIdx){
if (roomIdx == 0 && !config.printMode){
toAdd.push(ONPRC.panel.RoomLayoutPanel.getButtonCfgs(config));
toAdd.push({
style: 'margin-bottom: 20px;',
style: 'margin-bottom: 5px;',
border: false
});
}
Expand Down Expand Up @@ -244,7 +244,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
border: false
});

//Modified: 8-19-2019 R. Blasa Added Divider Legends Not eeded at this time
//Modified: 8-19-2019 R. Blasa Added Divider Legends Not needed at this time
currentSection.push({

//Modified: 4/3/2023 R.Blasa
Expand Down
Binary file removed onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessing.xlsx
View file
Open in desktop
Binary file not shown.
Binary file modified onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate.xlsx
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified onprc_ehr/resources/web/onprc_ehr/templates/ClinicalProcessingTemplate_TPR_Master.xlsx
100644 → 100755
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ Ext4.define('ONPRC_EHR.window.ClinicalProcessingWindow', {
{snomedcode = 'F-31030'}
if (row[7]== 3 )
{snomedcode = 'F-31040'}
if (row[7]== 'No' )
{snomedcode = 'F-30980'}
var obj = {
Id: id,
date: this.getTime(date, times, errors, rowIdx),
Expand Down
2 changes: 2 additions & 0 deletions onprc_ehr/resources/web/onprc_ehr/window/ClinicalMassProcessing_TPR.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,8 @@ Ext4.define('ONPRC_EHR.window.ClinicalProcessingTPRWindow', {
{snomedcode = 'F-31030'}
if (row[10]== 3 )
{snomedcode = 'F-31040'}
if (row[10]== 'No' )
{snomedcode = 'F-30980'}
var obj = {
Id: id,
date: this.getTime(date, times, errors, rowIdx),
Expand Down
Loading
Loading