Skip to content

Fix draft case observation orders #611

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
labkey-martyp merged 3 commits into from
Oct 16, 2025
Merged

Fix draft case observation orders #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
139f135
case validation cleanup and fix
labkey-martyp Oct 15, 2025
f9d209e
use ldk admin update
labkey-martyp Oct 15, 2025
95ea857
casing
labkey-martyp Oct 16, 2025
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
47 changes: 20 additions & 27 deletions nirc_ehr/resources/queries/study/cases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,29 @@ function onInit(event, helper) {

EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.BEFORE_UPSERT, 'study', 'cases', function(helper, errors, row, oldRow){
if (!helper.isETL()) {
var error = false;
if (row.enddate) {
if (!row.closeRemark) {
EHR.Server.Utils.addError(errors, 'closeRemark', 'Close remark required when closing a case.', 'ERROR');
error = true;
}

if(!triggerHelper.canCloseCase(row.category)) {
EHR.Server.Utils.addError(errors, 'enddate', 'Veterinarian permission required to close a case.', 'ERROR');
error = true;
}
}

if (!row.performedby) {
EHR.Server.Utils.addError(errors, 'performedby', 'Opened By is a required field.', 'ERROR');
error = true;
}

if (!helper.isValidateOnly() && row.caseid && row.enddate && (row.enddate != oldRow.enddate)) {
triggerHelper.closeDailyClinicalObs(row.caseid, row.enddate);
}

if (!helper.isValidateOnly()) {
if (!helper.isValidateOnly() && !error) {
var qc;
if (row.QCStateLabel) {
qc = EHR.Server.Security.getQCStateByLabel(row.QCStateLabel);
Expand All @@ -41,36 +49,21 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
if (!qc) {
console.error('Unable to find QCState: ' + row.QCState + '/' + row.QCStateLabel);
}

// Don't allow taking an existing non-draft case back to draft
if (oldRow && qc.Label == 'In Progress') {
var oldQc = EHR.Server.Security.getQCStateByLabel(oldRow.QCStateLabel);
if (oldQc.Label != 'In Progress') {
EHR.Server.Utils.addError(errors, null, 'Cannot save a draft copy of a case already opened or in review.', 'ERROR');
}
}
else {
var reopen = oldRow && oldRow.enddate && !row.enddate;
if ((reopen || helper.getEvent() == 'insert') && row.caseid && row.Id && row.performedby && row.taskid && row.category == 'Clinical') {
var qc;
if (row.QCStateLabel) {
qc = EHR.Server.Security.getQCStateByLabel(row.QCStateLabel);
}
else if (row.QCState) {
qc = EHR.Server.Security.getQCStateByRowId(row.QCState);
}

if (!qc) {
console.error('Unable to find QCState: ' + row.QCState + '/' + row.QCStateLabel);
// Don't allow taking an existing non-draft case back to draft
if (oldRow && qc.Label == 'In Progress') {
var oldQc = EHR.Server.Security.getQCStateByLabel(oldRow.QCStateLabel);
if (oldQc.Label != 'In Progress') {
EHR.Server.Utils.addError(errors, null, 'Cannot save a draft copy of a case already opened or in review.', 'ERROR');
}
else if ((qc.Label == 'Completed' || qc.Label == 'Review Required') && row.caseid && row.Id && row.performedby && row.taskid && qc) {
var ordersInTransaction = helper.getProperty('ordersInTransaction');
var oit = [];
if (ordersInTransaction && ordersInTransaction.length) {
oit = ordersInTransaction;
}
triggerHelper.ensureDailyClinicalObservationOrders(row.Id, row.caseid, row.date, row.performedby, qc.RowId, row.taskid, oit);
} else if (row.category == 'Clinical' && (qc.Label == 'Completed' || qc.Label == 'Review Required') && row.caseid && row.Id && row.performedby && row.taskid) {
var ordersInTransaction = helper.getProperty('ordersInTransaction');
var oit = [];
if (ordersInTransaction && ordersInTransaction.length) {
oit = ordersInTransaction;
}
triggerHelper.ensureDailyClinicalObservationOrders(row.Id, row.caseid, row.date, row.performedby, qc.RowId, row.taskid, oit);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion nirc_ehr/resources/views/datasets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
cfg.items.push({
xtype: 'ldk-linkbutton',
tooltip: item.searchTooltip || 'Admin click to update records',
href: LABKEY.ActionURL.buildURL('ehr', 'updateQuery', null, params),
href: LABKEY.ActionURL.buildURL('ldk', 'updateQuery', null, params),
text: 'Admin Update Records'
});
}
Expand Down