Incorporate performedby into workflow

Author: labkey-martyp

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/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/table/NIRC_EHRSharedDatasetTrigger.java

@@ -11,12 +11,12 @@
 
 /**
  * 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());
         }
@@ -26,5 +26,22 @@ private void transformAnimalIdToUpperCase(Map<String, Object> row)
     public void beforeInsert(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
     {
         transformAnimalIdToUpperCase(newRow);
+        if (newRow != null && newRow.containsKey("performedby") && newRow.get("performedby") == null)
+        {
+            if (newRow.containsKey("QCStateLabel") && newRow.get("QCStateLabel").equals("Completed"))
+                errors.addFieldError("performedby", "Performed by must be entered in all " + table.getTitle() + " records before submitting final.");
+        }
+    }
+
+    @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
+    {
+        if (newRow != null && newRow.containsKey("performedby") && newRow.get("performedby") == null)
+        {
+            if (newRow.containsKey("QCStateLabel") && newRow.get("QCStateLabel").equals("Completed"))
+                errors.addFieldError("performedby", "Performed by must be entered in all " + table.getTitle() + " records before submitting final.");
+        }
     }
 }