From e663a3a36910c17db74ba399ef1f625367c9464c Mon Sep 17 00:00:00 2001
From: Nathan Birus <nbirus@harding.edu>
Date: Fri, 25 Oct 2024 09:50:39 -0500
Subject: [PATCH] Add the initials input to the clinicians dashboard, make it
 required for saving and submitting

---
 src/events.js               | 21 +++++++++++----------
 src/pages/collectProcess.js | 26 +++++++++++---------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/events.js b/src/events.js
index 0b4f4a01..13014ec1 100644
--- a/src/events.js
+++ b/src/events.js
@@ -1500,17 +1500,18 @@ const collectionSubmission = async (participantData, biospecimenData, continueTo
         }
     }
 
-    if (getWorkflow() === 'research') {
-        let initials = document.getElementById('collectionInitials')
-        if(initials && initials.value.trim().length == 0) {
-            errorMessage(initials.id, 'This field is required. Please enter the phlebotomist\'s initials.', focus);
-            focus = false;
-            return;
-        }
-        else {
-            biospecimenData[conceptIds.collection.phlebotomistInitials] = initials.value.trim();
-        }
+    
+    let initials = document.getElementById('collectionInitials')
+    if(initials && initials.value.trim().length == 0) {
+        const errorLabel = getWorkflow() === 'research' ? 'phlebotomist\'s initials' : 'initials of team member completing Collection Data Entry';
+        errorMessage(initials.id, `This field is required. Please enter the ${errorLabel}.`, focus);
+        focus = false;
+        return;
     }
+    else {
+        biospecimenData[conceptIds.collection.phlebotomistInitials] = initials.value.trim();
+    }
+    
 
     // Handle corner cases: found strays and re-finalizing collections
     const isFinalized = biospecimenData[conceptIds.collection.isFinalized] === conceptIds.yes;
diff --git a/src/pages/collectProcess.js b/src/pages/collectProcess.js
index 1fe859a6..bacd2f01 100644
--- a/src/pages/collectProcess.js
+++ b/src/pages/collectProcess.js
@@ -24,21 +24,17 @@ export const tubeCollectedTemplate = (participantData, biospecimenData) => {
                 </div>
                 <div class="row">Collection ID: ${biospecimenData[conceptIds.collection.id]}</div>
                 <div class="row">Collection ID Link Date/Time: ${getWorkflow() === 'research' ? new Date(biospecimenData[conceptIds.collection.collectionTime]).toLocaleString(): new Date(biospecimenData[conceptIds.collection.scannedTime]).toLocaleString()}</div>
-                ${getWorkflow() === 'research' ? `
-                    <div class="row">
-                        <div>Collection Phlebotomist Initials:&nbsp</div>
-                        <input 
-                            type="text"
-                            ${biospecimenData[conceptIds.collection.phlebotomistInitials] ? `value=${biospecimenData[conceptIds.collection.phlebotomistInitials]}` : ``}
-                            id="collectionInitials"
-                            style="text-transform:uppercase"
-                            onpaste="return false;"
-                            required
-                        /> 
-                    </div>` 
-                    
-                    : ''
-                }
+                <div class="row">
+                    <div>${getWorkflow() === 'research' ? `Collection Phlebotomist Initials:&nbsp` : `Initials of team member completing Collection Data Entry:&nbsp`}</div>
+                    <input 
+                        type="text"
+                        ${biospecimenData[conceptIds.collection.phlebotomistInitials] ? `value=${biospecimenData[conceptIds.collection.phlebotomistInitials]}` : ``}
+                        id="collectionInitials"
+                        style="text-transform:uppercase"
+                        onpaste="return false;"
+                        required
+                    /> 
+                </div>
             </div>
             ${biospecimenData[conceptIds.collection.selectedVisit] ? `
                 <div class="ml-auto form-group">