Changed 'clinician' to 'vaccinator' (#380)

We’ve decided to change the "Clinician" permission boolean, which
controls whether that user can be selected as the vaccinator, to
"Vaccinator".

This is because in some settings, those who are not registered
clinicians can give vaccinators, such as healthcare assistants.

---------

Co-authored-by: Frankie Roberto <[email protected]>

Author: Anna-Sutton

app/data/users.js

@@ -105,7 +105,7 @@ module.exports = router => {
 
         const userOrgnisationSetting = (user.organisations || []).find((organisation) => organisation.id === data.currentOrganisationId)
 
-        return (user.id != data.currentUserId) && userOrgnisationSetting && userOrgnisationSetting.clinician && (userOrgnisationSetting.status === "Active")
+        return (user.id != data.currentUserId) && userOrgnisationSetting && userOrgnisationSetting.vaccinator && (userOrgnisationSetting.status === "Active")
       })
       .sort((a, b) => {
         const nameA = a.firstName.toUpperCase(); // ignore upper and lowercase

app/routes/record-vaccinations.js

@@ -231,7 +231,7 @@ module.exports = router => {
           id: organisation.id,
           status: 'Invited',
           permissionLevel: 'Lead administrator',
-          clinician: false
+          vaccinator: false
         }
       ]
     })

app/routes/regions.js

@@ -145,7 +145,7 @@ const userId = Math.floor(Math.random() * 10000000).toString()
           id: id,
           permissionLevel: req.body.permissionLevel,
           status: "Active",
-          clinician: (req.body.clinician === "yes")
+          vaccinator: (req.body.vaccinator === "yes")
         }
       ]
     })
@@ -233,7 +233,7 @@ const userId = Math.floor(Math.random() * 10000000).toString()
     const organisation = data.organisations.find((organisation) => organisation.id === organisationId)
     const userOrganisationSettings = user.organisations.find((organisation) => organisation.id === organisationId)
 
-    userOrganisationSettings.clinician = (req.body.clinician === "yes")
+    userOrganisationSettings.vaccinator = (req.body.vaccinator === "yes")
     userOrganisationSettings.status = req.body.status
     userOrganisationSettings.permissionLevel = req.body.permissionLevel
 

app/routes/support.js

