Merge 25.10 to develop

Author: labkey-teamcity

nirc_ehr/resources/queries/dbo/q_assignment.sql

@@ -9,6 +9,10 @@ SELECT alt.ALTERNATE_ID AS "objectId",
        ae.EVENT_DATETIME AS assignmentDate,  -- Set to arrival/birth then updated by trigger
        CASE WHEN alt.DESCRIPTION IS NULL OR length(trim(alt.DESCRIPTION)) != 11 THEN NULL
        ELSE COALESCE(TO_DATE(alt.DESCRIPTION, 'DD-Mon-RR'), COALESCE(dea.deathDate, dep.eventDate)) END as endDate,
+       (CASE
+            WHEN (ae.STAFF_ID.STAFF_FIRST_NAME IS NULL OR ae.STAFF_ID.STAFF_LAST_NAME IS NULL) THEN 'unknown'
+            ELSE (trim(ae.STAFF_ID.STAFF_FIRST_NAME)
+                || '|' || trim(ae.STAFF_ID.STAFF_LAST_NAME)) END)                  AS performedby,
        COALESCE(MAX(CAST(adt.CHANGE_DATETIME AS TIMESTAMP)), ae.CREATED_DATETIME) AS modified
 FROM  ALTERNATE alt
 LEFT JOIN ANIMAL anm ON alt.ANIMAL_ID = anm.ANIMAL_ID
@@ -25,6 +29,8 @@ GROUP BY alt.ALTERNATE_ID,
          alt.DESCRIPTION,
          ae.CREATED_DATETIME,
          ae.EVENT_DATETIME,
+         ae.STAFF_ID.STAFF_FIRST_NAME,
+         ae.STAFF_ID.STAFF_LAST_NAME,
          dea.deathDate,
          dep.eventDate
 ORDER BY anm.ANIMAL_ID,alt.ALTERNATE_ID ASC

nirc_ehr/resources/queries/dbo/q_demographics.sql

@@ -18,6 +18,10 @@ SELECT anm.ANIMAL_ID_NUMBER AS participantId,
        altOrigin.Name AS geographic_origin,
        altSrc.Name AS source,
        altCites.Name AS CITES,
+       (CASE
+            WHEN (ae.STAFF_ID.STAFF_FIRST_NAME IS NULL OR ae.STAFF_ID.STAFF_LAST_NAME IS NULL) THEN 'unknown'
+            ELSE (trim(ae.STAFF_ID.STAFF_FIRST_NAME)
+                || '|' || trim(ae.STAFF_ID.STAFF_LAST_NAME)) END)                  AS performedby,
        -- audit timestamp for modifications or animal event received for created
        COALESCE(MAX(CAST(adt.CHANGE_DATETIME AS TIMESTAMP)), ae.CREATED_DATETIME) AS modified
 FROM Animal anm
@@ -44,6 +48,8 @@ GROUP BY anm.ANIMAL_ID_NUMBER,
     anm.VENDOR_ANIMAL_NUMBER,
     anm.ACTIVE_YN,
     anm.LOT_NUMBER_ID,
+    ae.STAFF_ID.STAFF_FIRST_NAME,
+    ae.STAFF_ID.STAFF_LAST_NAME,
     st.status,
     alt.NAME,
     altImplant.Name,

nirc_ehr/resources/queries/study/arrival.js

@@ -51,7 +51,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                 Id: row.Id,
                 date: row.birth,
                 qcstate: row.qcstate,
-                taskid: row.taskid
+                taskid: row.taskid,
+                performedby: row.performedby
             }
 
             var birthErrors = triggerHelper.saveBirthRecord(row.Id, birthInfo);
@@ -67,7 +68,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                 date: row.date,
                 taskid: row.taskid,
                 remark: row.remark,
-                qcstate: row.qcstate
+                qcstate: row.qcstate,
+                performedby: row.performedby
             }
 
             if (row.project) {
@@ -89,7 +91,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                 cage: row.cage,
                 taskid: row.taskid,
                 qcstate: row.qcstate,
-                reason: row.arrivalType
+                reason: row.arrivalType,
+                performedby: row.performedby
             }
 
             var housingErrors = triggerHelper.createHousingRecord(row.Id, housingRec, "arrival");
@@ -152,6 +155,12 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                 hasUpdates = true;
             }
 
+            if (row.performedby && row.performedby !== data.performedby)
+            {
+                obj.performedby = row.performedby;
+                hasUpdates = true;
+            }
+
             if (hasUpdates)
             {
                 console.info("Arrival update for animal Id " + row.Id + " included demographic changes Demographic record updated.");

nirc_ehr/resources/queries/study/birth.js

@@ -38,7 +38,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                 date: row.date,
                 taskid: row.taskid,
                 remark: row.remark,
-                qcstate: row.qcstate
+                qcstate: row.qcstate,
+                performedby: row.performedby
             }
 
             if (row.project) {
@@ -62,7 +63,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                     cage: row.cage,
                     taskid: row.taskid,
                     qcstate: row.qcstate,
-                    reason: 'Husbandry'
+                    reason: 'Husbandry',
+                    performedby: row.performedby
                 }
 
                 var housingErrors = triggerHelper.createHousingRecord(row.Id, housingRec, "birth");
