Skip to content

Commit d66f8db

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 26.3 to 26.7
2 parents 21772fd + 428cef1 commit d66f8db

10 files changed

Lines changed: 339 additions & 6 deletions

File tree

‎onprc_ehr/resources/queries/study/Procedure_Amended.query.xml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="Procedure_Amended" tableDbType="TABLE" useColumnOrder="true">
5+
<tableTitle>Procedures Amended</tableTitle>
6+
<columns>
7+
<column columnName="Id">
8+
<fk>
9+
<fkDbSchema>study</fkDbSchema>
10+
<fkTable>animal</fkTable>
11+
<fkColumnName>Id</fkColumnName>
12+
</fk>
13+
</column>
14+
<column columnName="date">
15+
<columnTitle>Date</columnTitle>
16+
</column>
17+
18+
<column columnName="procedureid">
19+
<columnTitle>Procedure</columnTitle>
20+
<fk>
21+
<fkDbSchema>ehr_lookups</fkDbSchema>
22+
<fkTable>procedures</fkTable>
23+
<fkColumnName>rowid</fkColumnName>
24+
<fkDisplayColumnName>name</fkDisplayColumnName>
25+
</fk>
26+
</column>
27+
<column columnName="remark">
28+
<columnTitle>Remark</columnTitle>
29+
<isHidden>false</isHidden>
30+
</column>
31+
<column columnName="QCState">
32+
<columnTitle>Status</columnTitle>
33+
<fk>
34+
<fkDbSchema>core</fkDbSchema>
35+
<fkTable>QCState</fkTable>
36+
<fkColumnName>Rowid</fkColumnName>
37+
</fk>
38+
</column>
39+
<column columnName="taskid">
40+
<fk>
41+
<fkDbSchema>ehr</fkDbSchema>
42+
<fkTable>tasks</fkTable>
43+
<fkColumnName>taskid</fkColumnName>
44+
<fkDisplayColumnName>rowid</fkDisplayColumnName>
45+
</fk>
46+
</column>
47+
<column columnName="requestid">
48+
<fk>
49+
<fkDbSchema>ehr</fkDbSchema>
50+
<fkTable>requests</fkTable>
51+
<fkColumnName>requestid</fkColumnName>
52+
<fkDisplayColumnName>rowid</fkDisplayColumnName>
53+
</fk>
54+
</column>
55+
<column columnName="project">
56+
<fk>
57+
<fkDbSchema>ehr</fkDbSchema>
58+
<fkTable>project</fkTable>
59+
<fkColumnName>project</fkColumnName>
60+
</fk>
61+
</column>
62+
<column columnName="chargetype">
63+
<columnTitle>Charge Unit</columnTitle>
64+
<fk>
65+
<fkDbSchema>ehr_lookups</fkDbSchema>
66+
<fkTable>procedureChargeType</fkTable>
67+
<fkColumnName>value</fkColumnName>
68+
</fk>
69+
</column>
70+
<column columnName="type">
71+
<columnTitle>Source</columnTitle>
72+
<fk>
73+
<fkDbSchema>ehr_lookups</fkDbSchema>
74+
<fkTable>encounter_types</fkTable>
75+
<fkColumnName>value</fkColumnName>
76+
</fk>
77+
</column>
78+
<column columnName="lsid">
79+
<isHidden>true</isHidden>
80+
<isKeyField>true</isKeyField>
81+
</column>
82+
</columns>
83+
</table>
84+
</tables>
85+
</metadata>
86+
</query>

‎onprc_ehr/resources/queries/study/Procedure_Amended.sql‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
* Copyright (c) 2013 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
18+
19+
SELECT
20+
t.Id,
21+
t.date,
22+
t.procedureid,
23+
t.qcstate,
24+
t.taskid,
25+
t.type,
26+
t.remark,
27+
t.requestid,
28+
t.chargetype,
29+
t.project,
30+
t.lsid
31+
32+
33+
FROM study.encounters t
34+
Where t.type in ('Procedure')
35+
36+
UNION
37+
38+
SELECT
39+
j.Id,
40+
j.date,
41+
j.procedureid,
42+
j.qcstate,
43+
j.taskid,
44+
j.type,
45+
j.remark,
46+
j.requestid,
47+
j.chargetype,
48+
j.project,
49+
j.lsid
50+
51+
52+
FROM study.encounters j
53+
where j.procedureid.name in ('TB Test Intradermal')
54+
And j.type in ('Surgery')
55+

‎onprc_ehr/resources/queries/study/Procedure_Amended/.qview.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<columns>
3+
<column name="Id"/>
4+
<column name="date"/>
5+
<column name="project"/>
6+
<column name="procedureid"/>
7+
<column name="remark"/>
8+
<column name="QCState"/>
9+
<column name="taskid" />
10+
<column name="requestid" />
11+
<column name="chargetype" />
12+
</columns>
13+
<sorts>
14+
<sort column="date" descending="true"/>
15+
</sorts>
16+
<filters>
17+
<filter column="type" operator="containsnoneof" value="Procedure,Surgery"/>
18+
</filters>
19+
</customView>

‎onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
2+
<columns>
3+
<column name="Id"/>
4+
<column name="date"/>
5+
<column name="project"/>
6+
<column name="procedureid"/>
7+
<column name="remark"/>
8+
<column name="QCState"/>
9+
<column name="taskid" />
10+
<column name="requestid" />
11+
<column name="chargetype" />
12+
<column name="type" />
13+
14+
</columns>
15+
<sorts>
16+
<sort column="date" descending="true"/>
17+
</sorts>
18+
<filters>
19+
<filter column="type" operator="containsoneof" value="Procedure;Surgery"/>
20+
</filters>
21+
</customView>

