Clean up clinic statuses and other work

Author: edwardhorsford

app/assets/sass/_utils.scss

@@ -0,0 +1,3 @@
+.app-nowrap {
+  white-space: nowrap;
+}

app/assets/sass/main.scss

@@ -5,7 +5,9 @@
 @import 'components/list-border';
 @import 'components/related-nav';
 
+@import 'utils';
+
 ///////////////////////////////////////////
 // Add your custom CSS/Sass styles below...
 ///////////////////////////////////////////
-  
+  

app/config.js

@@ -1,4 +1,6 @@
 // Use this file to change prototype configuration.
+const path = require('path');
+
 
 module.exports = {
   // Service name
@@ -16,4 +18,43 @@ module.exports = {
 
   // Enable or disable built-in docs and examples.
   useDocumentation: true,
+
+  paths: {
+    generatedData: path.join(__dirname, 'data/generated')
+  },
+
+  // Clinic settings
+  clinics: {
+    // Timing
+    startTime: '09:00',
+    endTime: '17:00',
+    slotDurationMinutes: 8,
+    slotsPerDay: 32,
+
+    // Capacity
+    targetBookings: 60,
+    targetAttendance: 40,
+
+    // Date range for generating data
+    daysToGenerate: 7,
+    daysBeforeToday: 3
+  },
+
+  screening: {
+    // Outcomes and their probabilities
+    outcomes: {
+      clear: 0.95,
+      needs_further_tests: 0.04,
+      cancer_detected: 0.01
+    },
+    
+    // Standard images taken during screening
+    standardImages: ['RCC', 'LCC', 'RMLO', 'LMLO']
+  },
+
+  // Data generation settings
+  generation: {
+    numberOfParticipants: 1000,
+    bookingProbability: 0.8  // 80% of slots are booked
+  }
 };

app/data/breast-screening-units.js

@@ -17,7 +17,7 @@ module.exports = [
     abbreviation: "OXF",
     locations: [
       {
-        id: generateId(),
+        id: "duif1ywp", // Must be hardcoded so it matches generated data
         name: "Churchill Hospital breast unit",
         type: "hospital",
         isMainSite: true,
@@ -43,14 +43,14 @@ module.exports = [
       //   }
       // },
       {
-        id: generateId(),
+        id: "2yt5dukk", // Must be hardcoded so it matches generated data
         name: "Mobile Unit WX71 HCP",
         type: "mobile_unit",
         isMainSite: false,
         registration: "WX71 HCP"
       },
       {
-        id: generateId(),
+        id: "acxcdcnj", // Must be hardcoded so it matches generated data
         name: "Mobile Unit WX71 HCR",
         type: "mobile_unit",
         isMainSite: false,

app/lib/generate-seed-data.js

@@ -4,6 +4,7 @@ const { faker } = require('@faker-js/faker');
 const weighted = require('weighted');
 const fs = require('fs');
 const path = require('path');
+const config = require('../config');
 
 const { generateParticipant } = require('./generators/participant-generator');
 const { generateClinicsForBSU } = require('./generators/clinic-generator');
@@ -13,33 +14,17 @@ const { generateEvent } = require('./generators/event-generator');
 const breastScreeningUnits = require('../data/breast-screening-units');
 const ethnicities = require('../data/ethnicities');
 
-const CONFIG = {
-  numberOfParticipants: 1000,
-  outputPath: path.join(__dirname, '../data/generated'),
-  clinicDefaults: {
-    slotsPerDay: 32,
-    daysToGenerate: 5,
-    startTime: '09:00',
-    endTime: '17:00',
-    slotDurationMinutes: 8
-  },
-  eventOutcomes: {
-    'clear': 0.95,
-    'needs_further_tests': 0.04,
-    'cancer_detected': 0.01
-  }
-};
-
 const generateData = async () => {
   // Create output directory if it doesn't exist
-  if (!fs.existsSync(CONFIG.outputPath)) {
-    fs.mkdirSync(CONFIG.outputPath, { recursive: true });
+  if (!fs.existsSync(config.paths.generatedData)) {
+    fs.mkdirSync(config.paths.generatedData, { recursive: true });
   }
 
   // Generate base data
   console.log('Generating participants...');
-  const participants = Array.from({ length: CONFIG.numberOfParticipants }, () => 
-    generateParticipant({ ethnicities, breastScreeningUnits })
+  const participants = Array.from(
+    { length: config.generation.numberOfParticipants }, 
+    () => generateParticipant({ ethnicities, breastScreeningUnits })
   );
 
   console.log('Generating clinics and events...');
@@ -48,31 +33,31 @@ const generateData = async () => {
 
   // Calculate date range
   const startDate = new Date();
-  startDate.setDate(startDate.getDate() - 3);
+  startDate.setDate(startDate.getDate() - config.clinics.daysBeforeToday);
 
-  for (let i = 0; i < CONFIG.clinicDefaults.daysToGenerate; i++) {
+  for (let i = 0; i < config.clinics.daysToGenerate; i++) {
     const clinicDate = new Date(startDate);
     clinicDate.setDate(clinicDate.getDate() + i);
 
-    // Generate clinics for each BSU (currently just Oxford)
+    // Generate clinics for each BSU
     breastScreeningUnits.forEach(unit => {
       const newClinics = generateClinicsForBSU({
         date: clinicDate,
         breastScreeningUnit: unit,
-        config: CONFIG.clinicDefaults
+        config: config.clinics
       });
 
       // Generate events for each clinic
       newClinics.forEach(clinic => {
         const clinicEvents = clinic.slots
-          .filter(slot => Math.random() > 0.2)
+          .filter(() => Math.random() < config.generation.bookingProbability)
           .map(slot => {
             const participant = faker.helpers.arrayElement(participants);
             return generateEvent({
               slot,
               participant,
               clinic,
-              outcomeWeights: CONFIG.eventOutcomes
+              outcomeWeights: config.screening.outcomes
             });
           });
 
@@ -86,7 +71,7 @@ const generateData = async () => {
   // Write generated data to files
   const writeData = (filename, data) => {
     fs.writeFileSync(
-      path.join(CONFIG.outputPath, filename),
+      path.join(config.paths.generatedData, filename),
       JSON.stringify(data, null, 2)
     );
   };

app/lib/generators/clinic-generator.js

@@ -3,6 +3,7 @@
 const { faker } = require('@faker-js/faker');
 const generateId = require('../utils/id-generator');
 const dayjs = require('dayjs');
+const config = require('../../config');
 
 const generateTimeSlots = (date, config) => {
   const slots = [];
@@ -26,24 +27,16 @@ const generateTimeSlots = (date, config) => {
 
 const determineClinicStatus = (date) => {
   const now = dayjs();
-  const clinicDate = dayjs(date);
-  const clinicStart = clinicDate.hour(8); // Assume clinic starts at 8am
-  const clinicEnd = clinicDate.hour(17); // Assume clinic ends at 5pm
+  const clinicDate = dayjs(date).startOf('day');
+  const today = now.startOf('day');
 
-  if (clinicDate.isBefore(now, 'day')) {
+  if (clinicDate.isBefore(today)) {
     return 'closed';
-  } else if (clinicDate.isAfter(now, 'day')) {
+  }
+  if (clinicDate.isAfter(today)) {
     return 'scheduled';
-  } else {
-    // Today - check time
-    if (now.isBefore(clinicStart)) {
-      return 'scheduled';
-    } else if (now.isAfter(clinicEnd)) {
-      return 'closed';
-    } else {
-      return 'in_progress';
-    }
   }
+  return 'in_progress';  // it's today
 };
 
 const generateMobileSiteName = () => {
@@ -64,7 +57,7 @@ const generateMobileSiteName = () => {
 };
 
 // Generate multiple clinics for a BSU on a given day
-const generateClinicsForBSU = ({ date, breastScreeningUnit, config }) => {
+const generateClinicsForBSU = ({ date, breastScreeningUnit, config: clinicConfig }) => {
   // Determine number of clinics for this BSU today (1-2)
   const numberOfClinics = Math.random() < 0.3 ? 2 : 1;
 
@@ -82,15 +75,15 @@ const generateClinicsForBSU = ({ date, breastScreeningUnit, config }) => {
       clinicType: location.type,
       locationId: location.id,
       siteName: location.type === 'mobile_unit' ? generateMobileSiteName() : null,
-      slots: generateTimeSlots(date, config),
+      slots: generateTimeSlots(date, clinicConfig),
       status: determineClinicStatus(date),
       staffing: {
         mamographers: [],
         radiologists: [],
         support: []
       },
-      targetBookings: 60,
-      targetAttendance: 40,
+      targetBookings: clinicConfig.targetBookings,
+      targetAttendance: clinicConfig.targetAttendance,
       notes: null
     };
   });

app/lib/utils/clinics.js

@@ -1,5 +1,9 @@
 // app/lib/utils/clinics.js
 
+
+const config = require('../../config');
+
+
 /**
  * Get today's clinics
  * @param {Array} clinics - Array of all clinics
@@ -37,12 +41,11 @@ const formatTimeSlot = (dateTime) => {
 /**
  * Calculate the end time of a slot
  * @param {string} slotDateTime - ISO date string
- * @param {number} durationMinutes - Duration of slot in minutes
  * @returns {Date} End time of slot
  */
-const getSlotEndTime = (slotDateTime, durationMinutes = 8) => {
+const getSlotEndTime = (slotDateTime) => {
   const date = new Date(slotDateTime);
-  date.setMinutes(date.getMinutes() + durationMinutes);
+  date.setMinutes(date.getMinutes() + config.clinics.slotDurationMinutes);
   return date;
 };
 

app/views/clinics/index.html

@@ -3,7 +3,9 @@
 
 {% set pageHeading = "All clinics" %}
 
-
+{% set back = {
+  href: "/"
+  } %}
 {% block pageContent %}
   <h1 class="nhsuk-heading-l">{{pageHeading}}</h1>
 
@@ -21,6 +23,7 @@ <h1 class="nhsuk-heading-l">{{pageHeading}}</h1>
       </thead>
       <tbody class="nhsuk-table__body">
         {% for clinic in data.clinics | sort(false, false, 'date') %}
+        {{ clinic | log }}
           {% set unit = data.breastScreeningUnits | findById(clinic.breastScreeningUnitId) %}
           {% set location = unit.locations | findById(clinic.locationId) %}
           {% set events = data.events | getClinicEvents(clinic.id) %}

app/views/clinics/show.html

@@ -45,11 +45,14 @@ <h1 class="nhsuk-heading-l">
               {{ participant.sxNumber }}
             </td>
             <td class="nhsuk-table__cell">
-              {{ event.status | replace("_", " ") | capitalize }}
+              {{ tag({
+                text: event.status | formatWords | sentenceCase,
+                classes: "nhsuk-tag--" + event.status | getStatusTagColour
+              })}}
             </td>
             <td class="nhsuk-table__cell">
               {% if event.status === 'scheduled' %}
-                <a href="/clinics/{{ clinicId }}/check-in/{{ event.id }}" class="nhsuk-link">Check in</a>
+                <a href="/clinics/{{ clinicId }}/check-in/{{ event.id }}" class="nhsuk-link">{{ "Check in" | nowrap | safe }}</a>
               {% endif %}
             </td>
           </tr>

app/views/clinics/today.html

@@ -1,6 +1,12 @@
 {% extends 'layout-app.html' %}
 
-{% set pageHeading = "Today's clinics" %}
+{% set pageHeading = "Today’s clinics" %}
+
+{% set back = {
+  href: "/clinics",
+  text: "All clinics"
+} %}
+
 
 {% block pageContent %}
   {% set todaysClinics = data.clinics | getTodaysClinics %}