Dev -> Stage Sync (May 2024 Release)

src/dev/identityProvider.js

@@ -1,35 +1,40 @@
 export const devSSOConfig = (tenantID, provider, inputValue) => {
-    if(/nih.gov/i.test(inputValue)) {
+    if (/nih.gov/i.test(inputValue)) {
         tenantID = 'NIH-SSO-qfszp';
         provider = 'saml.nih-sso';
-    };
-    if(/healthpartners.com/i.test(inputValue)) {
+    }
+    if (/healthpartners.com/i.test(inputValue)) {
         tenantID = 'HP-SSO-wb1zb';
         provider = 'saml.healthpartner';
-    };
-    if(/hfhs.org/i.test(inputValue)) {
+    }
+    if (/hfhs.org/i.test(inputValue)) {
         tenantID = 'HFHS-SSO-ay0iz';
         provider = 'saml.connect-hfhs';
-    };
-    if(/sanfordhealth.org/i.test(inputValue)) {
+    }
+    if (/sanfordhealth.org/i.test(inputValue)) {
         tenantID = 'SFH-SSO-cgzpj';
         provider = 'saml.connect-sanford';
-    };
-    if(/uchicago.edu/i.test(inputValue)) {
+    }
+    if (/uchicago.edu/i.test(inputValue)) {
         tenantID = 'UCM-SSO-tovai';
         provider = 'saml.connect-uchicago';
-    };
-    if(/norc.org/i.test(inputValue)) {
+    }
+    if (/norc.org/i.test(inputValue)) {
         tenantID = 'NORC-SSO-dilvf';
         provider = 'saml.connect-norc';
-    };
-    if(/kp.org/i.test(inputValue)) {
+    }
+    if (/kp.org/i.test(inputValue)) {
         tenantID = 'KP-SSO-wulix';
         provider = 'saml.connect-kp';
-    };
-    if(/marshfieldresearch.org/i.test(inputValue) || /marshfieldclinic.org/i.test(inputValue)) {
+    }
+    if (/marshfieldresearch.org/i.test(inputValue) || /marshfieldclinic.org/i.test(inputValue)) {
         tenantID = 'MFC-SSO-fljvd';
         provider = 'saml.connect-mfc'
-    };
-    return {tenantID, provider}
+    }
+    if (/bswhealth.org/i.test(inputValue)) {
+        tenantID = 'BSWH-SSO-y2jj3';
+        provider = 'saml.connect-bswh';
+    }
+
+    return { tenantID, provider }
 }

src/events.js

