Skip to content

Ticket 54565: Save draft on death form sends email when it shouldn't #689

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

Open
labkey-bpatel wants to merge 2 commits into
base: release26.3-SNAPSHOT
Choose a base branch
from
+19 −12
Open

Ticket 54565: Save draft on death form sends email when it shouldn't #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35eedf5
Don't send notification on Save Draft.
labkey-bpatel May 1, 2026
bea8d5f
Update/add log messages.
labkey-bpatel 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
29 changes: 18 additions & 11 deletions nirc_ehr/resources/queries/study/deaths.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,24 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
});

EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.COMPLETE, 'study', 'Deaths', function(event, errors, helper){
var deaths = helper.getDeaths();

if (deaths) {
var ids = [];
for (var id in deaths){
ids.push(id);
}
if (!helper.isETL() && event === 'insert') {
triggerHelper.sendDeathNotification(ids[0]);
var rows = helper.getRows() || [];
for (var i = 0; i < rows.length; i++) {
var row = rows[i].row;
var oldRow = rows[i].oldRow;

// Notification will get sent when:
// 1) a brand-new row saved directly as 'Request: Pending' (i.e., when a user clicks 'Submit Death'), or
// 2) a draft death record moving from 'In Progress' to 'Request: Pending'.
if (!helper.isETL() &&
row && row.Id &&
row.QCStateLabel &&
row.QCStateLabel.toUpperCase() === 'REQUEST: PENDING' &&
(!oldRow || !oldRow.QCStateLabel || oldRow.QCStateLabel.toUpperCase() === 'IN PROGRESS')) {
console.log("Sending NIRC Death Notification")
triggerHelper.sendDeathNotification(row.Id);

console.log("Updating Procedure Orders to Completed for Animal: " + row.Id + "")
triggerHelper.updateProcedureOrdersToCompleted([row.Id]);
}

triggerHelper.updateProcedureOrdersToCompleted(ids);
}
});
2 changes: 1 addition & 1 deletion nirc_ehr/src/org/labkey/nirc_ehr/query/NIRC_EHRTriggerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ public void updateProcedureOrdersToCompleted(List<String> ids)

if (results.length == 0)
{
_log.info("No prc_order rows found with 'Request: Approved' status for the provided IDs");
_log.info("No Procedure Orders found with 'Request: Approved' status for the provided IDs");
return;
}

Expand Down
Loading