‎onprc_ehr/resources/queries/study/treatmentSchedule/Clinical Medications.qview.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</sorts>
77
<filters>
88
<filter column="calculated_status" operator="eq" value="Alive"/>
9-
<filter column="category" operator="eq" value="Clinical"/>
9+
<filter column="category" operator="containsoneof" value="Clinical;Clinical on behalf of Research;Clinical on behalf of Surgical"/>
1010
</filters>
1111
</customView>

‎onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
/*
2+
* Copyright (c) 2016-2017 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
5+
*/
6+
7+
//Created 6-7-2016 R.Blasa
8+
EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', {
9+
allQueries: {
10+
11+
},
12+
byQuery: {
13+
14+
'study.pairings': {
15+
16+
outcome: {
17+
hidden: true
18+
},
19+
Id: {
20+
allowBlank: false,
21+
columnConfig: {
22+
width: 100
23+
}
24+
},
25+
infant_id: {
26+
hidden: true
27+
},
28+
29+
eventtype: {
30+
columnConfig: {
31+
width: 250
32+
},
33+
editorConfig: {
34+
caseSensitive: false,
35+
anyMatch: true,
36+
listConfig: {
37+
innerTpl: '{[(values.category ? "<b>" + LABKEY.Utils.encodeHtml(values.category) + ":</b> " : "") + LABKEY.Utils.encodeHtml(values.value)]}',
38+
getInnerTpl: function () {
39+
return this.innerTpl;
40+
}
41+
}
42+
},
43+
lookup: {
44+
xtype: 'combobox',
45+
schemaName: 'ehr_Lookups',
46+
queryName: 'pairingstarttype',
47+
columns: 'value,category,sort_order,date_disabled',
48+
keyColumn: 'value',
49+
displayColumn: 'value',
50+
sort: 'category,value,sort_order',
51+
filterArray: [
52+
LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK),
53+
LABKEY.Filter.create('category', 'STF Clinical', LABKEY.Filter.Types.EQUAL)
54+
]
55+
}
56+
},
57+
outcome: {
58+
hidden: true
59+
},
60+
goal: {
61+
hidden: true
62+
},
63+
endeventType: {
64+
columnConfig: {
65+
width: 250
66+
},
67+
lookup: {
68+
filterArray: [
69+
LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK)
70+
]
71+
}
72+
},
73+
enddate: {
74+
hidden: false
75+
},
76+
separationreason: {
77+
hidden: true
78+
},
79+
observation: {
80+
hidden: true
81+
},
82+
83+
remark2: {
84+
xtype: 'textareafield',
85+
columnConfig: {
86+
width: 200
87+
}
88+
},
89+
room: {
90+
allowBlank: false,
91+
columnConfig: {
92+
width: 130
93+
}
94+
},
95+
cage: {
96+
allowBlank: false,
97+
columnConfig: {
98+
width: 100
99+
}
100+
},
101+
priorgrouphousing: {
102+
hidden: true
103+
},
104+
category: {
105+
allowBlank: false,
106+
columnConfig: {
107+
width: 150
108+
},
109+
lookup: {
110+
filterArray: [
111+
LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK),
112+
LABKEY.Filter.create('value', 'STF Clinical', LABKEY.Filter.Types.EQUAL)
113+
]
114+
}
115+
},
116+
other_infant: {
117+
hidden: true
118+
},
119+
lowestcage: {
120+
hidden: false
121+
},
122+
remark: {
123+
xtype: 'textareafield',
124+
columnConfig: {
125+
width: 200
126+
}
127+
}
128+
129+
}
130+
131+
}
132+
});

‎onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,11 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
533533
}
534534
}
535535
else {
536+
537+
538+
539+
540+
536541
rowItems.push({
537542
border: true,
538543
width: cageWidth,
@@ -658,14 +663,15 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
658663
Ext4.apply(this, {
659664
border: false,
660665
itemId: 'roomLayoutPanel',
661-
width: 1450,
666+
width: 2850,
662667
defaults: {
663668
border: false
664669
},
665670
items: [{
666671
xtype: this.printMode ? 'panel' : 'ldk-webpartpanel',
667672
title: this.printMode ? null : 'Room Layout',
668673
border: false,
674+
autoScroll: !this.printMode,
669675
defaults: {
670676
border: false
671677
},

‎onprc_ehr/resources/web/onprc_ehr/window/AddBehaviorCasesWindow.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Ext4.define('ONPRC_EHR.window.AddBehaviorCasesWindow', {
5050
requiredVersion: 9.1,
5151
schemaName: 'study',
5252
queryName: 'cases',
53-
sort: 'Id/curLocation/location,Id,remark,allProblemCategories',
53+
sort: 'Id/curLocation/room,Id/curLocation/cage,Id,remark,allProblemCategories',
5454
columns: 'Id,objectid,remark,allProblemCategories',
5555
filterArray: casesFilterArray,
5656
scope: this,

‎onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner)
5555
new DrugAdministrationFormSection(ClientDependency.supplierFromPath("onprc_ehr/window/ONPRC_AddScheduledTreatmentWindow.js")),
5656
new TreatmentOrdersFormSection(),
5757
new WeightFormSection(),
58+
new PairingFormSection(),
5859
new SimpleGridPanel("study", "blood", "Blood Draws"),
5960
new SimpleGridPanel("ehr", "snomed_tags", "Diagnostic Codes")
6061
));
@@ -64,6 +65,8 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner)
6465
s.addConfigSource("ClinicalDefaults");
6566
//Added 6-4-2015 Blasa
6667
s.addConfigSource("ClinicalProcedures");
68+
69+
s.addConfigSource("Bulk_Pairing_Properties");
6770
}
6871

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

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

96100
}
97101

0 commit comments

Comments
 (0)