Skip to content

Commit bfa5122

Browse files
labkey-martyplabkey-martyp
committed
Updates for required performedby field
1 parent fc35889 commit bfa5122

15 files changed

Lines changed: 1015 additions & 892 deletions

File tree

‎nirc_ehr/resources/queries/study/arrival.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
5151
Id: row.Id,
5252
date: row.birth,
5353
qcstate: row.qcstate,
54-
taskid: row.taskid
54+
taskid: row.taskid,
55+
performedby: row.performedby
5556
}
5657

5758
var birthErrors = triggerHelper.saveBirthRecord(row.Id, birthInfo);
@@ -67,7 +68,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
6768
date: row.date,
6869
taskid: row.taskid,
6970
remark: row.remark,
70-
qcstate: row.qcstate
71+
qcstate: row.qcstate,
72+
performedby: row.performedby
7173
}
7274

7375
if (row.project) {
@@ -89,7 +91,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
8991
cage: row.cage,
9092
taskid: row.taskid,
9193
qcstate: row.qcstate,
92-
reason: row.arrivalType
94+
reason: row.arrivalType,
95+
performedby: row.performedby
9396
}
9497

9598
var housingErrors = triggerHelper.createHousingRecord(row.Id, housingRec, "arrival");
@@ -152,6 +155,12 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
152155
hasUpdates = true;
153156
}
154157

158+
if (row.performedby && row.performedby !== data.performedby)
159+
{
160+
obj.performedby = row.performedby;
161+
hasUpdates = true;
162+
}
163+
155164
if (hasUpdates)
156165
{
157166
console.info("Arrival update for animal Id " + row.Id + " included demographic changes Demographic record updated.");

‎nirc_ehr/resources/queries/study/birth.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
3838
date: row.date,
3939
taskid: row.taskid,
4040
remark: row.remark,
41-
qcstate: row.qcstate
41+
qcstate: row.qcstate,
42+
performedby: row.performedby
4243
}
4344

4445
if (row.project) {
@@ -62,7 +63,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
6263
cage: row.cage,
6364
taskid: row.taskid,
6465
qcstate: row.qcstate,
65-
reason: 'Husbandry'
66+
reason: 'Husbandry',
67+
performedby: row.performedby
6668
}
6769

6870
var housingErrors = triggerHelper.createHousingRecord(row.Id, housingRec, "birth");
@@ -87,7 +89,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
8789
gender: row['Id/demographics/gender'] || null,
8890
taskid: row.taskid,
8991
remark: row.remark,
90-
QCStateLabel: row.QCStateLabel
92+
QCStateLabel: row.QCStateLabel,
93+
performedby: row.performedby
9194
};
9295

9396
//find dam, if provided
@@ -136,6 +139,11 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
136139
hasUpdates = true;
137140
}
138141

