diff --git a/app/assets/sass/components/_participant-table.scss b/app/assets/sass/components/_participant-table.scss index 4c800a38..81cca61a 100644 --- a/app/assets/sass/components/_participant-table.scss +++ b/app/assets/sass/components/_participant-table.scss @@ -49,3 +49,12 @@ } +.app-table-column-status { + width: 15%; +} +.app-table-column-actions { + width: 7%; +} +.app-table-cell-actions > .nhsuk-button { + margin: -4px 0; +} \ No newline at end of file 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..5b6e65b4 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,38 +92,18 @@ @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"; //{% set containerClasses = "nhsuk-width-container-fluid" %} // Add your custom CSS/Sass styles below. -.app-width-extended { - width: 1280px; -} a { @extend .nhsuk-link--no-visited-state; } -// Makes a + + + + + + + +{% 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..1940b5f8 --- /dev/null +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-publish-check.html @@ -0,0 +1,125 @@ +{% extends 'layout.html' %} + +{% from "mission-1/current-iteration/includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Manage clinics" if data.missionOne and data.missionOne.returnTo == "clinics" else "Batches", serviceName, bsoName) }} +{% endblock %} + +{% 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.missionOne.startTime.minute | zeroPad }} to {{ data.missionOne.endTime.hour | zeroPad }}:{{ data.missionOne.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 +
+
+
+ +
+ +
+ +
+
+
+ +{% 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..b70fefe7 --- /dev/null +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-schedule.html @@ -0,0 +1,133 @@ +{% extends 'layout.html' %} + +{% set errorState = "true" if errors else "false" %} + +{% from "mission-1/current-iteration/includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Manage clinics" if data.missionOne and data.missionOne.returnTo == "clinics" else "Batches", serviceName, bsoName) }} +{% endblock %} + +{% 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..afd678fc 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,8 +1,11 @@ {% extends 'layout.html' %} -{% set errorState = "false" %} +{% set errorState = "true" if errors else "false" %} -{% set pageName = "Set date and time" %} +{% from "mission-1/current-iteration/includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Manage clinics" if data.missionOne and data.missionOne.returnTo == "clinics" else "Batches", serviceName, bsoName) }} +{% endblock %} {% block content %} @@ -21,27 +24,37 @@

Workflow steps - Create day clinic + Create clinic session

  1. - - - 1 - - Clinic details - + + 1 + Clinic name + +
  2. +
  3. + + 2 + Scheduled date +
  4. - 2 - Set date and time + 3 + Session times
  5. - 3 - Save clinic + 4 + Slot structure + +
  6. +
  7. + + 5 + Check and confirm
@@ -53,88 +66,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 +94,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 +106,8 @@

Set date and time

- +
@@ -164,15 +116,15 @@

Set date and time

- +

-
+
Session end time @@ -180,9 +132,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 +144,8 @@

Set date and time

- +
@@ -201,26 +153,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..e0914e0f --- /dev/null +++ b/app/views/mission-1/current-iteration/create-clinic-rev-1-slot-structure.html @@ -0,0 +1,131 @@ +{% extends 'layout.html' %} + +{% set errorState = "true" if errors else "false" %} + +{% from "mission-1/current-iteration/includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Manage clinics" if data.missionOne and data.missionOne.returnTo == "clinics" else "Batches", serviceName, bsoName) }} +{% endblock %} + +{% 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/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/mission-1/current-iteration/includes/primary-navigation.html b/app/views/mission-1/current-iteration/includes/primary-navigation.html new file mode 100644 index 00000000..09a54f5a --- /dev/null +++ b/app/views/mission-1/current-iteration/includes/primary-navigation.html @@ -0,0 +1,55 @@ +{% from 'header/macro.njk' import header %} + +{% macro primaryNavigation(activeItem, serviceName, bsoName) %} + {{ header({ + account: { + items: [ + { + text: bsoName + }, + { + href: "#", + text: "Thomas Pynchon", + icon: true + }, + { + href: "/", + text: "Log out" + } + ] + }, + service: { + text: serviceName, + href: "/" + }, + navigation: { + items: [ + { + href: "#", + text: "Home", + active: activeItem === "Home" + }, + { + href: "#", + text: "Screening", + active: activeItem === "Screening" + }, + { + href: "#", + text: "Reading", + active: activeItem === "Reading" + }, + { + href: "00-batches", + text: "Batches", + active: activeItem === "Batches" + }, + { + href: "00-clinics", + text: "Manage clinics", + active: activeItem === "Manage clinics" + } + ] + } + }) }} +{% endmacro %} 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 88% 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..4ef98b90 100644 --- a/app/views/september-iteration-2/macros/participant-listing.html +++ b/app/views/mission-1/current-iteration/macros/participant-listing.html @@ -20,10 +20,10 @@ Date of birth - + Status - + Actions @@ -46,10 +46,10 @@ --> {% endif %} - + {% set participantId = participant.participantId or loop.index0 %} {% if participant.status == "unstaged" %} - Add + Add {% else %} Remove {% endif %} 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/clickthru/03-select-clinic.html b/app/views/september-iteration-2/clickthru/03-select-clinic.html deleted file mode 100644 index 257a5821..00000000 --- a/app/views/september-iteration-2/clickthru/03-select-clinic.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "" %} - -{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} -{% block header %} - {{ primaryNavigation() }} -{% endblock %} - -{% block beforeContent %}{% endblock %} - -{% block content %} - -
-

- Select clinic -

-
-
-
- - {% from "_macros/clinic-listing.html" import clinic_listing %} - {{ clinic_listing({ - controls: true, - clinics: [ - { - clinic_name: data.clinicName, - clinic_id: data.clinicId, - clinic_location_name: data.locationName, - clinic_location_address_line_1: data.locationAddressLine1, - clinic_unit_name: data.unitName, - clinic_unit_id: data.unitId, - clinic_timespan: data.clinicTimespan, - clinic_length: data.clinicLength, - clinic_capacity_percent_booked: data.clinicCapacityPercentBooked, - clinic_capacity_available: data.clinicCapacityAvailable, - clinic_capacity_total: data.clinicCapacityTotal, - button_url: "04-choose-participants" - } - ] - }) }} - -
-
- -{% endblock %} - -{% block footer %} - {{ footer() }} -{% endblock %} \ No newline at end of file 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 %}