Ticket 54467: Correct a death record (#665)

* Allow admins to update Death records
Co-authored-by: Marty Pradere <martyp@labkey.com>

Author: labkey-bpatel

nirc_ehr/resources/queries/study/deaths.js

@@ -71,11 +71,16 @@ function onUpsert(helper, scriptErrors, row, oldRow) {
 
     if (!helper.isETL()) {
 
-        //only allow death record to be created if animal is in demographics table
+        //skip other checks so that the admins can update a death record
+        if (helper.getEvent() === 'update' && LABKEY.Security.currentUser.isAdmin) {
+            return;
+        }
+
+        //only allow death record to be created if the animal is in the demographics table
         if (idMap[row.Id]) {
 
-            // check if death record already exists for this animal
-            if (idMap[row.Id].calculated_status.toUpperCase() === 'DEAD' && row.QCStateLabel.toUpperCase() === 'COMPLETED') {
+            // check if a death record already exists for this animal
+            if (idMap[row.Id].calculated_status.toUpperCase() === 'DEAD' && deathIdMap[row.Id].QCStateLabel.toUpperCase() === 'COMPLETED') {
                 EHR.Server.Utils.addError(scriptErrors, 'Id', 'Death record already exists for this animal.', 'ERROR');
             }
             // check if the animal is at the center

nirc_ehr/resources/views/datasets.html

@@ -6,7 +6,7 @@
 
     const config = {displayField: 'Label', headerField: 'categoryId/label', target: webpart.wrapperDivId};
 
-    const nonFormUpdates = ["Cases", "Procedures", "Drug Administration"];
+    const nonFormUpdates = ["Treatment Cases", "Procedures", "Drug Administration", "Deaths"];
 
     const hideUpdateRecords = [];
 
@@ -66,12 +66,22 @@
                     params.queryUpdateURL = true;
 
                 if(EHR.Security.hasPermission('Completed', 'update', {schemaName: 'study', queryName: item.queryName}) && hideUpdateRecords.indexOf(item.queryName) === -1){
-                    cfg.items.push({
+
+                    if(nonFormUpdates.indexOf(item.queryName) !== -1) {
+                        //adding an item here so that the 'Admin Update Records' link aligns with other links in the same "column"
+                        cfg.items.push({
+                            xtype: 'box',
+                            html: '<span><a class="labkey-text-link" style="cursor: pointer; visibility: hidden;">Update Records</a></span>'
+                        });
+                    }
+                    else {
+                     cfg.items.push({
                         xtype: 'ldk-linkbutton',
                         tooltip: item.searchTooltip || 'Click to update records',
                         href: LABKEY.ActionURL.buildURL('ehr', 'updateQuery', null, params),
                         text: 'Update Records'
                     });
+                    }
                 }
 
                 params.queryUpdateURL = true;