diff --git a/app/assets/sass/components/_session-slots.scss b/app/assets/sass/components/_session-slots.scss new file mode 100644 index 00000000..175fe706 --- /dev/null +++ b/app/assets/sass/components/_session-slots.scss @@ -0,0 +1,58 @@ +@use "nhsuk-frontend/dist/nhsuk/core" as *; + +.slot { + background-color: nhsuk-colour("white"); + border: 1px solid $nhsuk-input-border-colour; + padding-left: nhsuk-spacing(2); + user-select: none; + @include nhsuk-responsive-margin(2, "bottom"); + min-height: nhsuk-px-to-rem(46px); +} + +.slot-end { + @include nhsuk-font-size(16); + margin-right: 1rem; +} +.slot-tag { margin-left: 1rem; } + +.slot.is-hold {} + +.slot.is-staff-break { + background: repeating-linear-gradient(130deg, nhsuk-colour("grey-4"), nhsuk-colour("grey-4") 1px, transparent 1px, transparent 12px); + border-color: $nhsuk-border-colour; +} + +.slot.is-special-appointment {} + +.slot.is-merged { + border-bottom: none; + margin-bottom: 0; +} +.slot.is-merged-child { + border-top: 1px dashed #212b32; + height: 42px; +} +.slot.is-merged-child > .nhsuk-checkboxes__item, +.slot.is-merged-child > div { + display: none; +} +.slot.is-merged-last-child { + border-bottom: 1px solid #212b32; + margin-bottom: 12px; +} + +.slot.is-staff-break.is-merged-last-child { + border-bottom-style: dashed; +} + +.slot.is-merged-child > .slot-time, +.slot.is-merged-child > .slot-end { + display: none; +} + +.slot .nhsuk-checkboxes__label { + width: 100%; +} + +.panel-item { display: block; cursor: pointer; } +.panel-item.disabled { opacity: 0.38; cursor: default; pointer-events: none; } diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index cdf5f741..2534b84e 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -20,8 +20,6 @@ $nhsuk-gutter: 24px, // Reduce layout spacing points (5–9). Points 0–4 stay at NHS defaults. - // Checkbox and radio geometry is fixed in px rather than driven by the spacing scale, - // and _compact.scss applies the --small variant to all checkboxes/radios. $nhsuk-spacing-points: ( 0: 0, 1: 4px, @@ -94,6 +92,7 @@ @forward "components/participant-table"; //@forward "components/participant-search"; @forward "components/progress-bar"; +@forward "components/session-slots"; @forward "components/template-card"; @forward "components/template-preview-dialog"; @forward "components/workflow"; @@ -230,4 +229,7 @@ a { } .app-tag--attached { margin-right: -1px; +} +.app-nowrap { + white-space: nowrap; } \ No newline at end of file diff --git a/app/data/session-data-defaults.js b/app/data/session-data-defaults.js index 8003d2d0..45ef5a4b 100644 --- a/app/data/session-data-defaults.js +++ b/app/data/session-data-defaults.js @@ -14,6 +14,7 @@ module.exports = { clinicCapacityPercentBooked: "0", clinicCapacityAvailable: "10", clinicCapacityTotal: "10", + missionOne: {}, createCapacityFromZero: { schedules: [], selectedDays: [], diff --git a/app/routes/mission-1.js b/app/routes/mission-1.js index c0ea97cd..94be000d 100644 --- a/app/routes/mission-1.js +++ b/app/routes/mission-1.js @@ -4,12 +4,37 @@ const router = express.Router() // Routes and functions specific to Mission 1 prototypes /* -/appviews/september-iteration-2/ +/app/views/mission-1/current-iteration/ */ +const isWholeNumber = str => /^\d+$/.test(str) + +// Checks a { day, month, year } object has numeric values for each field, regardless of whether they form a real date +const hasDateFields = (dateObj) => + Boolean(dateObj) && isWholeNumber(dateObj.day) && isWholeNumber(dateObj.month) && isWholeNumber(dateObj.year) + +// Parses a { day, month, year } object into a Date, or null if invalid +const parseDateFields = (dateObj) => { + if (!hasDateFields(dateObj)) { + return null + } + + const day = parseInt(dateObj.day, 10) + const month = parseInt(dateObj.month, 10) + // Treat 2-digit years as shorthand for the 2000s, eg "26" becomes 2026 + const year = dateObj.year.length === 2 ? parseInt(`20${dateObj.year}`, 10) : parseInt(dateObj.year, 10) + const date = new Date(year, month - 1, day) + + if (date.getFullYear() !== year || date.getMonth() !== month - 1 || date.getDate() !== day) { + return null + } + + return date +} + // simple search -router.get('/september-iteration-2/clickthru/04a-example-search-result', function (req, res) { +router.get('/mission-1/current-iteration/clickthru/04a-example-search-result', function (req, res) { const query = (req.query['search-params'] || '').trim() const allParticipants = (req.session.data.participants && req.session.data.participants.default) || [] const normalizedQuery = query.toLowerCase().replace(/\s+/g, ' ') @@ -31,7 +56,7 @@ router.get('/september-iteration-2/clickthru/04a-example-search-result', functio return null }).filter(Boolean) : allParticipants.map((participant, index) => Object.assign({}, participant, { participantIndex: index }))) - res.render('september-iteration-2/clickthru/04a-example-search-result', { + res.render('mission-1/current-iteration/clickthru/04a-example-search-result', { participants: searchResults, searchQuery: query }) @@ -47,7 +72,7 @@ router.get('/action/stage/:participantId', function (req, res) { req.session.data.stagedCount++ } - res.redirect(req.get('referer') || '/september-iteration-2/clickthru/04-choose-participants') + res.redirect(req.get('referer') || '/mission-1/current-iteration/clickthru/04-choose-participants') }); router.get('/action/unstage/:participantId', function (req, res) { const participants = (req.session.data.participants && req.session.data.participants.default) || [] @@ -58,11 +83,232 @@ router.get('/action/unstage/:participantId', function (req, res) { req.session.data.stagedCount-- } - res.redirect(req.get('referer') || '/september-iteration-2/clickthru/04-choose-participants') + res.redirect(req.get('referer') || '/mission-1/current-iteration/clickthru/04-choose-participants') }); +// validating clinic name for 1 day clinic creation +router.post('/mission-1/current-iteration/create-clinic-rev-1-name', function (req, res) { + const clinicName = (req.body.clinicName || '').trim() + + if (!req.session.data.missionOne || typeof req.session.data.missionOne !== 'object') { + req.session.data.missionOne = {} + } + req.session.data.missionOne.clinicName = clinicName + + const errors = {} + + if (!clinicName) { + errors.clinicName = 'Clinic must be given a name' + } + + if (Object.keys(errors).length > 0) { + return res.render('mission-1/current-iteration/create-clinic-rev-1-name', { + errors + }) + } + + res.redirect('/mission-1/current-iteration/create-clinic-rev-1-schedule') +}) + +// validating the scheduled date for 1 day clinic creation +router.post('/mission-1/current-iteration/create-clinic-rev-1-schedule', function (req, res) { + const clinicDate = req.body.clinicDate || {} + + if (typeof clinicDate.year === 'string' && /^\d{2}$/.test(clinicDate.year)) { + clinicDate.year = `20${clinicDate.year}` + } + + if (!req.session.data.missionOne || typeof req.session.data.missionOne !== 'object') { + req.session.data.missionOne = {} + } + req.session.data.missionOne.clinicDate = clinicDate + + const errors = {} + + if (!hasDateFields(clinicDate)) { + errors.clinicDate = 'Date of clinic must be given a day, month, and year' + } else { + const parsedDate = parseDateFields(clinicDate) + const today = new Date() + today.setHours(0, 0, 0, 0) + + if (!parsedDate || parsedDate <= today) { + errors.clinicDate = 'Date of clinic must be in the future' + } + } + + if (Object.keys(errors).length > 0) { + return res.render('mission-1/current-iteration/create-clinic-rev-1-schedule', { + errors + }) + } + + res.redirect('/mission-1/current-iteration/create-clinic-rev-1-set-timings') +}) + +// validating clinic session times for 1 day clinic creation +router.post('/mission-1/current-iteration/create-clinic-rev-1-set-timings', function (req, res) { + const newSession = req.body.newSession || {} + const startTime = newSession.startTime || {} + const endTime = newSession.endTime || {} + + const startHourStr = (startTime.hour || '').trim() + const startMinuteStr = (startTime.minute || '').trim() + const endHourStr = (endTime.hour || '').trim() + const endMinuteStr = (endTime.minute || '').trim() + const durationStr = (newSession.duration || '').trim() + + const startHour = parseInt(startHourStr, 10) + const startMinute = parseInt(startMinuteStr, 10) + const endHour = parseInt(endHourStr, 10) + const endMinute = parseInt(endMinuteStr, 10) + const duration = parseInt(durationStr, 10) + + const validStartHour = isWholeNumber(startHourStr) && startHour >= 0 && startHour <= 23 + const validStartMinute = isWholeNumber(startMinuteStr) && startMinute >= 0 && startMinute <= 59 + const validEndHour = isWholeNumber(endHourStr) && endHour >= 0 && endHour <= 23 + const validEndMinute = isWholeNumber(endMinuteStr) && endMinute >= 0 && endMinute <= 59 + + const errors = {} + + if (!validStartHour || !validStartMinute) { + errors.startTime = 'Start time must be entered, in 24 hour format' + } + + if (!validEndHour || !validEndMinute) { + errors.endTime = 'End time must be entered, in 24 hour format' + } + + if (!isWholeNumber(durationStr) || duration <= 0) { + errors.duration = 'Slot length must be entered, in minutes' + } + + if (!errors.startTime && !errors.endTime) { + const startTotalMinutes = startHour * 60 + startMinute + const endTotalMinutes = endHour * 60 + endMinute + if (endTotalMinutes <= startTotalMinutes) { + errors.startTime = 'Start time must be earlier than end time' + errors.endTime = 'End time must be later than start time' + } + } + + if (typeof req.session.data.missionOne !== 'object') { + req.session.data.missionOne = {} + } + req.session.data.missionOne.startTime = startTime + req.session.data.missionOne.endTime = endTime + req.session.data.missionOne.duration = durationStr + + if (Object.keys(errors).length > 0) { + return res.render('mission-1/current-iteration/create-clinic-rev-1-set-timings', { + errors + }) + } + + res.redirect('/mission-1/current-iteration/create-clinic-rev-1-slot-structure') +}) + +// Formats a total minutes-from-midnight value as e.g. "10:08" +const formatClock = (totalMinutes) => { + const hour = Math.floor(totalMinutes / 60) % 24 + const minute = totalMinutes % 60 + return `${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}` +} + +// Builds the slot checkbox data for a clinic session, flagging any slots marked as staff breaks +const buildSessionSlots = (missionOne) => { + const startTime = missionOne.startTime || {} + const endTime = missionOne.endTime || {} + + const startMinutes = (parseInt(startTime.hour, 10) || 0) * 60 + (parseInt(startTime.minute, 10) || 0) + const endMinutes = (parseInt(endTime.hour, 10) || 0) * 60 + (parseInt(endTime.minute, 10) || 0) + const duration = parseInt(missionOne.duration, 10) || 0 + const staffBreakSlots = (missionOne.staffBreakSlots || []).map(Number).filter(Number.isInteger) + + const slots = [] + + if (duration > 0 && endMinutes > startMinutes) { + const slotCount = Math.floor((endMinutes - startMinutes) / duration) + + for (let i = 0; i < slotCount; i++) { + const slotStartMinutes = startMinutes + (i * duration) + slots.push({ + index: i, + startLabel: formatClock(slotStartMinutes), + endLabel: formatClock(slotStartMinutes + duration), + isStaffBreak: staffBreakSlots.includes(i) + }) + } + } + + const bookableSlotCount = slots.filter((slot) => !slot.isStaffBreak).length + const staffBreakSlotCount = slots.filter((slot) => slot.isStaffBreak).length + missionOne.bookableSlotCount = bookableSlotCount + missionOne.staffBreakSlotCount = staffBreakSlotCount + + return { + slots, + bookableSlotCount, + staffBreakSlotCount, + sessionStartLabel: formatClock(startMinutes), + sessionEndLabel: formatClock(endMinutes) + } +} + +// computing the real slot structure from the submitted session times for 1 day clinic creation +router.get('/mission-1/current-iteration/create-clinic-rev-1-slot-structure', function (req, res) { + const missionOne = req.session.data.missionOne || {} + + res.render('mission-1/current-iteration/create-clinic-rev-1-slot-structure', buildSessionSlots(missionOne)) +}) + +// marking the selected slots as staff breaks for 1 day clinic creation +router.post('/mission-1/current-iteration/mark-staff-break', function (req, res) { + const missionOne = req.session.data.missionOne || {} + // nhsuk-frontend's checkboxes component submits an "_unchecked" sentinel for every untoggled box, so filter down to real indices + const selectedSlots = [].concat(req.body.computedSlots || []).map(Number).filter(Number.isInteger) + + const errors = {} + if (selectedSlots.length === 0) { + errors.slots = 'Select at least one slot' + } + + if (Object.keys(errors).length > 0) { + return res.render('mission-1/current-iteration/create-clinic-rev-1-slot-structure', Object.assign({ errors }, buildSessionSlots(missionOne))) + } + + const staffBreakSlots = new Set((missionOne.staffBreakSlots || []).map(Number).filter(Number.isInteger)) + selectedSlots.forEach((index) => staffBreakSlots.add(index)) + missionOne.staffBreakSlots = Array.from(staffBreakSlots) + req.session.data.missionOne = missionOne + + res.redirect('/mission-1/current-iteration/create-clinic-rev-1-slot-structure') +}) + +// clearing staff break status from the selected slots for 1 day clinic creation +router.post('/mission-1/current-iteration/clear-slot-type', function (req, res) { + const missionOne = req.session.data.missionOne || {} + // nhsuk-frontend's checkboxes component submits an "_unchecked" sentinel for every untoggled box, so filter down to real indices + const selectedSlots = [].concat(req.body.computedSlots || []).map(Number).filter(Number.isInteger) + + const errors = {} + if (selectedSlots.length === 0) { + errors.slots = 'Select at least one slot' + } + + if (Object.keys(errors).length > 0) { + return res.render('mission-1/current-iteration/create-clinic-rev-1-slot-structure', Object.assign({ errors }, buildSessionSlots(missionOne))) + } + + const selectedSet = new Set(selectedSlots) + missionOne.staffBreakSlots = (missionOne.staffBreakSlots || []).map(Number).filter(Number.isInteger).filter((index) => !selectedSet.has(index)) + req.session.data.missionOne = missionOne + + res.redirect('/mission-1/current-iteration/create-clinic-rev-1-slot-structure') +}) + // creating and passing Total Slots through for 1 day clinic creation -router.post('/september-iteration-2/create-clinic-rev-1-publish-check', function (req, res) { +router.post('/mission-1/current-iteration/create-clinic-rev-1-publish-check', function (req, res) { const newSession = req.session.data.newSession || {} const startTime = newSession.startTime || {} const endTime = newSession.endTime || {} @@ -73,7 +319,7 @@ router.post('/september-iteration-2/create-clinic-rev-1-publish-check', function newSession.totalSlots = duration > 0 ? Math.floor((endMinutes - startMinutes) / duration) : 0 - res.render('september-iteration-2/create-clinic-rev-1-publish-check') + res.render('mission-1/current-iteration/create-clinic-rev-1-publish-check') }) module.exports = router \ No newline at end of file diff --git a/app/views/_macros/clinic-listing.html b/app/views/_macros/clinic-listing.html index a867528f..181a5498 100644 --- a/app/views/_macros/clinic-listing.html +++ b/app/views/_macros/clinic-listing.html @@ -1,5 +1,5 @@ {% macro clinic_listing(options) %} - +
diff --git a/app/views/index.html b/app/views/index.html index 091f5dee..12d876e2 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -165,20 +165,20 @@

March 2026

Mission 1

- Mural: 0000-01 C2C September Test + Mural: 0000-01 C2C September Test

Create clinic module: live test #2

Enable test BSO to creat a clinic lasting one day

  1. - Create a new clinic from listing page + Create a new clinic from listing page

Live test #1

Users upload a csv containing the participants they wish to book into a prearranged single day clinic.

- Click-thru journey + Click-thru journey

@@ -192,34 +192,34 @@

Iteration 1

Users upload a csv containing the participants they wish to book into a prearranged single day clinic.

  1. - Upload a batch + Upload a batch
  2. - Batch detail for trimmed csv + Batch detail for trimmed csv
  3. - Pre-appointment confirmation + Pre-appointment confirmation
  4. - Single day of appointments + Single day of appointments

Defunct work on finding and grouping participants. Components to be reused elsewhere.

  1. - Batch detail + Batch detail
  2. - Search participants + Search participants
  3. - Search results + Search results
  4. - Group + Group
  5. - [Utility] "appointing" spinner + [Utility] "appointing" spinner
diff --git a/app/views/september-iteration-2/clickthru/01-upload.html b/app/views/mission-1/current-iteration/clickthru/01-upload.html similarity index 59% rename from app/views/september-iteration-2/clickthru/01-upload.html rename to app/views/mission-1/current-iteration/clickthru/01-upload.html index 9f81fbba..10a0345b 100644 --- a/app/views/september-iteration-2/clickthru/01-upload.html +++ b/app/views/mission-1/current-iteration/clickthru/01-upload.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -10,7 +10,7 @@ {% block beforeContent %}{% endblock %} {% block content %} - {% from "september-iteration-2/macros/batch-upload.html" import upload %} + {% from "mission-1/current-iteration/macros/batch-upload.html" import upload %} {{ upload({ button_url:"02-batch-detail" }) }} diff --git a/app/views/september-iteration-2/clickthru/02-batch-detail.html b/app/views/mission-1/current-iteration/clickthru/02-batch-detail.html similarity index 75% rename from app/views/september-iteration-2/clickthru/02-batch-detail.html rename to app/views/mission-1/current-iteration/clickthru/02-batch-detail.html index 374933e2..e5e2ae7b 100644 --- a/app/views/september-iteration-2/clickthru/02-batch-detail.html +++ b/app/views/mission-1/current-iteration/clickthru/02-batch-detail.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -23,7 +23,7 @@ - {% from "september-iteration-2/macros/batch-detail.html" import batch_detail %} + {% from "mission-1/current-iteration/macros/batch-detail.html" import batch_detail %} {{ batch_detail({ participant_count: data.participants.default.length, button_url:"03-select-clinic" diff --git a/app/views/september-iteration-2/clickthru/03-select-clinic.html b/app/views/mission-1/current-iteration/clickthru/03-select-clinic.html similarity index 91% rename from app/views/september-iteration-2/clickthru/03-select-clinic.html rename to app/views/mission-1/current-iteration/clickthru/03-select-clinic.html index 257a5821..14cc36ef 100644 --- a/app/views/september-iteration-2/clickthru/03-select-clinic.html +++ b/app/views/mission-1/current-iteration/clickthru/03-select-clinic.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/september-iteration-2/clickthru/04-choose-participants.html b/app/views/mission-1/current-iteration/clickthru/04-choose-participants.html similarity index 92% rename from app/views/september-iteration-2/clickthru/04-choose-participants.html rename to app/views/mission-1/current-iteration/clickthru/04-choose-participants.html index 6c89f9d8..7dfb4d1e 100644 --- a/app/views/september-iteration-2/clickthru/04-choose-participants.html +++ b/app/views/mission-1/current-iteration/clickthru/04-choose-participants.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -17,7 +17,7 @@

-{% from "september-iteration-2/macros/search-component.html" import participant_search %} +{% from "mission-1/current-iteration/macros/search-component.html" import participant_search %} {{ participant_search({ form_action: "04a-example-search-result", search_query: searchQuery @@ -25,7 +25,7 @@

- {% from "september-iteration-2/macros/participant-listing.html" import participant_listing %} + {% from "mission-1/current-iteration/macros/participant-listing.html" import participant_listing %} {{ participant_listing({ mode: "browse", participants: data.participants.default @@ -53,7 +53,7 @@

-{% include "september-iteration-2/includes/participant-staging-control.html" %} +{% include "mission-1/current-iteration/includes/participant-staging-control.html" %} {% endblock %} {% block pageScripts %} diff --git a/app/views/september-iteration-2/clickthru/04a-example-search-result.html b/app/views/mission-1/current-iteration/clickthru/04a-example-search-result.html similarity index 65% rename from app/views/september-iteration-2/clickthru/04a-example-search-result.html rename to app/views/mission-1/current-iteration/clickthru/04a-example-search-result.html index 90ee65dd..2feb9e45 100644 --- a/app/views/september-iteration-2/clickthru/04a-example-search-result.html +++ b/app/views/mission-1/current-iteration/clickthru/04a-example-search-result.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -17,7 +17,7 @@

-{% from "september-iteration-2/macros/search-component.html" import participant_search %} +{% from "mission-1/current-iteration/macros/search-component.html" import participant_search %} {{ participant_search({ form_action: "04a-example-search-result", search_query: searchQuery @@ -25,7 +25,7 @@

- {% from "september-iteration-2/macros/participant-listing.html" import participant_listing %} + {% from "mission-1/current-iteration/macros/participant-listing.html" import participant_listing %} {{ participant_listing({ mode: "search", participants: participants @@ -36,7 +36,7 @@

-{% include "september-iteration-2/includes/participant-staging-control.html" %} +{% include "mission-1/current-iteration/includes/participant-staging-control.html" %} {% endblock %} diff --git a/app/views/september-iteration-2/clickthru/05-review.html b/app/views/mission-1/current-iteration/clickthru/05-review.html similarity index 89% rename from app/views/september-iteration-2/clickthru/05-review.html rename to app/views/mission-1/current-iteration/clickthru/05-review.html index f54b1e1c..eacd6b0d 100644 --- a/app/views/september-iteration-2/clickthru/05-review.html +++ b/app/views/mission-1/current-iteration/clickthru/05-review.html @@ -2,7 +2,7 @@ {% set pageName = "Assign slots to participants" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -94,7 +94,11 @@

into {{ data.clinicName }}

-

Participants will be booked in random order.

+
+ Information: +

Booking {{ data.stagedCount }} people into this clinic will leave {{ data.clinicCapacityAvailable - data.stagedCount }} slots available

+

Participants will be booked in random order

+
diff --git a/app/views/september-iteration-2/clickthru/05a-review-interrupt.html b/app/views/mission-1/current-iteration/clickthru/05a-review-interrupt.html similarity index 72% rename from app/views/september-iteration-2/clickthru/05a-review-interrupt.html rename to app/views/mission-1/current-iteration/clickthru/05a-review-interrupt.html index ac909aac..d7ebb1d1 100644 --- a/app/views/september-iteration-2/clickthru/05a-review-interrupt.html +++ b/app/views/mission-1/current-iteration/clickthru/05a-review-interrupt.html @@ -2,7 +2,7 @@ {% set pageName = "Assign slots to participants" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -19,13 +19,13 @@

- 2 slots remaining + 2 slots still available

- You are booking 8 participants into Test Clinic which has 10 slots available. + You are booking 8 participants into Worthing - test day September 2026 which has 10 slots available.

-

Do you want to go back and add participants?

+

Do you want to go back and add more participants?

Go back diff --git a/app/views/september-iteration-2/clickthru/06-booked.html b/app/views/mission-1/current-iteration/clickthru/06-booked.html similarity index 86% rename from app/views/september-iteration-2/clickthru/06-booked.html rename to app/views/mission-1/current-iteration/clickthru/06-booked.html index 69ba95e5..f4d34351 100644 --- a/app/views/september-iteration-2/clickthru/06-booked.html +++ b/app/views/mission-1/current-iteration/clickthru/06-booked.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -49,7 +49,7 @@

- {% include "september-iteration-2/includes/day-list-hard-coded.html" %} + {% include "mission-1/current-iteration/includes/day-list-hard-coded.html" %} {% endblock %} diff --git a/app/views/mission-1/current-iteration/create-clinic-rev-1-name.html b/app/views/mission-1/current-iteration/create-clinic-rev-1-name.html new file mode 100644 index 00000000..77b89b54 --- /dev/null +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-name.html @@ -0,0 +1,103 @@ +{% extends 'layout.html' %} + +{% set errorState = "true" if errors else "false" %} + +{% set pageName = "Create day clinic" %} + +{% block content %} + +{% set tickSvg %} + +{% endset %} + +
+
+ +
+ +
+ +
+
+
+ + {% if errorState === "true" %} + {% set errorList = [] %} + {% if errors.clinicName %} + {% set errorList = errorList.concat([{ text: errors.clinicName, href: "#clinic-name" }]) %} + {% endif %} + {% if errors.clinicDate %} + {% set errorList = errorList.concat([{ text: errors.clinicDate, href: "#clinic-date-day" }]) %} + {% endif %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errorList + }) }} + {% endif %} + +
+ +
+

+ +

+ {% if errors and errors.clinicName %} + + Error: {{ errors.clinicName }} + + {% endif %} + +
+ + + + +
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/app/views/mission-1/current-iteration/create-clinic-rev-1-publish-check.html b/app/views/mission-1/current-iteration/create-clinic-rev-1-publish-check.html new file mode 100644 index 00000000..f9662c54 --- /dev/null +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-publish-check.html @@ -0,0 +1,122 @@ +{% extends 'layout.html' %} + +{% set pageName = "Publish clinic" %} + +{% block content %} + +{% set tickSvg %} + +{% endset %} + +
+
+ +
+ +
+ +
+
+
+ +

Check and confirm

+ +
+
+
+ Clinic name +
+
+ {{ data.missionOne.clinicName }} +
+
+ Change clinic name +
+
+
+
+ Scheduled date +
+
+ {{ data.missionOne.clinicDate | formatDate }} +
+
+ Change scheduled date +
+
+
+
+ Session times +
+
+ {{ data.missionOne.startTime.hour | zeroPad }}:{{ data.newSession.startTime.minute | zeroPad }} to {{ data.newSession.endTime.hour | zeroPad }}:{{ data.newSession.endTime.minute | zeroPad }}
+ {{ data.missionOne.duration }} minute slot length +
+
+ Change session times +
+
+
+
+ Slot structure +
+
+ {{ data.missionOne.bookableSlotCount }} bookable slots
+ {{ data.missionOne.staffBreakSlotCount }} slots set as staff break +
+
+ Change slot structure +
+
+
+ +

+ Save clinic session +

+ +
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/views/mission-1/current-iteration/create-clinic-rev-1-schedule.html b/app/views/mission-1/current-iteration/create-clinic-rev-1-schedule.html new file mode 100644 index 00000000..7b0381a5 --- /dev/null +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-schedule.html @@ -0,0 +1,130 @@ +{% extends 'layout.html' %} + +{% set errorState = "true" if errors else "false" %} + +{% set pageName = "Create day clinic" %} + +{% block content %} + +{% set tickSvg %} + +{% endset %} + +
+
+ +
+ +
+ +
+
+
+ + {% if errorState === "true" %} + {% set errorList = [] %} + {% if errors.clinicDate %} + {% set errorList = errorList.concat([{ text: errors.clinicDate, href: "#clinic-date-day" }]) %} + {% endif %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errorList + }) }} + {% endif %} + +
+ +
+
+ +

+ Scheduled date +

+ +
+ For example, 18 6 2026 +
+ {% if errors and errors.clinicDate %} + + Error: {{ errors.clinicDate }} + + {% endif %} +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + + + +
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/app/views/september-iteration-2/create-clinic-rev-1-set-timings.html b/app/views/mission-1/current-iteration/create-clinic-rev-1-set-timings.html similarity index 50% rename from app/views/september-iteration-2/create-clinic-rev-1-set-timings.html rename to app/views/mission-1/current-iteration/create-clinic-rev-1-set-timings.html index 7949e0d4..7d6b6421 100644 --- a/app/views/september-iteration-2/create-clinic-rev-1-set-timings.html +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-set-timings.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set errorState = "false" %} +{% set errorState = "true" if errors else "false" %} {% set pageName = "Set date and time" %} @@ -21,27 +21,37 @@

Workflow steps - Create day clinic + Create clinic session

  1. - - - 1 - - Clinic details - + + 1 + Clinic name + +
    2. +
  2. + + 2 + Scheduled date +
  3. 2 - Set date and time + Session times
  4. 3 - Save clinic + Slot structure + +
    5. +
  5. + + 4 + Check and confirm
@@ -53,88 +63,27 @@

{% if errorState === "true" %} + {% set errorList = [] %} + {% if errors.startTime %} + {% set errorList = errorList.concat([{ text: errors.startTime, href: "#start-time-hour" }]) %} + {% endif %} + {% if errors.endTime %} + {% set errorList = errorList.concat([{ text: errors.endTime, href: "#end-time-hour" }]) %} + {% endif %} + {% if errors.duration %} + {% set errorList = errorList.concat([{ text: errors.duration, href: "#duration" }]) %} + {% endif %} {{ errorSummary({ titleText: "There is a problem", - errorList: [ - { - text: "Date of clinic must be given a day, month, and year", - href: "#" - }, - { - text: "Date of clinic must be in the future", - href: "#" - }, - { - text: "Start time must be entered, in 24 hour format", - href: "#" - }, - { - text: "End time must be entered, in 24 hour format", - href: "#" - }, - { - text: "End time must be later than start time", - href: "#" - }, - { - text: "Start time must be earlier than end time", - href: "#" - }, - { - text: "Slot length must be entered, in minutes", - href: "#" - } - ] + errorList: errorList }) }} {% endif %} -

Set date and time

+

Clinic session times

-
- -
-
- - Date of clinic - -
- For example, 18 6 2026 -
- {% if errorState === "true" %} - - Error: Date of clinic must be given a day, month, and year - - {% endif %} -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
+ -
+
Session start time @@ -142,9 +91,9 @@

Set date and time

Use 24 hour format, for example, 10:00
- {% if errorState === "true" %} + {% if errors and errors.startTime %} - Error: Start time must be entered, in 24 hour format + Error: {{ errors.startTime }} {% endif %} @@ -154,8 +103,8 @@

Set date and time

- +
@@ -164,15 +113,15 @@

Set date and time

- +

-
+
Session end time @@ -180,9 +129,9 @@

Set date and time

Use 24 hour format, for example, 17:00
- {% if errorState === "true" %} + {% if errors and errors.endTime %} - Error: End time must be entered, in 24 hour format + Error: {{ errors.endTime }} {% endif %} @@ -192,8 +141,8 @@

Set date and time

- +
@@ -201,26 +150,26 @@

Set date and time

- +
-
+
- {% if errorState === "true" %} + {% if errors and errors.duration %} - Error: Slot length must be entered, in minutes + Error: {{ errors.duration }} {% endif %}
- +
diff --git a/app/views/mission-1/current-iteration/create-clinic-rev-1-slot-structure.html b/app/views/mission-1/current-iteration/create-clinic-rev-1-slot-structure.html new file mode 100644 index 00000000..e8074322 --- /dev/null +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-slot-structure.html @@ -0,0 +1,128 @@ +{% extends 'layout.html' %} + +{% set errorState = "true" if errors else "false" %} + +{% set pageName = "Set date and time" %} + +{% block content %} + +{% set tickSvg %} + +{% endset %} + +
+
+ +
+ +
+ +
+ +
+ + +
+ {% if errorState === "true" %} + {% set errorList = [] %} + {% if errors.slots %} + {% set errorList = errorList.concat([{ text: errors.slots, href: "#computed-slot-0" }]) %} + {% endif %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errorList + }) }} + {% endif %} +

Slot structure

+

+ Session time + {{ sessionStartLabel }} to {{ sessionEndLabel }} +

+
+ +
+
+
+ + {% for slot in slots %} +
+
+ + +
+
+ {% endfor %} + +
+
+
+
+

Set selected slots as:

+ +
+ +
+
+

+ {{ bookableSlotCount }} bookable slots +

+

+ +

+
+
+ + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/views/september-iteration-2/create-clinic.html b/app/views/mission-1/current-iteration/create-clinic.html similarity index 59% rename from app/views/september-iteration-2/create-clinic.html rename to app/views/mission-1/current-iteration/create-clinic.html index b96f9c29..b4db5adb 100644 --- a/app/views/september-iteration-2/create-clinic.html +++ b/app/views/mission-1/current-iteration/create-clinic.html @@ -5,24 +5,36 @@ {% block content %} +{% if data.missionOne and data.missionOne.clinicName %} +
+
+ {% set html %} +

Clinic created

+ {% endset %} + {{ notificationBanner({ + html: html, + type: "success" + }) }} +
+
+{% endif %} +

Clinics

{{ button({ text: "Create a new clinic", - href: "create-clinic-rev-1", + href: "create-clinic-rev-1-name", classes: "nhsuk-button--secondary" }) }}
- -
-
@@ -49,7 +49,7 @@ {% if options.controls != false %} - + Select this clinic
+
- - - - - - - - - + {% if data.missionOne and data.missionOne.clinicName %} + + + + + + + + + {% endif %} @@ -124,7 +146,7 @@

Clinics

40 slots available of 100 diff --git a/app/views/september-iteration-2/includes/day-list-hard-coded.html b/app/views/mission-1/current-iteration/includes/day-list-hard-coded.html similarity index 100% rename from app/views/september-iteration-2/includes/day-list-hard-coded.html rename to app/views/mission-1/current-iteration/includes/day-list-hard-coded.html diff --git a/app/views/september-iteration-2/includes/participant-staging-control.html b/app/views/mission-1/current-iteration/includes/participant-staging-control.html similarity index 100% rename from app/views/september-iteration-2/includes/participant-staging-control.html rename to app/views/mission-1/current-iteration/includes/participant-staging-control.html diff --git a/app/views/september-iteration-2/macros/batch-detail.html b/app/views/mission-1/current-iteration/macros/batch-detail.html similarity index 100% rename from app/views/september-iteration-2/macros/batch-detail.html rename to app/views/mission-1/current-iteration/macros/batch-detail.html diff --git a/app/views/september-iteration-2/macros/batch-upload.html b/app/views/mission-1/current-iteration/macros/batch-upload.html similarity index 100% rename from app/views/september-iteration-2/macros/batch-upload.html rename to app/views/mission-1/current-iteration/macros/batch-upload.html diff --git a/app/views/september-iteration-2/macros/participant-listing.html b/app/views/mission-1/current-iteration/macros/participant-listing.html similarity index 96% rename from app/views/september-iteration-2/macros/participant-listing.html rename to app/views/mission-1/current-iteration/macros/participant-listing.html index 822265a6..36c8addd 100644 --- a/app/views/september-iteration-2/macros/participant-listing.html +++ b/app/views/mission-1/current-iteration/macros/participant-listing.html @@ -1,5 +1,5 @@ {% macro participant_listing(options) %} -
@@ -47,33 +59,43 @@

Clinics
- Rubie test clinic - - Hard coded
- as per live test #1 - 		- Alpha van
- HWO-mobile-1 - 		- 1 October 2026
- 1 day - 		-
- 48 slots available of 48 - 		- - Select this clinic - -
+ {{ data.missionOne.clinicName }} + New + + Hard coded
+ as per mission #1 + 		+ Hard coded
+ as per mission #1 + 		+ {% if data.missionOne.clinicDate %} + {{ data.missionOne.clinicDate | formatDate }}
+ 1 day + {% else %} + no data + {% endif %} + 		+ {% if data.missionOne.bookableSlotCount is not undefined %} +
+ {{ data.missionOne.bookableSlotCount }} slots available of {{ data.missionOne.bookableSlotCount }} + {% else %} + no data + {% endif %} + 		+ + Select this clinic + +
@@ -97,7 +119,7 @@

Clinics

48 slots available of 48 		- + Select this clinic - + Select this clinic
+
{% set totalCount = options.totalCount or options.participants.length %} {% if options.mode == "search" %} diff --git a/app/views/september-iteration-2/macros/search-component.html b/app/views/mission-1/current-iteration/macros/search-component.html similarity index 100% rename from app/views/september-iteration-2/macros/search-component.html rename to app/views/mission-1/current-iteration/macros/search-component.html diff --git a/app/views/z-september-transactional-journey/_includes/min-primary-navigation.html b/app/views/mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html similarity index 100% rename from app/views/z-september-transactional-journey/_includes/min-primary-navigation.html rename to app/views/mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html diff --git a/app/views/z-september-transactional-journey/_includes/participant-search.html b/app/views/mission-1/z-september-transactional-journey/_includes/participant-search.html similarity index 100% rename from app/views/z-september-transactional-journey/_includes/participant-search.html rename to app/views/mission-1/z-september-transactional-journey/_includes/participant-search.html diff --git a/app/views/z-september-transactional-journey/appointing-complete.html b/app/views/mission-1/z-september-transactional-journey/appointing-complete.html similarity index 99% rename from app/views/z-september-transactional-journey/appointing-complete.html rename to app/views/mission-1/z-september-transactional-journey/appointing-complete.html index 28e7ef37..84108aa8 100644 --- a/app/views/z-september-transactional-journey/appointing-complete.html +++ b/app/views/mission-1/z-september-transactional-journey/appointing-complete.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/z-september-transactional-journey/batch-detail-trimmed-csv.html b/app/views/mission-1/z-september-transactional-journey/batch-detail-trimmed-csv.html similarity index 99% rename from app/views/z-september-transactional-journey/batch-detail-trimmed-csv.html rename to app/views/mission-1/z-september-transactional-journey/batch-detail-trimmed-csv.html index 4274089e..0cb64702 100644 --- a/app/views/z-september-transactional-journey/batch-detail-trimmed-csv.html +++ b/app/views/mission-1/z-september-transactional-journey/batch-detail-trimmed-csv.html @@ -2,7 +2,7 @@ {% set pageName = "Batch detail" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/z-september-transactional-journey/batch-detail.html b/app/views/mission-1/z-september-transactional-journey/batch-detail.html similarity index 92% rename from app/views/z-september-transactional-journey/batch-detail.html rename to app/views/mission-1/z-september-transactional-journey/batch-detail.html index b0225296..9cd4869f 100644 --- a/app/views/z-september-transactional-journey/batch-detail.html +++ b/app/views/mission-1/z-september-transactional-journey/batch-detail.html @@ -2,7 +2,7 @@ {% set pageName = "Batch detail" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/z-september-transactional-journey/group.html b/app/views/mission-1/z-september-transactional-journey/group.html similarity index 98% rename from app/views/z-september-transactional-journey/group.html rename to app/views/mission-1/z-september-transactional-journey/group.html index fa248292..35fc7d63 100644 --- a/app/views/z-september-transactional-journey/group.html +++ b/app/views/mission-1/z-september-transactional-journey/group.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/z-september-transactional-journey/pre-appoint-confirm.html b/app/views/mission-1/z-september-transactional-journey/pre-appoint-confirm.html similarity index 94% rename from app/views/z-september-transactional-journey/pre-appoint-confirm.html rename to app/views/mission-1/z-september-transactional-journey/pre-appoint-confirm.html index 24d0513a..875f0faa 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/mission-1/z-september-transactional-journey/pre-appoint-confirm.html @@ -2,7 +2,7 @@ {% set pageName = "Assign slots to participants" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/z-september-transactional-journey/search-and-results.html b/app/views/mission-1/z-september-transactional-journey/search-and-results.html similarity index 95% rename from app/views/z-september-transactional-journey/search-and-results.html rename to app/views/mission-1/z-september-transactional-journey/search-and-results.html index 8b146730..5ddd1bb0 100644 --- a/app/views/z-september-transactional-journey/search-and-results.html +++ b/app/views/mission-1/z-september-transactional-journey/search-and-results.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -11,7 +11,7 @@ {% block content %} - {% include "z-september-transactional-journey/_includes/participant-search.html"%} + {% include "mission-1/z-september-transactional-journey/_includes/participant-search.html"%}
diff --git a/app/views/z-september-transactional-journey/search.html b/app/views/mission-1/z-september-transactional-journey/search.html similarity index 57% rename from app/views/z-september-transactional-journey/search.html rename to app/views/mission-1/z-september-transactional-journey/search.html index 4a502c9b..25847b9a 100644 --- a/app/views/z-september-transactional-journey/search.html +++ b/app/views/mission-1/z-september-transactional-journey/search.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} @@ -11,7 +11,7 @@ {% block content %}
- {% include "z-september-transactional-journey/_includes/participant-search.html"%} + {% include "mission-1/z-september-transactional-journey/_includes/participant-search.html"%}
{% endblock %} diff --git a/app/views/z-september-transactional-journey/spinner.html b/app/views/mission-1/z-september-transactional-journey/spinner.html similarity index 95% rename from app/views/z-september-transactional-journey/spinner.html rename to app/views/mission-1/z-september-transactional-journey/spinner.html index d2f42d86..41449338 100644 --- a/app/views/z-september-transactional-journey/spinner.html +++ b/app/views/mission-1/z-september-transactional-journey/spinner.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/z-september-transactional-journey/upload-a-batch.html b/app/views/mission-1/z-september-transactional-journey/upload-a-batch.html similarity index 87% rename from app/views/z-september-transactional-journey/upload-a-batch.html rename to app/views/mission-1/z-september-transactional-journey/upload-a-batch.html index a0f79b36..b2d0f028 100644 --- a/app/views/z-september-transactional-journey/upload-a-batch.html +++ b/app/views/mission-1/z-september-transactional-journey/upload-a-batch.html @@ -2,7 +2,7 @@ {% set pageName = "Upload a batch" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/search/batch-participant-search.html b/app/views/search/batch-participant-search.html index 2fccdf01..96e65fb4 100644 --- a/app/views/search/batch-participant-search.html +++ b/app/views/search/batch-participant-search.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/search/participant-search-prev.html b/app/views/search/participant-search-prev.html index e69194b1..ce7b45f3 100644 --- a/app/views/search/participant-search-prev.html +++ b/app/views/search/participant-search-prev.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %} diff --git a/app/views/september-iteration-2/create-clinic-rev-1-publish-check.html b/app/views/september-iteration-2/create-clinic-rev-1-publish-check.html deleted file mode 100644 index fb7bed5c..00000000 --- a/app/views/september-iteration-2/create-clinic-rev-1-publish-check.html +++ /dev/null @@ -1,98 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Publish clinic" %} - -{% block content %} - -{% set tickSvg %} - -{% endset %} - -
-
- -
- -
- -
-
-
- -

Save clinic

- -
-
-
- Clinic details -
-
- {{ data.clinicName }} -
-
- Change clinic details -
-
-
-
- Date and time -
-
- {{ data.clinicDate | formatDate }}
- {{ data.newSession.startTime.hour | zeroPad }}:{{ data.newSession.startTime.minute | zeroPad }} to {{ data.newSession.endTime.hour | zeroPad }}:{{ data.newSession.endTime.minute | zeroPad }}
- {{ data.newSession.duration }} minute slot length -
-
- Change date and time -
-
-
-
- Total capacity -
-
- {{ data.newSession.totalSlots }} slots -
-
-
- -

- Save clinic -

- -
-
-
- -{% endblock %} \ No newline at end of file diff --git a/app/views/september-iteration-2/create-clinic-rev-1.html b/app/views/september-iteration-2/create-clinic-rev-1.html deleted file mode 100644 index b246513c..00000000 --- a/app/views/september-iteration-2/create-clinic-rev-1.html +++ /dev/null @@ -1,91 +0,0 @@ -{% extends 'layout.html' %} - -{% set errorState = "false" %} - -{% set pageName = "Create day clinic" %} - -{% block content %} - -{% set tickSvg %} - -{% endset %} - -
-
- -
- -
- -
-
-
- - {% if errorState === "true" %} - {{ errorSummary({ - titleText: "There is a problem", - errorList: [ - { - text: "Clinic must be given a name", - href: "#" - } - ] - }) }} - {% endif %} - -

Clinic details

- -
- -
- - {% if errorState === "true" %} - - Error: Clinic must be given a name - - {% endif %} - -
- - - -
-
-
- - - -{% endblock %} \ No newline at end of file diff --git a/app/views/z-sketching/participant-search-alternatives.html b/app/views/z-sketching/participant-search-alternatives.html index 0b00d1f5..b8784e38 100644 --- a/app/views/z-sketching/participant-search-alternatives.html +++ b/app/views/z-sketching/participant-search-alternatives.html @@ -2,7 +2,7 @@ {% set pageName = "" %} -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% from "mission-1/z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} {{ primaryNavigation() }} {% endblock %}