Image information will be sent automatically from the mammogram machine
` + }) + return res.redirect(returnUrl) + } + + // Failed attempt. + data.worklistRetryAttempts = attempts + data.settings.screening.worklistLastRetryAt = new Date().toISOString() + + res.redirect(`/clinics/${clinicId}/events/${eventId}/retry-worklist-connection`) + }) + + // Handle "Switch to manual image mode" button - enable manual mode, return + // the user to where they clicked Retry from, and flash a success banner + // explaining what they need to do on the mammogram machine. + router.post('/clinics/:clinicId/events/:eventId/switch-to-manual-image-mode', (req, res) => { + const { clinicId, eventId } = req.params + const data = req.session.data + + data.settings = data.settings || {} + data.settings.screening = data.settings.screening || {} + data.settings.screening.manualImageCollection = 'true' + data.settings.screening.manualImageModeEnabledByUser = 'true' + + const returnUrl = + safeReturnUrl(data.worklistRetryReturnUrl) || + `/clinics/${clinicId}/events/${eventId}/take-images` + + delete data.worklistRetryAttempts + delete data.worklistRetryReturnUrl + delete data.settings.screening.worklistLastRetryAt + + // Clear any failover flag from a prior automatic→manual switch so we + // don't incorrectly show the "Reason for switching" input here (the + // reason is implicit when arriving via the retry-connection flow). + if (data.event?.mammogramDataTemp) { + delete data.event.mammogramDataTemp.isManualFailover + } + + req.flash('success', { + title: 'Success', + html: '' + }) + + res.redirect(returnUrl) + }) + // Manual imaging routes - // Handle take-images route - redirect to appropriate page based on state - router.get('/clinics/:clinicId/events/:eventId/take-images', (req, res) => { + // Handle take-images route - redirect to appropriate page based on state. + // Use `all` so the gate applies to the POST from review-medical-information + // as well as direct GET navigation. + router.all('/clinics/:clinicId/events/:eventId/take-images', (req, res) => { const { clinicId, eventId } = req.params const data = req.session.data + const isAddedToWorklist = + data.settings?.screening?.addedToWorklist !== 'false' + + // When a participant is on the worklist, image transfer should use the + // automatic flow. Clear any stale manual-mode state from prior actions. + if (isAddedToWorklist) { + data.settings = data.settings || {} + data.settings.screening = data.settings.screening || {} + data.settings.screening.manualImageCollection = 'false' + delete data.settings.screening.manualImageModeEnabledByUser + } + const isManualImageCollection = data.settings?.screening?.manualImageCollection === 'true' const imagesStageCompleted = data.event?.workflowStatus?.['take-images'] === 'completed' + // Gate: if the appointment was not added to the worklist and the user + // hasn't yet switched to manual image mode, divert to the retry page + // before letting them into the image-taking step. + + if (!isAddedToWorklist && !isManualImageCollection) { + return res.redirect( + `/clinics/${clinicId}/events/${eventId}/retry-worklist-connection?returnUrl=` + + encodeURIComponent(`/clinics/${clinicId}/events/${eventId}/take-images`) + ) + } + // If manual flow and images already completed, redirect to details page for editing if ( isManualImageCollection && @@ -2270,6 +2393,12 @@ module.exports = (router) => { router.get('/clinics/:clinicId/events/:eventId/images-manual', (req, res) => { const { clinicId, eventId } = req.params const data = req.session.data + const validTroubleshootingIssues = [ + 'worklist-participant', + 'wrong-image-count', + 'incorrect-image-labels' + ] + const troubleshootingIssue = req.query.issue // If mammogramData exists and is manual entry, prepopulate temp for editing if (data.event?.mammogramData?.isManualEntry) { @@ -2298,6 +2427,17 @@ module.exports = (router) => { } } + // Persist troubleshooting issue context when navigating from troubleshooting links + if (validTroubleshootingIssues.includes(troubleshootingIssue)) { + if (!data.event.mammogramDataTemp) { + data.event.mammogramDataTemp = {} + } + data.event.mammogramDataTemp.troubleshootingIssue = troubleshootingIssue + } else if (data.event?.mammogramDataTemp?.troubleshootingIssue) { + // Clear stale issue context for non-troubleshooting entry points + delete data.event.mammogramDataTemp.troubleshootingIssue + } + // Let the dynamic routing handle the actual rendering res.render('events/images-manual') }) diff --git a/app/routes/settings.js b/app/routes/settings.js index 4ea599dd..e78fd8c2 100644 --- a/app/routes/settings.js +++ b/app/routes/settings.js @@ -64,6 +64,38 @@ const getCustomOverridesFromBody = (body = {}, fallbackProfile = {}) => { } module.exports = (router) => { + // Keep worklist simulation settings consistent with image collection mode: + // - "Not successful": clear any stale "manual mode enabled by user" marker + // so retry messaging is shown + // - "Successful": return to automatic image collection mode + router.get('/settings', (req, res, next) => { + const addedToWorklistFromQuery = + req.query?.settings?.screening?.addedToWorklist + + if (addedToWorklistFromQuery === 'false') { + if (!req.session.data.settings) { + req.session.data.settings = {} + } + if (!req.session.data.settings.screening) { + req.session.data.settings.screening = {} + } + + delete req.session.data.settings.screening.manualImageModeEnabledByUser + } else if (addedToWorklistFromQuery === 'true') { + if (!req.session.data.settings) { + req.session.data.settings = {} + } + if (!req.session.data.settings.screening) { + req.session.data.settings.screening = {} + } + + req.session.data.settings.screening.manualImageCollection = 'false' + delete req.session.data.settings.screening.manualImageModeEnabledByUser + } + + next() + }) + // Ensure any POST to settings resolves to a GET render router.post('/settings', (req, res) => { return res.redirect(303, '/settings') diff --git a/app/views/_components/status-bar/template.njk b/app/views/_components/status-bar/template.njk index b31f0a1a..b771bb61 100644 --- a/app/views/_components/status-bar/template.njk +++ b/app/views/_components/status-bar/template.njk @@ -6,7 +6,7 @@