diff --git a/app/routes/sessions.js b/app/routes/sessions.js index 5a30e30..7c2e5cf 100644 --- a/app/routes/sessions.js +++ b/app/routes/sessions.js @@ -26,9 +26,6 @@ function sessions (router, shared) { if (!avail) return res.status(404).send('Availability not found') const draft = ensureSessionEditDraft(req, avail, req.params.date) - if (draft.isRecurring) { - return res.redirect(getSessionEditInfoHref(req.site.id, avail.id, req.params.date)) - } if ((draft.affectedBookingIds || []).length > 0) { return res.redirect(`${getSessionEditInfoHref(req.site.id, avail.id, req.params.date)}/warning`) } @@ -130,15 +127,8 @@ function sessions (router, shared) { router.get('/sites/:siteId/session/:availId/:date/edit', (req, res) => { const avail = req.site.availability.find(a => a.id === req.params.availId) if (!avail) return res.status(404).send('Availability not found') - const draft = ensureSessionEditDraft(req, avail, req.params.date) - if (!draft.isRecurring) return res.redirect(getSessionEditSummaryHref(req.site.id, avail.id, req.params.date)) - - res.render('sites/session-edit-info', { - site: req.site, - sessionLabel: avail.label, - date: req.params.date, - backHref: getSessionEditSummaryHref(req.site.id, avail.id, req.params.date) - }) + ensureSessionEditDraft(req, avail, req.params.date) + res.redirect(getSessionEditSummaryHref(req.site.id, avail.id, req.params.date)) }) router.post('/sites/:siteId/session/:availId/:date/edit', (req, res) => { @@ -297,7 +287,7 @@ function sessions (router, shared) { affectedCount: affected.length, affectedBookingRows, formAction: `${base}/warning`, - backHref: draft.isRecurring ? base : getSessionEditSummaryHref(site.id, req.params.availId, date) + backHref: getSessionEditSummaryHref(site.id, req.params.availId, date) }) }) @@ -317,13 +307,11 @@ function sessions (router, shared) { res.render('sites/session-edit-success', { site: req.site, sessionLabel: sd.sessionLabel || 'Session', - parentLabel: sd.parentLabel || 'the recurring session', date: sd.date || req.params.date, bookingCount: sd.bookingCount || 0, bookingsChoice: sd.bookingsChoice || 'keep', contactableCount: sd.contactableCount || 0, uncontactableCount: sd.uncontactableCount || 0, - createdOneOff: !!sd.createdOneOff, notifyPageHref: `/sites/${req.site.id}/session/${req.params.availId}/${req.params.date}/edit/not-notified` }) }) diff --git a/app/routes/shared/session-edit.js b/app/routes/shared/session-edit.js index a1e8a23..4a6c9e6 100644 --- a/app/routes/shared/session-edit.js +++ b/app/routes/shared/session-edit.js @@ -220,7 +220,6 @@ function applySessionEditDraft (req, avail, draft) { let sessionLabel = avail.label const parentLabel = avail.label - let createdOneOff = false if (draft.isRecurring) { if (!avail.exceptions) avail.exceptions = [] @@ -239,7 +238,6 @@ function applySessionEditDraft (req, avail, draft) { } site.availability.push(newAvail) unaffected.forEach(b => { b.availabilityId = newAvail.id }) - createdOneOff = true } else { avail.services = draft.services avail.slotLength = parseInt(draft.slotLength) || 15 @@ -267,7 +265,6 @@ function applySessionEditDraft (req, avail, draft) { req.session.data.sessionEditSuccess = { sessionLabel, - parentLabel, date, bookingCount: affected.length, bookingsChoice, @@ -275,8 +272,7 @@ function applySessionEditDraft (req, avail, draft) { uncontactableCount: uncontactable.length, uncontactablePeople: uncontactable.map(b => ({ name: b.name, nhsNumber: b.nhsNumber, date: b.date, time: b.time, service: b.service - })), - createdOneOff + })) } delete req.session.data.sessionEditDraft diff --git a/app/views/sites/session-edit-info.html b/app/views/sites/session-edit-info.html deleted file mode 100644 index ff22ca8..0000000 --- a/app/views/sites/session-edit-info.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Edit session — " + site.name %} - -{% block beforeContent %} - {{ backLink({ href: backHref }) }} -{% endblock %} - -{% block content %} -
-
- -

Edit session for {{ date | formatDateLong }}

- - {% call insetText({}) %} -

This will create a separate one-off session called "{{ sessionLabel }} (one-off)" for {{ date | formatDateLong }}. The recurring session "{{ sessionLabel }}" will skip this date going forward.

-

You will see both sessions in your availability list.

- {% endcall %} - -
- {{ button({ text: "Continue" }) }} -
- -
-
-{% endblock %} diff --git a/app/views/sites/session-edit-success.html b/app/views/sites/session-edit-success.html index 7780a85..4ec43c5 100644 --- a/app/views/sites/session-edit-success.html +++ b/app/views/sites/session-edit-success.html @@ -11,11 +11,7 @@

"{{ sessionLabel }}" on {{ date | formatDateLong }}

{% endcall %} - {% if createdOneOff %} -

A new one-off session has been created for {{ date | formatDateLong }}. The recurring session "{{ parentLabel }}" will skip this date going forward.

- {% else %} -

The one-off session for {{ date | formatDateLong }} has been updated.

- {% endif %} +

The session for {{ date | formatDateLong }} has been updated.

{% if bookingCount > 0 %}