Skip to content

[bot] Merge 26.3 to 26.7 #1793

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 9 commits into from
Jul 7, 2026
Merged

[bot] Merge 26.3 to 26.7 #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e771052
Modified BSU Rounds Open Cases sorting. (#1765)
Ohsudev Jun 23, 2026
24cd711
Created a new Animal History report tab called (#1768)
Ohsudev Jun 23, 2026
e00bf46
Modified Bulk Clinical Entry to contain Pairing Observation Entry for…
Ohsudev Jun 23, 2026
6ea70e4
Modified Clinical Medications Online version of the Printable web sit…
Ohsudev Jun 24, 2026
7f7ecb5
Modified Room Layout page to allow scrolling across (#1783)
Ohsudev Jun 25, 2026
bb498d5
Modified Clinical Procedure report to allow Current location selectio…
Ohsudev Jun 29, 2026
428cef1
Modified Colony Management notification to include "Pending" gender B…
Ohsudev Jul 1, 2026
d66f8db
Merge 26.3 to 26.7
labkey-teamcity Jul 7, 2026
a3c71a9
remove unused import (fix build)
cnathe Jul 7, 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
86 changes: 86 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="Procedure_Amended" tableDbType="TABLE" useColumnOrder="true">
<tableTitle>Procedures Amended</tableTitle>
<columns>
<column columnName="Id">
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>animal</fkTable>
<fkColumnName>Id</fkColumnName>
</fk>
</column>
<column columnName="date">
<columnTitle>Date</columnTitle>
</column>

<column columnName="procedureid">
<columnTitle>Procedure</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>procedures</fkTable>
<fkColumnName>rowid</fkColumnName>
<fkDisplayColumnName>name</fkDisplayColumnName>
</fk>
</column>
<column columnName="remark">
<columnTitle>Remark</columnTitle>
<isHidden>false</isHidden>
</column>
<column columnName="QCState">
<columnTitle>Status</columnTitle>
<fk>
<fkDbSchema>core</fkDbSchema>
<fkTable>QCState</fkTable>
<fkColumnName>Rowid</fkColumnName>
</fk>
</column>
<column columnName="taskid">
<fk>
<fkDbSchema>ehr</fkDbSchema>
<fkTable>tasks</fkTable>
<fkColumnName>taskid</fkColumnName>
<fkDisplayColumnName>rowid</fkDisplayColumnName>
</fk>
</column>
<column columnName="requestid">
<fk>
<fkDbSchema>ehr</fkDbSchema>
<fkTable>requests</fkTable>
<fkColumnName>requestid</fkColumnName>
<fkDisplayColumnName>rowid</fkDisplayColumnName>
</fk>
</column>
<column columnName="project">
<fk>
<fkDbSchema>ehr</fkDbSchema>
<fkTable>project</fkTable>
<fkColumnName>project</fkColumnName>
</fk>
</column>
<column columnName="chargetype">
<columnTitle>Charge Unit</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>procedureChargeType</fkTable>
<fkColumnName>value</fkColumnName>
</fk>
</column>
<column columnName="type">
<columnTitle>Source</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>encounter_types</fkTable>
<fkColumnName>value</fkColumnName>
</fk>
</column>
<column columnName="lsid">
<isHidden>true</isHidden>
<isKeyField>true</isKeyField>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
55 changes: 55 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Copyright (c) 2013 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/



SELECT
t.Id,
t.date,
t.procedureid,
t.qcstate,
t.taskid,
t.type,
t.remark,
t.requestid,
t.chargetype,
t.project,
t.lsid


FROM study.encounters t
Where t.type in ('Procedure')

UNION

SELECT
j.Id,
j.date,
j.procedureid,
j.qcstate,
j.taskid,
j.type,
j.remark,
j.requestid,
j.chargetype,
j.project,
j.lsid


FROM study.encounters j
where j.procedureid.name in ('TB Test Intradermal')
And j.type in ('Surgery')

19 changes: 19 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="project"/>
<column name="procedureid"/>
<column name="remark"/>
<column name="QCState"/>
<column name="taskid" />
<column name="requestid" />
<column name="chargetype" />
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="type" operator="containsnoneof" value="Procedure,Surgery"/>
</filters>
</customView>
21 changes: 21 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="project"/>
<column name="procedureid"/>
<column name="remark"/>
<column name="QCState"/>
<column name="taskid" />
<column name="requestid" />
<column name="chargetype" />
<column name="type" />

</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="type" operator="containsoneof" value="Procedure;Surgery"/>
</filters>
</customView>
2 changes: 1 addition & 1 deletion onprc_ehr/resources/queries/study/treatmentSchedule/Clinical Medications.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
</sorts>
<filters>
<filter column="calculated_status" operator="eq" value="Alive"/>
<filter column="category" operator="eq" value="Clinical"/>
<filter column="category" operator="containsoneof" value="Clinical;Clinical on behalf of Research;Clinical on behalf of Surgical"/>
</filters>
</customView>
132 changes: 132 additions & 0 deletions onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/*
* Copyright (c) 2016-2017 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
*/

//Created 6-7-2016 R.Blasa
EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', {
allQueries: {

},
byQuery: {

'study.pairings': {

outcome: {
hidden: true
},
Id: {
allowBlank: false,
columnConfig: {
width: 100
}
},
infant_id: {
hidden: true
},

eventtype: {
columnConfig: {
width: 250
},
editorConfig: {
caseSensitive: false,
anyMatch: true,
listConfig: {
innerTpl: '{[(values.category ? "<b>" + LABKEY.Utils.encodeHtml(values.category) + ":</b> " : "") + LABKEY.Utils.encodeHtml(values.value)]}',
getInnerTpl: function () {
return this.innerTpl;
}
}
},
lookup: {
xtype: 'combobox',
schemaName: 'ehr_Lookups',
queryName: 'pairingstarttype',
columns: 'value,category,sort_order,date_disabled',
keyColumn: 'value',
displayColumn: 'value',
sort: 'category,value,sort_order',
filterArray: [
LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK),
LABKEY.Filter.create('category', 'STF Clinical', LABKEY.Filter.Types.EQUAL)
]
}
},
outcome: {
hidden: true
},
goal: {
hidden: true
},
endeventType: {
columnConfig: {
width: 250
},
lookup: {
filterArray: [
LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK)
]
}
},
enddate: {
hidden: false
},
separationreason: {
hidden: true
},
observation: {
hidden: true
},

remark2: {
xtype: 'textareafield',
columnConfig: {
width: 200
}
},
room: {
allowBlank: false,
columnConfig: {
width: 130
}
},
cage: {
allowBlank: false,
columnConfig: {
width: 100
}
},
priorgrouphousing: {
hidden: true
},
category: {
allowBlank: false,
columnConfig: {
width: 150
},
lookup: {
filterArray: [
LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK),
LABKEY.Filter.create('value', 'STF Clinical', LABKEY.Filter.Types.EQUAL)
]
}
},
other_infant: {
hidden: true
},
lowestcage: {
hidden: false
},
remark: {
xtype: 'textareafield',
columnConfig: {
width: 200
}
}

}

}
});
8 changes: 7 additions & 1 deletion 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 @@ -533,6 +533,11 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
}
}
else {





rowItems.push({
border: true,
width: cageWidth,
Expand Down Expand Up @@ -658,14 +663,15 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
Ext4.apply(this, {
border: false,
itemId: 'roomLayoutPanel',
width: 1450,
width: 2850,
defaults: {
border: false
},
items: [{
xtype: this.printMode ? 'panel' : 'ldk-webpartpanel',
title: this.printMode ? null : 'Room Layout',
border: false,
autoScroll: !this.printMode,
defaults: {
border: false
},
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/resources/web/onprc_ehr/window/AddBehaviorCasesWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Ext4.define('ONPRC_EHR.window.AddBehaviorCasesWindow', {
requiredVersion: 9.1,
schemaName: 'study',
queryName: 'cases',
sort: 'Id/curLocation/location,Id,remark,allProblemCategories',
sort: 'Id/curLocation/room,Id/curLocation/cage,Id,remark,allProblemCategories',
columns: 'Id,objectid,remark,allProblemCategories',
filterArray: casesFilterArray,
scope: this,
Expand Down
6 changes: 5 additions & 1 deletion onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner)
new DrugAdministrationFormSection(ClientDependency.supplierFromPath("onprc_ehr/window/ONPRC_AddScheduledTreatmentWindow.js")),
new TreatmentOrdersFormSection(),
new WeightFormSection(),
new PairingFormSection(),
new SimpleGridPanel("study", "blood", "Blood Draws"),
new SimpleGridPanel("ehr", "snomed_tags", "Diagnostic Codes")
));
Expand All @@ -64,6 +65,8 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner)
s.addConfigSource("ClinicalDefaults");
//Added 6-4-2015 Blasa
s.addConfigSource("ClinicalProcedures");

s.addConfigSource("Bulk_Pairing_Properties");
}

addClientDependency(ClientDependency.supplierFromPath("ehr/model/sources/ClinicalDefaults.js"));
Expand Down Expand Up @@ -91,7 +94,8 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner)
//Added 11-4-2025 R. Blasa
addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/FormTemplateWindow.js"));


//Added 6-22-2026 R.Blasa
addClientDependency(ClientDependency.supplierFromPath("/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js"));

}

Expand Down
Loading
Loading