Skip to content

Commit cb786d3

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 25.7 to develop
2 parents 2df17ef + 28a157b commit cb786d3

14 files changed

Lines changed: 180 additions & 26 deletions

File tree

‎onprc_ehr/resources/queries/onprc_ehr/CenterProjectstemp.query.xml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<query xmlns="http://labkey.org/data/xml/query">
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="CenterProjectsTemp" tableDbType="TABLE">
5+
<tableTitle>Center Projects Historical Data</tableTitle>
6+
<columns>
7+
<column columnName="Searchid">
8+
<isHidden>true</isHidden>
9+
</column>
10+
<column columnName="project">
11+
<columnTitle>Center Project</columnTitle>
12+
<displayWidth>80</displayWidth>
13+
<fk>
14+
<fkDbSchema>ehr</fkDbSchema>
15+
<fkTable>project</fkTable>
16+
<fkColumnName>project</fkColumnName>
17+
<fkDisplayColumnName>name</fkDisplayColumnName>
18+
</fk>
19+
</column>
20+
<column columnName="protocol">
21+
<columnTitle>IACUC Protocol</columnTitle>
22+
<fk>
23+
<fkDbSchema>ehr</fkDbSchema>
24+
<fkTable>protocol</fkTable>
25+
<fkColumnName>protocol</fkColumnName>
26+
<fkDisplayColumnName>displayName</fkDisplayColumnName>
27+
</fk>
28+
</column>
29+
<column columnName="account"/>
30+
<column columnName="title"/>
31+
<column columnName="research">
32+
<isHidden>true</isHidden>
33+
</column>
34+
<column columnName="investigatorId">
35+
<columnTitle>Investigator</columnTitle>
36+
<fk>
37+
<fkDbSchema>onprc_ehr</fkDbSchema>
38+
<fkTable>investigators</fkTable>
39+
<fkColumnName>rowid</fkColumnName>
40+
<fkDisplayColumnName>lastName</fkDisplayColumnName>
41+
</fk>
42+
</column>
43+
<column columnName="startdate">
44+
<columnTitle>Start Date</columnTitle>
45+
<formatString>Date</formatString>
46+
</column>
47+
<column columnName="enddate">
48+
<columnTitle>End Date</columnTitle>
49+
<formatString>Date</formatString>
50+
</column>
51+
<column columnName="use_category">
52+
<fk>
53+
<fkDbSchema>ehr_lookups</fkDbSchema>
54+
<fkTable>project_use_category</fkTable>
55+
<fkColumnName>value</fkColumnName>
56+
<fkDisplayColumnName useRawValue="true"/>
57+
</fk>
58+
</column>
59+
<column columnName="projectType">
60+
<fk>
61+
<fkDbSchema>ehr_lookups</fkDbSchema>
62+
<fkTable>project_types</fkTable>
63+
<fkColumnName>value</fkColumnName>
64+
<fkDisplayColumnName useRawValue="true"/>
65+
</fk>
66+
</column>
67+
<column columnName="objectid">
68+
<isHidden>true</isHidden>
69+
</column>
70+
<column columnName="created">
71+
<isHidden>true</isHidden>
72+
</column>
73+
<column columnName="createdby">
74+
<isHidden>true</isHidden>
75+
</column> <column columnName="created">
76+
<isHidden>true</isHidden>
77+
</column>
78+
<column columnName="modified">
79+
<isHidden>true</isHidden>
80+
</column>
81+
<column columnName="modifiedby">
82+
<isHidden>true</isHidden>
83+
</column>
84+
<column columnName="displayname">
85+
<isHidden>true</isHidden>
86+
</column>
87+
<column columnName="date_posted"/>
88+
</columns>
89+
</table>
90+
</tables>
91+
</metadata>
92+
</query>
93+
94+