142+
if (obj.performedby && obj.performedby !== data.performedby) {
143+
record.performedby = obj.performedby;
144+
hasUpdates = true;
145+
}
146+
139147
if (obj.QCStateLabel && obj.QCStateLabel !== data.QCStateLabel) {
140148
record.QCStateLabel = obj.QCStateLabel;
141149
hasUpdates = true;

‎nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public String createHousingRecord(String id, Map<String, Object> row, String for
110110
Date date = ConvertHelper.convert(row.get("date"), Date.class);
111111
String location = ConvertHelper.convert(row.get("cage"), String.class);
112112
String reason = ConvertHelper.convert(row.get("reason"), String.class);
113+
Integer performedby = ConvertHelper.convert(row.get("performedby"), Integer.class);
113114
if (id == null || date == null || location == null)
114115
return "Attempting to create a housing record with no id, date, or location";
115116

@@ -166,6 +167,7 @@ else if (enddate == null || enddate.after(deathDate))
166167
saveRow.put("taskId", taskId);
167168
saveRow.put("qcstate", qcstate);
168169
saveRow.put("reason", reason);
170+
saveRow.put("performedby", performedby);
169171
if (updateRecord)
170172
saveRow.put("objectid", ts.getMap().get("objectid"));
171173
else
@@ -220,6 +222,11 @@ public String saveBirthRecord(String id, Map<String, Object> row) throws QueryUp
220222
return "Attempting to create a birth record with no qcstate";
221223
}
222224

225+
Integer performedby = ConvertHelper.convert(row.get("performedby"), Integer.class);
226+
if (performedby == null) {
227+
return "Attempting to create a birth record with no performedby";
228+
}
229+
223230
TableInfo ti = getTableInfo("study", "birth");
224231

225232
// If there is already a housing record for this task, update that record
@@ -236,6 +243,7 @@ public String saveBirthRecord(String id, Map<String, Object> row) throws QueryUp
236243
saveRow.put("date", date);
237244
saveRow.put("taskId", taskId);
238245
saveRow.put("qcstate", qcstate);
246+
saveRow.put("performedby", performedby);
239247
if (updateRecord)
240248
{
241249
saveRow.put("objectid", ts.getMap().get("objectid"));
@@ -570,6 +578,11 @@ public String createAssignmentRecord(String dataset, String id, Map<String, Obje
570578
return "Attempting to create a project assignment record with no qcstate";
571579
}
572580

581+
String performedby = ConvertHelper.convert(row.get("performedby"), String.class);
582+
if (performedby == null) {
583+
return "Attempting to create a project assignment record with no performedby";
584+
}
585+
573586
boolean updateRecord = false;
574587

575588
// If there is already a project assignment record for this task, update that record
@@ -586,6 +599,7 @@ public String createAssignmentRecord(String dataset, String id, Map<String, Obje
586599
saveRow.put("date", date);
587600
saveRow.put("taskId", taskId);
588601
saveRow.put("qcstate", qcstate);
602+
saveRow.put("performedby", performedby);
589603
if (updateRecord)
590604
{
591605
saveRow.put("objectid", ts.getMap().get("objectid"));

‎nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetArrival.tsv‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
objectid Id QCStateLabel date remark Description
2-
1 TEST4551032 Completed -4377d nunc augue feugiat neque imperdiet et ornare euismod consequat
3-
2 TEST5904521 Completed -4188d tellus sit semper fringilla arcu tincidunt turpis quis imperdiet ultrices eleifend
4-
3 TEST1993532 Completed -6088d ut erat auctor fringilla hendrerit vitae ornare
5-
4 44442 Completed -6100d
6-
5 44443 Completed -6100d
1+
objectid Id QCStateLabel date remark Description performedby
2+
1 TEST4551032 Completed -4377d nunc augue feugiat neque imperdiet et ornare euismod consequat 1004
3+
2 TEST5904521 Completed -4188d tellus sit semper fringilla arcu tincidunt turpis quis imperdiet ultrices eleifend 1004
4+
3 TEST1993532 Completed -6088d ut erat auctor fringilla hendrerit vitae ornare 1004
5+
4 44442 Completed -6100d 1004
6+
5 44443 Completed -6100d 1004

‎nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetAssignment.tsv‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
objectid Id QCStateLabel date enddate project
2-
1 44444 Completed -1381d -1321d 795644
3-
2 44444 Completed -1321d 640991
4-
3 44446 Completed -1406d -1316d 795644
5-
4 44446 Completed -1316d 640991
6-
5 TEST4551032 Completed -6362d 795644
7-
6 44442 Completed -6100d -5920d 640991
8-
7 44442 Completed -5920d 795644
9-
8 44443 Completed -6100d 640991
1+
objectid Id QCStateLabel date enddate project performedby
2+
1 44444 Completed -1381d -1321d 795644 1004
3+
2 44444 Completed -1321d 640991 1004
4+
3 44446 Completed -1406d -1316d 795644 1004
5+
4 44446 Completed -1316d 640991 1004
6+
5 TEST4551032 Completed -6362d 795644 1004
7+
6 44442 Completed -6100d -5920d 640991 1004
8+
7 44442 Completed -5920d 795644 1004
9+
8 44443 Completed -6100d 640991 1004

‎nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetBirth.tsv‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
objectid Id date QCStateLabel
2-
1 44444 -2895d Completed
3-
2 44445 -2854d Completed
4-
3 44446 -2703d Completed
5-
4 44447 -2600d Completed
6-
5 TEST6390238 -5601d Completed
7-
6 TEST5904521 -5602d Completed
8-
7 TEST3804589 -2603d Completed
9-
8 TEST2312318 -3000d Completed
1+
objectid Id date QCStateLabel performedby
2+
1 44444 -2895d Completed 1004
3+
2 44445 -2854d Completed 1004
4+
3 44446 -2703d Completed 1004
5+
4 44447 -2600d Completed 1004
6+
5 TEST6390238 -5601d Completed 1004
7+
6 TEST5904521 -5602d Completed 1004
8+
7 TEST3804589 -2603d Completed 1004
9+
8 TEST2312318 -3000d Completed 1004

‎nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetBirth.tsv~‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
objectid Id date QCStateLabel performedby
2+
1 44444 -2895d Completed 1004
3+
2 44445 -2854d Completed 1004
4+
3 44446 -2703d Completed 1004
5+
4 44447 -2600d Completed 1004
6+
5 TEST6390238 -5601d Completed 1004
7+
6 TEST5904521 -5602d Completed 1004
8+
7 TEST3804589 -2603d Completed 1004
9+
8 TEST2312318 -3000d Completed 1004

‎nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetDeaths.tsv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
objectid Id date QCStateLabel cause manner remark
2-
1 TEST1993532 -2212d Completed 1 S sed nibh viverra
3-
2 44445 -723d Completed 2 X labor omnia vincit
1+
objectid Id date QCStateLabel cause manner remark performedby
2+
1 TEST1993532 -2212d Completed 1 S sed nibh viverra 1004
3+
2 44445 -723d Completed 2 X labor omnia vincit 1004

‎nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetDemographics.tsv‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
objectid Id QCStateLabel date birth death calculated_status gender sire dam species origin
2-
1 44444 Completed -1381d -1381d Alive 1 44442 44443 10 00001
3-
2 44446 Completed -1406d -1406d Alive 1 44442 44443 10 00003
4-
3 44445 Completed -1414d -1414d -726d Dead 2 44442 44443 10 00004
5-
4 TEST6390238 Completed -3923d -3923d Shipped 2 3565069 5250080 9 00002
6-
5 TEST5904521 Completed -5431d -5431d Shipped 1 8377984 9 00004
7-
6 TEST3804589 Completed -5806d -5806d Shipped 1 493957 9749422 9 00005
8-
7 TEST2312318 Completed -8069d -8069d Shipped 1 5748235 8739374 9 00002
9-
8 TEST1993532 Completed -11808d -11808d -2259d Dead 2 5409336 3784452 9 00003
10-
9 TEST4551032 Completed -6362d -6362d Alive 1 5030167 8416939 9 00001
11-
11 44442 Completed -6100d -6100d Alive 1 8377984 10 00004
12-
12 44443 Completed -6100d -6100d Alive 1 8377984 10 00004
13-
13 44447 Completed -2600d -2600d Alive 1 8377984 10 00004
14-
14 8377984 Completed -2600d -2600d Alive 1 8377984 10 00004
1+
objectid Id QCStateLabel date birth death calculated_status gender sire dam species origin performedby
2+
1 44444 Completed -1381d -1381d Alive 1 44442 44443 10 00001 1004
3+
2 44446 Completed -1406d -1406d Alive 1 44442 44443 10 00003 1004
4+
3 44445 Completed -1414d -1414d -726d Dead 2 44442 44443 10 00004 1004
5+
4 TEST6390238 Completed -3923d -3923d Shipped 2 3565069 5250080 9 00002 1004
6+
5 TEST5904521 Completed -5431d -5431d Shipped 1 8377984 9 00004 1004
7+
6 TEST3804589 Completed -5806d -5806d Shipped 1 493957 9749422 9 00005 1004
8+
7 TEST2312318 Completed -8069d -8069d Shipped 1 5748235 8739374 9 00002 1004
9+
8 TEST1993532 Completed -11808d -11808d -2259d Dead 2 5409336 3784452 9 00003 1004
10+
9 TEST4551032 Completed -6362d -6362d Alive 1 5030167 8416939 9 00001 1004
11+
11 44442 Completed -6100d -6100d Alive 1 8377984 10 00004 1004
12+
12 44443 Completed -6100d -6100d Alive 1 8377984 10 00004 1004
13+
13 44447 Completed -2600d -2600d Alive 1 8377984 10 00004 1004
14+
14 8377984 Completed -2600d -2600d Alive 1 8377984 10 00004 1004

‎nirc_ehr/test/sampledata/nirc_ehr/study/study/datasets/datasetDeparture.tsv‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
objectid Id date destination remark Description QCStateLabel
2-
1 TEST3804589 -815d 00001 Completed
3-
2 TEST2312318 -1823d 00002 Completed
4-
3 TEST5904521 -1899d 00003 Completed
5-
4 TEST6390238 -1896d 00004 Completed
1+
objectid Id date destination remark Description QCStateLabel performedby
2+
1 TEST3804589 -815d 00001 Completed 1004
3+
2 TEST2312318 -1823d 00002 Completed 1004
4+
3 TEST5904521 -1899d 00003 Completed 1004
5+
4 TEST6390238 -1896d 00004 Completed 1004

0 commit comments

Comments
 (0)