@@ -155,14 +155,14 @@ module.exports = (router) => {
     const { lastName } = req.session.data
     const { email } = req.session.data
     const { permissionLevel } = req.session.data
-    const { clinician } = req.session.data
+    const { vaccinator } = req.session.data
 
     let existingUserWithSameEmail = false
     if (email) {
       existingUserWithSameEmail = data.users.find((user) => user.email === email)
     }
 
-    let firstNameError, lastNameError, emailError, permissionLevelError, clinicianError
+    let firstNameError, lastNameError, emailError, permissionLevelError, vaccinatorError
 
     if (!firstName || firstName === '') {
       firstNameError = 'Enter a first name'
@@ -184,17 +184,17 @@ module.exports = (router) => {
       permissionLevelError = 'Select a permission level'
     }
 
-    if (!clinician || clinician === '') {
-      clinicianError = 'Select if they’re a clinician'
+    if (!vaccinator || vaccinator === '') {
+      vaccinatorError = 'Select if they’re a vaccinator'
     }
 
-    if (firstNameError || lastNameError || emailError || permissionLevelError || clinicianError) {
+    if (firstNameError || lastNameError || emailError || permissionLevelError || vaccinatorError) {
       res.render('user-admin/add-user', {
         firstNameError,
         lastNameError,
         emailError,
         permissionLevelError,
-        clinicianError
+        vaccinatorError
       })
     } else {
       res.redirect('/user-admin/check')
@@ -205,7 +205,7 @@ module.exports = (router) => {
   router.post('/user-admin/add', (req, res) => {
 
     const data = req.session.data
-    const {firstName, lastName, email, permissionLevel, clinician} = data
+    const {firstName, lastName, email, permissionLevel, vaccinator} = data
 
     const existingUserWithSameEmail = data.users.find((user) => user.email === email)
 
@@ -216,7 +216,7 @@ module.exports = (router) => {
       existingUserWithSameEmail.organisations.push({
         id: data.currentOrganisationId,
         status: 'Invited',
-        clinician: (data.clinician === 'yes'),
+        vaccinator: (data.vaccinator === 'yes'),
         permissionLevel: data.permissionLevel
       })
 
@@ -230,7 +230,7 @@ module.exports = (router) => {
           {
             id: data.currentOrganisationId,
             status: 'Invited',
-            clinician: (data.clinician === 'yes'),
+            vaccinator: (data.vaccinator === 'yes'),
             permissionLevel: data.permissionLevel
           }
         ]
@@ -242,13 +242,13 @@ module.exports = (router) => {
     req.session.data.firstName = ''
     req.session.data.lastName = ''
     req.session.data.permissionLevel = ''
-    req.session.data.clinician = ''
+    req.session.data.vaccinator = ''
     req.session.data.showErrors = ''
 
     res.redirect('/user-admin')
   })
 
-  // Editing a user’s permission level and clinician status
+  // Editing a user’s permission level and vaccinator status
   router.get('/user-admin/users/:id/change-role', (req, res) => {
     const { id } = req.params
     const data = req.session.data
@@ -264,7 +264,7 @@ module.exports = (router) => {
     })
   })
 
-  // Updating a user’s permission level and clinician status
+  // Updating a user’s permission level and vaccinator status
   router.post('/user-admin/users/:id/update', (req, res) => {
     const { id } = req.params
 
@@ -273,11 +273,11 @@ module.exports = (router) => {
     const organisationSetting = user.organisations.find((organisation) => organisation.id === req.session.data.currentOrganisationId)
 
     organisationSetting.permissionLevel = req.body.permissionLevel
-    organisationSetting.clinician = (req.body.clinician === 'yes')
+    organisationSetting.vaccinator = (req.body.vaccinator === 'yes')
 
     // Reset session data
     req.session.data.permissionLevel = ''
-    req.session.data.clinician = ''
+    req.session.data.vaccinator = ''
 
     res.redirect('/user-admin')
   })

app/routes/user-admin.js

@@ -36,7 +36,7 @@
 
         {% set items = [] %}
 
-        {% if organisationSetting.clinician %}
+        {% if organisationSetting.vaccinator %}
           {% set items = (items.push({
             value: data.currentUserId,
             text: "Me (" + currentUser.firstName + " " + currentUser.lastName + ")"
@@ -61,7 +61,7 @@
             }
           },
           xhint: {
-            text: "Only users with clinician status are listed"
+            text: "Only users with vaccinator status are listed"
           },
           errorMessage: {
             text: vaccinatorError

app/views/record-vaccinations/vaccinator.html

@@ -17,7 +17,7 @@ <h2 class="nhsuk-heading-s">3. Get ready to record vaccinations</h2>
   <ul class="nhsuk-list nhsuk-list--bullet">
                     <li>go to the ‘Vaccines’ section and add vaccines for your organisation</li>
                     <li>go to ‘Manage users’ to add more users to your organisation</li>
-                    <li>if you are a clinician, go to your profile in ‘Manage users’ and select that you are a clinician</li></ul>
+                    <li>if you can give vaccinations, go to your profile in ‘Manage users’ and select that you are a vaccinator</li></ul>
   <p>Kind regards,</p>
   <p>NHS Record a vaccination</p>
 

app/views/regions/_email-preview.html

@@ -53,7 +53,7 @@
               text: "Staff",
               checked: (data.data | arrayOrStringIncludes("Staff")),
               hint: {
-                text: "Recorder, vaccinator, assessing and consenting clinician names and email addresses"
+                text: "Recorder or vaccinator names and email addresses"
               }
             },
             {

app/views/reports/choose-data.html

@@ -56,20 +56,20 @@ <h1 class="nhsuk-header-l">Add user</h1>
       }) }}
 
       {{ radios({
-        name: "clinician",
+        name: "vaccinator",
         fieldset: {
           legend: {
-            text: "Are they a registered clinician?"
+            text: "Are they a vaccinator?"
           }
         },
         hint: {
-          text: "Only registered clinicians can assess the patient and record their consent"
+          text: "Vaccination records include the name of the person who gave the vaccination"
         },
         "items": [
           {
             value: "yes",
             text: "Yes",
-            id: "clinician"
+            id: "vaccinator"
           },
           {
             value: "no",

app/views/support/organisations/add-user.html

@@ -157,7 +157,7 @@ <h2 class="nhsuk-heading-m">Users</h2>
                 Permission level
               </th>
               <th role="columnheader" class="" scope="col">
-                Clinician
+                Vaccinator
               </th>
               <th role="columnheader" class="" scope="col">
                 Status
@@ -178,7 +178,7 @@ <h2 class="nhsuk-heading-m">Users</h2>
                   {{ userOrganisationSettings.permissionLevel }}
                 </td>
                 <td class="nhsuk-table__cell " style="min-width: 150px;">
-                  {{ "Yes" if userOrganisationSettings.clinician else "No" }}
+                  {{ "Yes" if userOrganisationSettings.vaccinator else "No" }}
                 </td>
                 <td class="nhsuk-table__cell ">
                   {{ userOrganisationSettings.status }}