@@ -87,7 +89,8 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                 gender: row['Id/demographics/gender'] || null,
                 taskid: row.taskid,
                 remark: row.remark,
-                QCStateLabel: row.QCStateLabel
+                QCStateLabel: row.QCStateLabel,
+                performedby: row.performedby
             };
 
             //find dam, if provided
@@ -136,6 +139,11 @@ EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Even
                     hasUpdates = true;
                 }
 
+                if (obj.performedby && obj.performedby !== data.performedby) {
+                    record.performedby = obj.performedby;
+                    hasUpdates = true;
+                }
+
                 if (obj.QCStateLabel && obj.QCStateLabel !== data.QCStateLabel) {
                     record.QCStateLabel = obj.QCStateLabel;
                     hasUpdates = true;

nirc_ehr/resources/queries/study/clinical_observations.query.xml

@@ -34,7 +34,6 @@
                     </column>
                     <column columnName="performedBy">
                         <columnTitle>Performed By</columnTitle>
-                        <nullable>false</nullable>
                     </column>
                     <column columnName="scheduledDate">
                         <columnTitle>Scheduled Date</columnTitle>

nirc_ehr/resources/queries/study/housing.query.xml

@@ -43,7 +43,8 @@
                         </fk>
                     </column>
                     <column columnName="remark"/>
-                    <column columnName="performedBy" />
+                    <column columnName="performedBy">
+                    </column>
                 </columns>
             </table>
         </tables>

nirc_ehr/resources/queries/study/necropsy.js

@@ -54,7 +54,8 @@ function onUpsert(helper, scriptErrors, row, oldRow) {
                 date: row.date,
                 weight: row.necropsyWeight,
                 taskid: row.taskid,
-                qcstate: qcstate
+                qcstate: qcstate,
+                performedby: row.performedby
             };
             triggerHelper.upsertWeightRecord(weightRecord);
         }

nirc_ehr/resources/web/nirc_ehr/model/sources/NIRCDefault.js