@@ -1126,7 +1126,7 @@ const checkFormAndSave = async (participantData, biospecimenData, shouldNavigate
         const inputFields = Array.from(document.getElementsByClassName('input-barcode-id'));
         const isFormDataValid = inputFields.every(input => validateFormInputField(input, biospecimenData, true));
 
-        isFormDataValid ?
+        isFormDataValid || !shouldNavigateToReview ?
             await collectionSubmission(participantData, biospecimenData, shouldNavigateToReview) :
             showTimedNotifications({ title: 'Data Errors Exist!', body: 'Please correct data entry errors in red before saving.' });
     } catch (error) {
@@ -1342,7 +1342,7 @@ const validateFormInputField = (inputTube, biospecimenData) => {
         if (!isTubeIDEntryValid) {
             const errorMessageText = isBagID ?
                 `Invalid entry. Bag ID must be ${validationID}` :
-                `Invalid entry. Specimen ID must be ${validationID}. Replacement labels 0050-0054 are valid.`;
+                `Invalid entry. Specimen ID must be ${validationID}.`;
             errorMessage(inputTube.id, errorMessageText);
             return false;
         }

src/pages/homeCollection/assignKits.js

@@ -1,5 +1,5 @@
 import { homeCollectionNavbar } from "./homeCollectionNavbar.js";
-import { getIdToken, showAnimation, hideAnimation, triggerErrorModal, triggerSuccessModal, baseAPI, processResponse, checkTrackingNumberSource, appState } from "../../shared.js";
+import { getIdToken, showAnimation, hideAnimation, triggerErrorModal, triggerSuccessModal, baseAPI, processResponse, checkTrackingNumberSource, appState, numericInputValidator, errorMessage, removeAllErrors, autoTabAcrossArray } from "../../shared.js";
 import { nonUserNavBar } from "./../../navbar.js";
 import { activeHomeCollectionNavbar } from "./homeCollectionNavbar.js";
 import { conceptIds } from '../../fieldToConceptIdMapping.js';
@@ -54,10 +54,16 @@ const assignKitsTemplate = async (name) => {
                   </div>
                 </div>
                 <div class="form-group row">
-                <label for="scannedBarcode" class="col-md-4 col-form-label">Tracking Number</label>
-                <div class="col-md-8">
-                  <input type="text" class="form-control" id="scannedBarcode" placeholder="Scan Barcode">
-                  <span id="showMsg" style="font-size: 14px;"></span>
+                  <label for="scannedBarcode" class="col-md-4 col-form-label">Supply Kit Tracking Number</label>
+                  <div class="col-md-8">
+                    <div class="form-group row">
+                      <input type="text" class="form-control" id="scannedBarcode" placeholder="Scan Barcode">
+                      <span id="showMsg" style="font-size: 14px;"></span>
+                    </div>
+                    <div class="form-group row">
+                      <label for="scannedBarcode2" class="sr-only">Confirm Supply Kit Tracking Number</label>
+                      <input autocomplete="off" type="text" class="form-control" id="scannedBarcode2" placeholder="Re-Enter (scan/type) Barcode">
+                    </div>
                 </div>
               </div>
         </form>
@@ -74,6 +80,26 @@ const assignKitsTemplate = async (name) => {
 
   document.getElementById("navbarNavAltMarkup").innerHTML = nonUserNavBar(name);
   contentBody.innerHTML = template;
+
+  const scannedBarcode2 = document.getElementById('scannedBarcode2');
+  scannedBarcode2.onpaste = e => e.preventDefault();
+  scannedBarcode2.addEventListener("input", (e) => {
+    const scannedBarcodeValue = document.getElementById('scannedBarcode').value.trim();
+    const scannedBarcode2Value = e.target.value.trim();
+
+    if(scannedBarcodeValue && scannedBarcode2Value && scannedBarcodeValue !== scannedBarcode2Value) {
+      const msg = 'Supply Kit Tracking Number doesn\'t match';
+      errorMessage('scannedBarcode2', msg, true, false);
+    } else {
+      removeAllErrors();
+    }
+  });
+
+  // Set up automatic tabbing between inputs upon scanning (assuming the scanner automatically inputs the enter key at the end)
+  autoTabAcrossArray(['fullName', 'address', 'Connect_ID', 'scanSupplyKit', 'scannedBarcode', 'scannedBarcode2']);
+
+  numericInputValidator(['scannedBarcode', 'scannedBarcode2']);
+
   activeHomeCollectionNavbar();
   appState.setState({ participants: response.data });
   populateSidePaneRows();
@@ -129,10 +155,18 @@ const confirmAssignment = () => {
       confirmAssignmentInAction = true;
       try {
         e.preventDefault();
+        removeAllErrors();
+        const scannedBarcode = document.getElementById('scannedBarcode').value.trim();
+        const scannedBarcode2 = document.getElementById('scannedBarcode2').value.trim();
+        if(scannedBarcode && scannedBarcode2 && scannedBarcode !== scannedBarcode2) {
+          const msg = 'Supply Kit Tracking Number doesn\'t match';
+          errorMessage('scannedBarcode2', msg, true, false);
+          throw new Error(msg);
+        }
         let participantObj = {};
         participantObj['fullName'] = document.getElementById('fullName').value;
         participantObj['address'] = document.getElementById('address').value;
-        participantObj[conceptIds.supplyKitTrackingNum] = document.getElementById('scannedBarcode').value.trim();
+        participantObj[conceptIds.supplyKitTrackingNum] = scannedBarcode;
         participantObj[conceptIds.supplyKitId] = document.getElementById('scanSupplyKit').value.trim();
         participantObj['Connect_ID'] = document.getElementById('Connect_ID')?.value;
         const assignmentStatus = await processConfirmedAssignment(participantObj);

src/pages/homeCollection/kitAssembly.js

@@ -1,5 +1,5 @@
 import { homeCollectionNavbar } from "./homeCollectionNavbar.js";
-import { getIdToken, showAnimation, hideAnimation, appState, baseAPI, triggerErrorModal, processResponse, checkTrackingNumberSource } from "../../shared.js";
+import { getIdToken, showAnimation, hideAnimation, appState, baseAPI, triggerErrorModal, processResponse, checkTrackingNumberSource, numericInputValidator, autoTabAcrossArray, performQCcheck } from "../../shared.js";
 import { nonUserNavBar } from "./../../navbar.js";
 import { activeHomeCollectionNavbar } from "./homeCollectionNavbar.js";
 import { conceptIds } from '../../fieldToConceptIdMapping.js';
@@ -32,10 +32,16 @@ const kitAssemblyTemplate = async (name) => {
               <div id="alert_placeholder"></div>
                   <form>
                         <div class="form-group row">
-                          <label for="scannedBarcode" class="col-md-4 col-form-label">Tracking Number</label>
+                          <label for="scannedBarcode" class="col-md-4 col-form-label">Return Kit Tracking Number</label>
                           <div class="col-md-8">
-                            <input type="text" class="form-control" id="scannedBarcode" placeholder="Scan Barcode" required />
-                            <span id="showMsg" style="font-size: 14px;"></span>
+                            <div class="form-group row">
+                              <input type="text" class="form-control" id="scannedBarcode" placeholder="Scan Barcode" required />
+                            </div>
+                            <label for="scannedBarcode2" class="sr-only">Confirm Return Kit Tracking Number</label>
+                            <div class="form-group row">
+                              <input autocomplete="off" type="text" class="form-control" id="scannedBarcode2" placeholder="Re-Enter (scan/type) Barcode" required />
+                              <span id="showMsg" style="font-size: 14px;"></span>
+                            </div>
                           </div>
                         </div>
                         <div class="form-group row">
@@ -90,11 +96,18 @@ const kitAssemblyTemplate = async (name) => {
 
   document.getElementById("navbarNavAltMarkup").innerHTML = nonUserNavBar(name);
   contentBody.innerHTML = template;
+
+  // Set up automatic tabbing between inputs upon scanning (assuming the scanner automatically inputs the enter key at the end)
+  autoTabAcrossArray(['scannedBarcode', 'scannedBarcode2', 'supplyKitId', 'returnKitId', 'cupId', 'cardId']);
+
+  document.getElementById('scannedBarcode2').onpaste = e => e.preventDefault();
+  numericInputValidator(['scannedBarcode', 'scannedBarcode2']);
   activeHomeCollectionNavbar();
   processAssembledKit();
   enableEnterKeystroke();
   dropdownTrigger('Select Kit Type');
   checkTrackingNumberSource();
+  performQCcheck('scannedBarcode2', 'scannedBarcode', 'showMsg', `Return Tracking Number doesn't match`);
   performQCcheck('returnKitId', 'supplyKitId', 'showReturnKitErrorMsg', `Supply Kit & Return Kit need to be same`);
   performQCcheck('cardId', 'cupId', 'showCardIdErrorMsg', `Cup ID & Card ID need to be same`);
 };
@@ -108,25 +121,6 @@ const enableEnterKeystroke = () => {
 });
 }
 
-const performQCcheck = (inputBox2, inputBox1, errorTag, errorMsg) => {
-  const checkInputBox2 = document.getElementById(inputBox2);
-  if (errorMsg === "") {
-    document.getElementById(errorTag).innerHTML = `` 
-  }
-  if (checkInputBox2) {
-    checkInputBox2.addEventListener("input", (e) => {
-      const checkInputBox2Value = e.target.value.trim();
-      const checkInputBox1Value = document.getElementById(inputBox1).value.trim();
-      if (checkInputBox2Value !== checkInputBox1Value) {
-        document.getElementById(errorTag).innerHTML = `<i class="fa fa-exclamation-circle" style="font-size: 14px; color: red;"></i> ${errorMsg}`
-      }
-      else {
-        document.getElementById(errorTag).innerHTML = ``
-      }
-    })
-  }
-}
-
 const processAssembledKit = () => {
   const saveKitButton = document.getElementById('saveKit');
   if (saveKitButton) {
@@ -135,6 +129,8 @@ const processAssembledKit = () => {
       const queryScannedBarcodeValue = document.getElementById('scannedBarcode')?.value?.trim();
       const scannedBarcodeValue = (queryScannedBarcodeValue !== undefined) ? queryScannedBarcodeValue : 0;
 
+      const confirmScannedBarcodeValue = document.getElementById('scannedBarcode2')?.value?.trim();
+
       const querySupplyKitIdValue = document.getElementById('supplyKitId').value.trim();
       const supplyKitIdValue = (querySupplyKitIdValue !== undefined) ? querySupplyKitIdValue: 0;
 
@@ -147,7 +143,11 @@ const processAssembledKit = () => {
       const queryCollectionCardIdValue = document.getElementById('cardId')?.value?.trim();
       const collectionCardIdValue = (queryCollectionCardIdValue !== undefined) ? queryCollectionCardIdValue : 0;
 
-      if (scannedBarcodeValue.length === 0 || supplyKitIdValue.length === 0 ||  returnKitIdValue.length === 0 ||
+      if (queryScannedBarcodeValue !== confirmScannedBarcodeValue) {
+        triggerErrorModal('Return tracking number doesn\'t match.');
+        return;
+      }
+      else if (scannedBarcodeValue.length === 0 || supplyKitIdValue.length === 0 ||  returnKitIdValue.length === 0 ||
         collectionCupIdValue.length === 0 || collectionCardIdValue.length === 0 || document.getElementById('dropdownSites').innerHTML !== 'Mouthwash') {
           triggerErrorModal('One or more fields are missing.');
           return
@@ -297,6 +297,7 @@ const storeAssembledKit = async (kitData) => {
 const alertTemplate = (message, status = "warn", duration = 3000) => {
   if (status === "success") {
     performQCcheck('returnKitId', 'supplyKitId', 'showReturnKitErrorMsg', ``);
+    performQCcheck('scannedBarcode2', 'scannedBarcode', 'showMsg', ``);
     performQCcheck('cardId', 'cupId', 'showCardIdErrorMsg', ``);
     alert = `
     <div id="alert-success" class="alert alert-success alert-dismissible fade show" role="alert">

src/pages/homeCollection/kitShipment.js

@@ -1,6 +1,6 @@
 import { nonUserNavBar } from "./../../navbar.js";
 import { homeCollectionNavbar } from "./homeCollectionNavbar.js";
-import { showAnimation, hideAnimation, getIdToken, baseAPI, convertDateReceivedinISO, triggerSuccessModal, triggerErrorModal, sendClientEmail, processResponse, checkTrackingNumberSource } from "../../shared.js";
+import { showAnimation, hideAnimation, getIdToken, baseAPI, convertDateReceivedinISO, triggerSuccessModal, triggerErrorModal, sendClientEmail, processResponse, checkTrackingNumberSource, numericInputValidator } from "../../shared.js";
 import { activeHomeCollectionNavbar } from "./homeCollectionNavbar.js";
 import { baselineMWKitRemainderTemplate } from "../../emailTemplates.js";
 import { conceptIds } from '../../fieldToConceptIdMapping.js';
@@ -26,7 +26,7 @@ const kitShipmentTemplate = async (name) => {
                       <div class="container-fluid" style="padding-top: 50px;">     
                           <div class="card">
                           <div class="card-body">
-                          <span> <h3 style="text-align: center; margin: 0 0 1rem;">Scan tracking number</h3> </span>
+                          <span> <h3 style="text-align: center; margin: 0 0 1rem;">Scan Supply Kit Tracking Number</h3> </span>
                             <div style="text-align: center;  padding-bottom: 25px; "> 
                               <span id="fieldModified"> Scan Barcode</span>  : <input required type="text" name="scannedBarcode" id="scannedBarcode"  /> 
                               <span id="showMsg" style="font-size: 14px;"></span>
@@ -37,6 +37,7 @@ const kitShipmentTemplate = async (name) => {
                   </div>
              </div>`;
   document.getElementById("contentBody").innerHTML = template;
+  numericInputValidator(['scannedBarcode']);
   document.getElementById("navbarNavAltMarkup").innerHTML = nonUserNavBar(name);
   activeHomeCollectionNavbar();
 };

src/pages/homeCollection/kitsReceipt.js

@@ -1,5 +1,5 @@
 import { homeCollectionNavbar } from "./homeCollectionNavbar.js";
-import { getIdToken, showAnimation, hideAnimation, convertDateReceivedinISO, baseAPI, triggerSuccessModal, triggerErrorModal, sendClientEmail, processResponse, checkTrackingNumberSource, getCurrentDate } from "../../shared.js";
+import { getIdToken, showAnimation, hideAnimation, convertDateReceivedinISO, baseAPI, triggerSuccessModal, triggerErrorModal, sendClientEmail, processResponse, checkTrackingNumberSource, getCurrentDate, numericInputValidator, autoTabAcrossArray } from "../../shared.js";
 import { baselineMWSurveyRemainderTemplate, baselineMWThankYouTemplate } from "../../emailTemplates.js";
 import { nonUserNavBar } from "./../../navbar.js";
 import { activeHomeCollectionNavbar } from "./homeCollectionNavbar.js";
@@ -33,7 +33,7 @@ const kitsReceiptTemplate = async (name) => {
                   <div class="mt-3" >
                   <br />
                   <div class="row form-group">
-                    <label class="col-form-label col-md-4" for="scannedBarcode">Scan Barcode</label>
+                    <label class="col-form-label col-md-4" for="scannedBarcode">Scan Return Kit Tracking Number</label>
                     <div style="display:inline-block;">
                       <input autocomplete="off" required="" class="col-md-8" type="text" id="scannedBarcode" style="width: 600px;" placeholder="Scan Barcode">
                       <span id="showMsg" style="padding-left: 10px;"></span>
@@ -110,6 +110,11 @@ template += `<div class="modal fade" id="modalShowMoreData" data-keyboard="false
 
   document.getElementById("navbarNavAltMarkup").innerHTML = nonUserNavBar(name);
   contentBody.innerHTML = template;
+
+  // Set up automatic tabbing between inputs upon scanning (assuming the scanner automatically inputs the enter key at the end)
+  autoTabAcrossArray(['scannedBarcode', 'packageCondition', 'receivePackageComments', 'dateReceived', 'collectionCheckBox', 'collectionId', 'dateCollectionCard', 'timeCollectionCard', 'collectionComments']);
+
+  numericInputValidator(['scannedBarcode']);
   activeHomeCollectionNavbar();
   checkTrackingNumberSource();
   performCollectionIdcheck();
@@ -121,6 +126,8 @@ const performCollectionIdcheck = () => {
     collectionIdField.addEventListener("input", (e) => {
       if (collectionIdField.value.length < 14) {
         document.getElementById('showCollectionErrorMsg').innerHTML = `<i class="fa fa-exclamation-circle" style="font-size: 14px; color: red;"></i> Enter Correct Collection ID`
+      } else {
+        document.getElementById('showCollectionErrorMsg').innerHTML = ``
       }
     })
   }

src/pages/receipts/csvFileReceipt.js

@@ -343,6 +343,14 @@ const vialMapping = {
           '0024': ['3 ml Vacutainer', 'EDTA = K2', 'WHOLE BL', '3'],
           '0006': ['10 ml Vacutainer', 'No Additive', 'Urine', '10']
         },
+        uOfChicagoMed: {
+          '0001': ['10 ml Serum separator tube', 'SST', 'Serum', '10'],
+          '0002': ['10 ml Serum separator tube', 'SST', 'Serum', '10'],
+          '0003': ['10 ml Vacutainer', 'Lithium Heparin', 'WHOLE BL', '10'],
+          '0004': ['10 ml Vacutainer', 'EDTA = K2', 'WHOLE BL', '10'],
+          '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'],
+          '0006': ['10 ml Vacutainer', 'No Additive', 'Urine', '10']
+        },
         default: {
             '0001': ['5 ml Serum separator tube', 'SST', 'Serum', '5'],
             '0002': ['5 ml Serum separator tube', 'SST', 'Serum', '5'],