Rename to worthing and misc cleanup

Author: edwardhorsford

app/assets/sass/components/_secondary-navigation.scss

@@ -1,3 +1,9 @@
+$govuk-spacing1: 5px;
+$govuk-spacing2: 10px;
+$govuk-spacing3: 15px;
+$govuk-spacing4: 20px;
+
+
 .app-secondary-navigation {
   @include nhsuk-responsive-margin(4, "bottom");
 }
@@ -7,12 +13,12 @@
 }
 
 .app-secondary-navigation__list-item--current {
-  border-bottom-width: nhsuk-spacing(1);
+  border-bottom-width: $govuk-sacing1;
 }
 
 .app-secondary-navigation__link {
-  padding-left: nhsuk-spacing(3);
-  padding-right: nhsuk-spacing(3);
+  padding-left: $govuk-spacing3;
+  padding-right: $govuk-spacing3;
 }
 
 // --------
@@ -56,14 +62,14 @@
   box-sizing: border-box;
   display: block;
   float: left;
-  margin-right: nhsuk-spacing(4);
-  padding-bottom: nhsuk-spacing(2);
-  padding-top: nhsuk-spacing(2);
+  margin-right: $govuk-spacing4;
+  padding-bottom: $govuk-spacing2;
+  padding-top: $govuk-spacing2;
   position: relative;
 
   // More generous padding beneath items on wider screens
   @include mq($from: tablet) {
-    padding-bottom: nhsuk-spacing(3);
+    padding-bottom: $govuk-spacing3;
   }
 }
 
@@ -76,11 +82,11 @@
 
 .app-secondary-navigation__list-item--current {
   border-bottom: $nhsuk-border-width solid $color_nhsuk-blue;
-  padding-bottom: nhsuk-spacing(1);
+  padding-bottom: $govuk-sacing1;
 
   // More generous padding beneath items on wider screens
   @include mq($from: tablet) {
-    padding-bottom: nhsuk-spacing(2);
+    padding-bottom: $govuk-spacing2;
   }
 }
 

app/data/breast-screening-units.js

@@ -4,17 +4,17 @@ const generateId = require('../lib/utils/id-generator');
 module.exports = [
   {
     id: "m5ekcxvu", // Must be hardcoded so it matches generated data
-    name: "Oxford Breast Imaging Centre",
+    name: "West Sussex BSS",
     address: {
-      line1: "Surgery and Diagnostics Centre",
-      line2: "Churchill Hospital",
-      line3: "Old Road",
+      line1: "Breast Screening Unit",
+      line2: "Worthing Hospital",
+      line3: "Lyndhurst Rd",
       line4: "Headington",
-      city: "Oxford",
-      postcode: "OX3 7LE"
+      city: "Worthing",
+      postcode: "BN11 2DH"
     },
     phoneNumber: "01865235621",
-    abbreviation: "OXF",
+    abbreviation: "WSB",
     serviceTypes: ['screening', 'assessment'],  // Can do both
     // Default operating hours for the BSU
     sessionPatterns: [
@@ -37,16 +37,16 @@ module.exports = [
     locations: [
       {
         id: "duif1ywp", // Must be hardcoded so it matches generated data
-        name: "Churchill Hospital breast unit",
+        name: "West Sussex BSS",
         type: "hospital",
         isMainSite: true,
         address: {
-          line1: "Surgery and Diagnostics Centre",
-          line2: "Churchill Hospital",
-          line3: "Old Road",
+          line1: "Breast Screening Unit",
+          line2: "Worthing Hospital",
+          line3: "Lyndhurst Rd",
           line4: "Headington",
-          city: "Oxford",
-          postcode: "OX3 7LE"
+          city: "Worthing",
+          postcode: "BN11 2DH"
         }
       },
       // {

app/data/users.js

@@ -5,6 +5,6 @@ module.exports = [
     role: "mamographer",
     email: "[email protected]",
     id: "ae7537b3-aed1-4620-87fd-9dc5b5bdc8cb",
-    breastScreeningUnit: "f66f2a7d-99a8-4793-8371-3d075e1a7c54"
+    breastScreeningUnit: "m5ekcxvu"
   }
 ]

app/lib/utils/clinics.js

@@ -21,8 +21,8 @@ const getTodaysClinics = (clinics) => {
  */
 const getClinicEvents = (events, clinicId) => {
   if (!events || !clinicId) return [];
-  console.log(`Looking for events with clinicId: ${clinicId}`);
-  console.log(`Found ${events.filter(e => e.clinicId === clinicId).length} events`);
+  // console.log(`Looking for events with clinicId: ${clinicId}`);
+  // console.log(`Found ${events.filter(e => e.clinicId === clinicId).length} events`);
   return events.filter(e => e.clinicId === clinicId);
 };
 

app/views/clinics/index.html

@@ -58,7 +58,7 @@ <h1>{{pageHeading}}</h1>
           <th scope="col">Location</th>
           <th scope="col">Date</th>
           <th scope="col">Service type</th>
-          <th scope="col" class="nhsuk-table__cell--numeric">Status</th>
+          <th scope="col">Status</th>
           <th scope="col" class="nhsuk-table__cell--numeric">Participants</th>
         </tr>
       </thead>

app/views/clinics/show.html

@@ -96,7 +96,9 @@ <h2 class="nhsuk-heading-m">Details</h2>
       <dt class="nhsuk-summary-list__key">Location</dt>
       <dd class="nhsuk-summary-list__value">
         {{ unit.name }}<br>
-        {{ unit.address | replace("\n", "<br>") | safe }}
+        {% for item, line in unit.address %}
+          {{ line }}{% if not loop.last %}<br>{% endif %}
+        {% endfor %}
       </dd>
     </div>
 

app/views/participants/show.html

@@ -107,7 +107,10 @@ <h2 class="nhsuk-heading-m">Personal details</h2>
     </div>
   </dl>
 
-  <h2 class="nhsuk-heading-m">Medical information</h2>
+  {% if participant.medicalInformation.riskFactors | length or participant.currentHealthInformation.medications | length %}
+    <h2 class="nhsuk-heading-m">Medical information</h2>
+  {% endif %}
+
 
   <dl class="nhsuk-summary-list">
     {% if participant.medicalInformation.riskFactors.length > 0 %}