@@ -11,6 +11,7 @@ EHR.model.DataModelManager.registerMetadata('Default', {
         },
         performedby: {
             hidden: false,
+            allowBlank: true,
             defaultValue: LABKEY.Security.currentUser.id,
             getInitialValue: function (v, rec) {
                 return LABKEY.Security.currentUser.id;
@@ -112,15 +113,6 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             'enddate': {
                 hidden: true
             },
-            performedby: {
-                allowBlank: false,
-                lookup: {
-                    schemaName: 'core',
-                    queryName: 'users',
-                    keyColumn: 'UserId',
-                    displayColumn: 'DisplayName',
-                },
-            },
             reason: {
                 defaultValue: null,
                 allowBlank: false,
@@ -131,6 +123,35 @@ EHR.model.DataModelManager.registerMetadata('Default', {
                     filterArray: [LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK)]
                 }
             },
+            performedby: {
+                hidden: false,
+                allowBlank: true,
+                defaultValue: LABKEY.Security.currentUser.id,
+                lookup: {
+                    schemaName: 'core',
+                    queryName: 'users',
+                    keyColumn: 'UserId',
+                    displayColumn: 'DisplayName',
+                    columns: 'UserId,DisplayName,FirstName,LastName',
+                    sort: 'Type,DisplayName'
+                },
+                getInitialValue: function (v, rec) {
+                    return LABKEY.Security.currentUser.id;
+                },
+                editorConfig: {
+                    store: {
+                        type: 'labkey-store',
+                        schemaName: 'core',
+
+                        // 'performedby' is a text field in the dataset and its lookup to the userid is an int field - this mismatch causes it to disappear
+                        // from the display when a value is selected from the dropdown even though the 'userid' value gets saved as a text (this behavior was only seen
+                        // in the form panel but not in the grid panel).
+                        // casting it as a varchar when loading the store fixes this issue.
+                        sql: "SELECT CAST (UserId AS VARCHAR) AS UserId,DisplayName,FirstName,LastName FROM core.PrincipalsWithoutAdmin WHERE active = TRUE AND Type = 'u'",
+                        autoLoad: true
+                    }
+                }
+            },
         },
         'study.arrival': {
             initialRoom: {
@@ -190,6 +211,9 @@ EHR.model.DataModelManager.registerMetadata('Default', {
             treatmentid: {
                 hidden: true,
                 nullable: true
+            },
+            performedby: {
+                allowBlank: true,
             }
         },
         'study.observation_order': {

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

@@ -110,6 +110,7 @@ public String createHousingRecord(String id, Map<String, Object> row, String for
         Date date = ConvertHelper.convert(row.get("date"), Date.class);
         String location = ConvertHelper.convert(row.get("cage"), String.class);
         String reason = ConvertHelper.convert(row.get("reason"), String.class);
+        Integer performedby = ConvertHelper.convert(row.get("performedby"), Integer.class);
         if (id == null || date == null || location == null)
             return "Attempting to create a housing record with no id, date, or location";
 
@@ -166,6 +167,7 @@ else if (enddate == null || enddate.after(deathDate))
         saveRow.put("taskId", taskId);
         saveRow.put("qcstate", qcstate);
         saveRow.put("reason", reason);
+        saveRow.put("performedby", performedby);
         if (updateRecord)
             saveRow.put("objectid", ts.getMap().get("objectid"));
         else
@@ -220,6 +222,11 @@ public String saveBirthRecord(String id, Map<String, Object> row) throws QueryUp
             return "Attempting to create a birth record with no qcstate";
         }
 
+        Integer performedby = ConvertHelper.convert(row.get("performedby"), Integer.class);
+        if (performedby == null) {
+            return "Attempting to create a birth record with no performedby";
+        }
+
         TableInfo ti = getTableInfo("study", "birth");
 
         // 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
         saveRow.put("date", date);
         saveRow.put("taskId", taskId);
         saveRow.put("qcstate", qcstate);
+        saveRow.put("performedby", performedby);
         if (updateRecord)
         {
             saveRow.put("objectid", ts.getMap().get("objectid"));
@@ -315,6 +323,7 @@ public void upsertWeightRecord(Map<String, Object> row) throws QueryUpdateServic
         saveRow.put("date", date);
         saveRow.put("taskid", taskId);
         saveRow.put("qcstate", row.get("qcstate"));
+        saveRow.put("performedby", row.get("performedby"));
         if (updateRecord)
         {
             saveRow.put("objectid", ts.getMap().get("objectid"));
@@ -570,6 +579,11 @@ public String createAssignmentRecord(String dataset, String id, Map<String, Obje
             return "Attempting to create a project assignment record with no qcstate";
         }
 
+        String performedby = ConvertHelper.convert(row.get("performedby"), String.class);
+        if (performedby == null) {
+            return "Attempting to create a project assignment record with no performedby";
+        }
+
         boolean updateRecord = false;
 
         // If there is already a project assignment record for this task, update that record
@@ -586,6 +600,7 @@ public String createAssignmentRecord(String dataset, String id, Map<String, Obje
         saveRow.put("date", date);
         saveRow.put("taskId", taskId);
         saveRow.put("qcstate", qcstate);
+        saveRow.put("performedby", performedby);
         if (updateRecord)
         {
             saveRow.put("objectid", ts.getMap().get("objectid"));

nirc_ehr/src/org/labkey/nirc_ehr/table/NIRC_EHRSharedDatasetTrigger.java

@@ -11,20 +11,44 @@
 
 /**
  * Shared dataset trigger to add triggers to act on all the study datasets.
- * */
+ */
 public class NIRC_EHRSharedDatasetTrigger implements Trigger
 {
     private void transformAnimalIdToUpperCase(Map<String, Object> row)
     {
-        if (row != null && row.containsKey("Id"))
+        if (row != null && row.containsKey("Id") && row.get("Id") != null)
         {
             row.put("Id", ((String) row.get("Id")).toUpperCase());
         }
     }
 
+    private void verifyPerformedBy(TableInfo table, @Nullable Map<String, Object> newRow, ValidationException errors)
+    {
+        if (newRow != null && newRow.containsKey("performedby") && newRow.get("performedby") == null)
+        {
+            if (!newRow.containsKey("QCStateLabel") || newRow.get("QCStateLabel") == null)
+            {
+                errors.addFieldError("performedby", "Record in " + table.getTitle() + " cannot be submitted without Performed By if QCStateLabel is not found. Contact your administrator.");
+            }
+            else if (newRow.containsKey("QCStateLabel") && newRow.get("QCStateLabel").equals("Completed"))
+            {
+                errors.addFieldError("performedby", "Performed By must be entered in all records before submitting final. Table: " + table.getTitle());
+            }
+        }
+    }
+
     @Override
     public void beforeInsert(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
     {
         transformAnimalIdToUpperCase(newRow);
+        verifyPerformedBy(table, newRow, errors);
+    }
+
+    @Override
+    public void beforeUpdate(TableInfo table, Container c,
+                             User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow,
+                             ValidationException errors, Map<String, Object> extraContext) throws ValidationException
+    {
+        verifyPerformedBy(table, newRow, errors);
     }
 }