‎onprc_ehr/resources/queries/onprc_ehr/projectNotification.sql‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
SELECT proj.project,
3+
group_concat(proj.name) as name,
4+
group_concat(proj.project) as project,
5+
group_concat(proj.investigatorid) as investigatorid,
6+
group_concat(proj.startdate) as startdate,
7+
group_concat(proj.enddate) as enddate,
8+
( select group_concat(cps.enddate) from onprc_ehr.CenterProjectsTemp cps where cps.project = proj.project
9+
And cps.date_posted in (select max(j.date_posted)
10+
from onprc_ehr.CenterProjectsTemp j where j.project = proj.project ) )as previousdate,
11+
group_concat(proj.protocol.external_iD) as protocolID
12+
13+
FROM ehr.project proj
14+
WHERE (proj.enddate is null or proj.enddate >= now() )
15+
And proj.modified >= cast(now() as date)
16+
17+
18+
group by proj.project
19+

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ INNER JOIN ehr_lookups.species p on (m.Id.DataSet.demographics.species = p.commo
2626
And m.date in (select max(s.date) AS d from study.pregnancyConfirmation s where s.id = m.id)
2727
And m.Id.DataSet.demographics.calculated_status.code = 'Alive'
2828
And p.Gestation is not null
29-
And m.outcome.birthDate is null And (Select count(*) from ehr.snomed_tags stg where stg.code.code = 'F-30980' And stg.id = m.id
29+
And (m.outcome.birthDate >= cast(now() as date) or m.outcome.birthDate is null)
30+
And (Select count(*) from ehr.snomed_tags stg where stg.code.code = 'F-30980' And stg.id = m.id
3031
And stg.date >= m.date ) = 0
31-
And m.gestation_days is not null
32+
And m.gestation_days is not null
33+

‎onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-24.011-24.012.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE onprc_ehr.CenterProjectsTemp ALTER COLUMN protocol VARCHAR(400);
2+
GO

‎onprc_ehr/resources/schemas/onprc_ehr.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,8 +1431,8 @@
14311431
<column columnName="modifiedby"/>
14321432
<column columnName="startdate"/>
14331433
<column columnName="enddate"/>
1434-
<column columnName="displayname"/>
14351434
<column columnName="investigatorid"/>
1435+
<column columnName="displayname"/>
14361436
<column columnName="use_category"/>
14371437
<column columnName="projecttype"/>
14381438
<column columnName="objectid"/>

‎onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,13 +1261,20 @@ exports.init = function(EHR){
12611261
}
12621262
});
12631263

1264-
//Added 3-5-2019 R.Blasa
1265-
EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.AFTER_INSERT, 'ehr', 'project', function(helper, scriptErrors, row, oldRow){
1266-
1264+
//Modified 5-30-2025 R.Blasa
1265+
EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.AFTER_UPSERT, 'ehr', 'project', function(helper, errors, row, oldRow){
12671266
var triggerHelper = new org.labkey.onprc_ehr.query.ONPRC_EHRTriggerHelper(LABKEY.Security.currentUser.id, LABKEY.Security.currentContainer.id);
12681267

1269-
if (row.project){
1270-
console.log("project data collected " + row.project)
1268+
if (row.project || (oldRow.enddate != row.enddate) ){
1269+
console.log("project data added, or end date updated " + row.project)
1270+
var msg = triggerHelper.sendProjectNotifications(row.project);
1271+
if (msg){
1272+
EHR.Server.Utils.addError(scriptErrors, 'project', msg, 'ERROR');
1273+
}
1274+
}
1275+
1276+
else if (row.project && (row.date != null && (row.enddate == null || row.enddate >= now()) ) ){
1277+
console.log("project data added, or end date updated " + row.project)
12711278
var msg = triggerHelper.sendProjectNotifications(row.project);
12721279
if (msg){
12731280
EHR.Server.Utils.addError(scriptErrors, 'project', msg, 'ERROR');

‎onprc_ehr/resources/web/onprc_ehr/data/sources/ONPRCDefaults.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@ EHR.model.DataModelManager.registerMetadata('Default', {
3232
defaultHour: 23,
3333
defaultMinutes: 59
3434
}
35+
},
36+
date: {
37+
inheritDateFromParent: false,
38+
getInitialValue: function(v, rec){
39+
if (v)
40+
return v;
41+
42+
var ret = Ext4.Date.clearTime(new Date());
43+
ret = Ext4.Date.add(ret, Ext4.Date.DAY, 1);
44+
ret.setHours(8);
45+
return ret;
46+
}
3547
}
3648
},
3749

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,18 @@ EHR.model.DataModelManager.registerMetadata('onprc_Surgery', {
3535
shownInGrid: true,
3636
defaultValue: 'Surgical',
3737
allowBlank: false
38+
},
39+
date: {
40+
inheritDefaultDateFromParent: false,
41+
getInitialValue: function(v, rec){
42+
if (v)
43+
return v;
44+
45+
var ret = Ext4.Date.clearTime(new Date());
46+
ret = Ext4.Date.add(ret, Ext4.Date.DAY, 1);
47+
ret.setHours(8);
48+
return ret;
49+
}
3850
}
3951

4052
},

‎onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public String getName()
129129
@Override
130130
public @Nullable Double getSchemaVersion()
131131
{
132-
return 24.011;
132+
return 24.012;
133133
}
134134

135135
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public EncounterChildFormSection(String schemaName, String queryName, String lab
4444
// Modified: 2-13-2025 R. Blasa
4545
addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/AddProcedureDefaultsWindow.js"));
4646

47-
addConfigSource("Encounter");
4847
addConfigSource("EncounterChild");
4948

5049
setTemplateMode(TEMPLATE_MODE.ENCOUNTER);

0 commit comments

Comments
 (0)