diff --git a/README.md b/README.md index 5522bde..fe7284c 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,47 @@ -# Nuxt Template (Better Auth + Prisma + SQLite) +# HOPE COPE HEAL - Electronic Health Records System -A modern, production-ready Nuxt 4 template featuring a robust authentication system, ORM integration, and a clean UI foundation. +Hope.Cope.Heal is a non-profit organization dedicated to providing free essential mental health support to families navigating childhood cancer. They focus on trauma and long-term psychological recovery and therapy. Hope.Cope.Heal operates at the intersection of healthcare administration and non-profit social services, requiring strict HIPAA compliance. They use a unique charitable scholarship system to provide services, rather than traditional insurance-based billing. Currently Hope.Cope.Heal is struggling with "Simple Practice" software, which is too rigid for their specialized intake, document verification, and scholarship tracking needs. We aim to help them overcome this obstacle by developing a customized application that will suit their needs. + +## Conceptual Overview + +This application is intended to support a mental health clinic workflow from intake through ongoing care. The application helps clients submit onboarding and assessment forms, request care-related information, and track their next steps. It also gives clinic staff the tools to manage clients, review requests, coordinate scheduling, and oversee note approval and audit workflows. + +### User roles + +- **Client**: Signs in with email OTP, completes intake and clinical forms, requests access to records, and views appointment/task information. +- **Clinician**: Reviews client information, manages appointments, contributes clinical documentation, and participates in note workflows. +- **Admin**: Oversees client operations, reviews requests, monitors notifications, approves notes, and audits governed changes. + +## Third-Party Integrations + +- **Gmail OTP via Nodemailer**: Sends one-time passcodes and outbound app email. +- **Better Auth**: Provides authentication, sessions, and email OTP flows. +- **Prisma**: Handles database access, migrations, and generated client code. +- **Prisma Studio**: Supports local database inspection during development. ## Features - **Nuxt 4**: The latest and greatest from the Nuxt team. -- **Better Auth**: Comprehensive authentication with **Email OTP** support. +- **Better Auth**: Comprehensive authentication with Email OTP support. - **Prisma**: Type-safe ORM for interacting with the database. - **SQLite**: Lightweight, zero-configuration database, ideal for development and small-to-medium projects. - **Nuxt UI v3**: Beautiful, accessible, and customizable UI components built with Tailwind CSS. - **Nodemailer**: Pre-configured for sending verification emails via Gmail. +- **FullCalendar**: Powers the appointment calendar and scheduling views. +- **Tiptap**: Supports rich-text note editing workflows. ## Stack -- **Framework**: [Nuxt](https://nuxt.com/) -- **Auth**: [Better Auth](https://www.better-auth.com/) -- **ORM**: [Prisma](https://www.prisma.io/) -- **Database**: [SQLite](https://sqlite.org/) -- **UI Framework**: [Nuxt UI](https://ui3.nuxt.com/) -- **Email**: [Nodemailer](https://nodemailer.com/) +- **Framework**: Nuxt +- **Frontend**: Vue 3 +- **Backend**: Node.js runtime with Nitro server routes inside Nuxt +- **Auth**: Better Auth +- **ORM**: Prisma +- **Database**: SQLite +- **UI Framework**: Nuxt UI +- **Email**: Nodemailer +- **Other important packages**: FullCalendar, Tiptap, Zod, `@prisma/adapter-better-sqlite3` +- **Other tools used/needed**: Prisma Studio, Docker, pnpm, esbuild ## Getting Started @@ -26,18 +49,18 @@ A modern, production-ready Nuxt 4 template featuring a robust authentication sys ```bash git clone -cd nuxt-template +cd hch ``` ### 2. Install dependencies -This project uses `pnpm`, but you can use `npm` as well. +This project uses `pnpm`. ```bash pnpm install ``` -### 3. Setup Environment Variables +### 3. Setup environment variables Copy the example environment file and fill in your details. @@ -47,27 +70,34 @@ cp .env.example .env Open `.env` and configure the following: -- `DATABASE_URL`: The SQLite connection string (default: `file:./dev.db`). +- `DATABASE_URL`: The SQLite connection string (default: file:./dev.db). +- `INITIAL_ADMIN_EMAIL`: Comma-separated emails that should be treated as initial admins. - `BETTER_AUTH_SECRET`: A secure random string for encryption. You can generate one using `openssl rand -hex 32`. -- `BETTER_AUTH_URL`: The base URL of your application (default: `http://localhost:3000`). -- `EMAIL_USER`: Your Gmail address (for OTP delivery). -- `EMAIL_PASS`: Your Gmail App Password. [How to generate an App Password](https://support.google.com/accounts/answer/185833). +- `BETTER_AUTH_URL`: The base URL of your application, (default; `http://localhost:3000`). +- `EMAIL_USER`: Your Gmail address for OTP delivery. +- `EMAIL_PASS`: Your Gmail App Password. (How to generate an App Password: https://support.google.com/accounts/answer/185833) -### 4. Database Setup +### 4. Database setup -Initialize your SQLite database and run migrations. +Initialize the database and apply migrations: ```bash -pnpm dlx prisma migrate dev --name init +pnpm prisma migrate dev --name init ``` -Generate the Prisma client +Generate the Prisma client: ```bash -pnpm dlx prisma generate +pnpm prisma generate ``` -To reset the database and run the seed script: +Run the seed script: + +```bash +pnpm prisma db seed +``` + +If you need a clean reset with seed data: ```bash pnpm prisma:reset @@ -79,29 +109,134 @@ pnpm prisma:reset pnpm dev ``` -Your application will be available at `http://localhost:3000`. This command also starts **Prisma Studio** automatically. +The application will be available at `http://localhost:3000`. This command also starts Prisma Studio. -### 6. How to Login +### 6. How to log in Login requires an email address that already exists in the database. -- **Option A: Use the seeded user** - Go to `/auth` and log in with `alice@a.com`. +- **Option A: Use a seeded user** + Go to `/auth` and log in with an email created by `prisma/seed.ts`, such as `alice@a.com` or `carl@c.com`. - **Option B: Use your own email** - Update `prisma/seed.ts` with your email, then run `pnpm prisma:reset` to re-seed. + Add your email to the seed data and run `pnpm prisma:reset` again. -**To get your OTP:** +To get your OTP: - Check your configured email inbox. -- **Or**, check the **Prisma Studio** tab in your browser and look in the `Verification` table. +- Or check the Prisma Studio verification table to see the code. -## Project Structure +## Functional Requirements + +### `/auth` + +- Accept a user email address. +- Send a one-time passcode to a valid user email. +- Verify the passcode and sign the user in. + +### `/` + +- Show a dashboard tailored to the signed-in user role. +- Show client progress and appointments for client users. +- Show counts, requests, approvals, and shortcuts for staff users. + +### `/calendar` + +- Display appointments in calendar and list views. +- Filter appointments by clinician and client when applicable. +- Support appointment creation, editing, review, and deletion through the API. +- Show video-conference metadata when present. + +### `/clients` + +- List clinic clients. +- Open client detail views. +- Surface metrics and workflow-relevant profile information. + +### `/clients/appointment-schedule-requests` + +- Show pending client scheduling requests. +- Allow staff review and response actions. + +### `/clients/session-notes-requests` + +- Show client requests for note access or summaries. +- Allow staff approval or rejection. + +### `/clients/session-notes-approvals` -- `app/`: Frontend code (pages, components, assets, composables). -- `server/`: Backend code (API routes, authentication logic, database utilities). -- `prisma/`: Database schema, migrations, and seed scripts. -- `public/`: Static assets. +- Show clinician-authored notes awaiting approval. +- Support the administrative approval workflow. -## License +### `/audits` + +- List audit records. +- Show reasoning, signatures, and supporting document metadata. +- Open detailed audit views. + +### `/taskPage` + +- Show required client tasks based on workflow stage. +- Let clients complete intake and assessment forms. +- Let clients request session-note access. +- Show approved content when permissions allow. + +### `/forms/*` + +- Provide pages for application, ACE, GAD-7, PHQ-9, PCL, physician statement, and release-of-information workflows. +- Support form completion and result/score views where implemented. + +### Notes-related pages + +- Support note authoring, review, and approval states. +- Support client-facing note access controls. + +## User Workflows + +### Client workflow + +1. Sign into client profile. +2. Complete intake and required forms. +3. Wait for staff review and status progression. +4. View appointments and/or records when eligible. + +### Clinician workflow + +1. Sign in to the staff workspace. +2. Review assigned client submissions. +3. Manage appointments and documentation. +4. Submit notes into the review/approval flow. + +### Admin workflow + +1. Sign in to the operations dashboard. +2. Monitor notifications, requests, and client status. +3. Review appointment schedule requests. +4. Review session-note access requests. +5. Approve notes and inspect audit history. + +## Migration Scripts + +- Prisma migration files live in `prisma/migrations`. +- Use `pnpm dlx prisma migrate dev --name ` to create a development migration after schema changes. +- `prisma/seed.ts` seeds default users, roles, templates, and sample development data. +- `pnpm prisma:reset` resets the local development database and reruns the seed. + +### Imported data from project partner + +- There is currently **no automated import script** in this repository for data from our partner's system. + +## Deployment Notes + +- 2 Production enviorments are currently deployed (Main & Stage) +- Validate and push code and new functions/features into stage branch before merging into main. + +- Production Stage: https://hch-stage.npts.tech/ +- Production Main: https://hch.npts.tech/auth + +## Project Structure -MIT +- `app/`: Frontend pages, components, assets, layouts, composables, and stores. +- `server/`: API routes, authentication logic, middleware, uploads, and backend utilities. +- `prisma/`: Schema files, migrations, generated client code, and seed scripts. +- `public/`: Static public assets. +- `uploads/`: Uploaded supporting documents in local development. diff --git a/app/components/ChangeWithJustificationModal.vue b/app/components/ChangeWithJustificationModal.vue index 0b37877..7821b87 100644 --- a/app/components/ChangeWithJustificationModal.vue +++ b/app/components/ChangeWithJustificationModal.vue @@ -68,7 +68,6 @@ documentationError.value = '' signatureDataUrl.value = '' signatureError.value = '' - nextTick(() => initSignatureCanvas()) } } ) @@ -127,94 +126,57 @@ } function hasValidSignature(): boolean { - return !!signatureDataUrl.value + //return !!signatureDataUrl.value + return !!signatureDataUrl.value && sigName.value.trim().length > 0 } - // Signature pad (canvas-based) - const sigCanvasRef = ref(null) const docUploadRef = ref(null) - const isDrawing = ref(false) - const sigCtx = ref(null) - - watch(signaturePenColor, (color) => { - const ctx = sigCtx.value - if (ctx) ctx.strokeStyle = color + + // Font signature + const SIG_FONTS = [ + { label: 'Classic', value: 'Dancing Script' }, + { label: 'Elegant', value: 'Great Vibes' }, + { label: 'Bold', value: 'Pacifico' }, + { label: 'Refined', value: 'Pinyon Script' }, + { label: 'Modern', value: 'Sacramento' }, + ] + const sigName = ref('') + const sigCredentials = ref('') + const sigFont = ref('Dancing Script') + const justSavedSig = ref(false) + const savedSignature = ref<{ name: string; credentials: string; font: string } | null>(null) + + onMounted(() => { + const saved = localStorage.getItem('epics_signature') + if (saved) try { savedSignature.value = JSON.parse(saved) } catch {} }) - function initSignatureCanvas() { - const canvas = sigCanvasRef.value - if (!canvas) return - - const rect = canvas.getBoundingClientRect() - const dpr = window.devicePixelRatio || 1 - canvas.width = Math.max(1, Math.floor(rect.width * dpr)) - canvas.height = Math.max(1, Math.floor(rect.height * dpr)) - - const ctx = canvas.getContext('2d') - if (!ctx) return - - ctx.setTransform(1, 0, 0, 1, 0, 0) - ctx.scale(dpr, dpr) - ctx.clearRect(0, 0, rect.width, rect.height) - - sigCtx.value = ctx - ctx.strokeStyle = signaturePenColor.value - ctx.lineWidth = 2 - ctx.lineCap = 'round' - } - - function getCanvasCoords(e: MouseEvent | TouchEvent): { x: number; y: number } { - const canvas = sigCanvasRef.value - if (!canvas) return { x: 0, y: 0 } - const rect = canvas.getBoundingClientRect() - const scaleX = canvas.width / rect.width - const scaleY = canvas.height / rect.height - - if ('touches' in e) { - const touch = e.touches[0] - if (!touch) return { x: 0, y: 0 } - return { - x: ((touch.clientX - rect.left) * scaleX) / (window.devicePixelRatio || 1), - y: ((touch.clientY - rect.top) * scaleY) / (window.devicePixelRatio || 1), - } - } - return { - x: ((e.clientX - rect.left) * scaleX) / (window.devicePixelRatio || 1), - y: ((e.clientY - rect.top) * scaleY) / (window.devicePixelRatio || 1), - } - } - - function startDrawing(e: MouseEvent | TouchEvent) { - e.preventDefault() - const { x, y } = getCanvasCoords(e) - sigCtx.value?.beginPath() - sigCtx.value?.moveTo(x, y) - isDrawing.value = true - signatureError.value = '' + function updateSignatureData() { + if (!sigName.value.trim()) { signatureDataUrl.value = ''; return } + signatureDataUrl.value = JSON.stringify({ + type: 'font-signature', + name: sigName.value.trim(), + credentials: sigCredentials.value.trim(), + font: sigFont.value, + }) } - function draw(e: MouseEvent | TouchEvent) { - e.preventDefault() - if (!isDrawing.value) return - const { x, y } = getCanvasCoords(e) - sigCtx.value?.lineTo(x, y) - sigCtx.value?.stroke() - } + watch([sigName, sigCredentials, sigFont], updateSignatureData) - function stopDrawing() { - isDrawing.value = false - const canvas = sigCanvasRef.value - if (canvas) { - signatureDataUrl.value = canvas.toDataURL('image/png') - } + function applySignature() { + if (!savedSignature.value) return + sigName.value = savedSignature.value.name + sigCredentials.value = savedSignature.value.credentials + sigFont.value = savedSignature.value.font } - function clearSignature() { - const canvas = sigCanvasRef.value - const ctx = sigCtx.value - if (!canvas || !ctx) return - ctx.clearRect(0, 0, canvas.width, canvas.height) - signatureDataUrl.value = '' + function saveDefaultSignature() { + if (!sigName.value.trim()) return + const sig = { name: sigName.value.trim(), credentials: sigCredentials.value.trim(), font: sigFont.value } + savedSignature.value = sig + localStorage.setItem('epics_signature', JSON.stringify(sig)) + justSavedSig.value = true + setTimeout(() => { justSavedSig.value = false }, 2000) } async function fileToBase64(file: File): Promise { @@ -266,7 +228,7 @@ :title="title" :ui="{ overlay: 'z-[200]', - content: 'max-w-xl w-full z-[210]', + content: 'max-w-2xl w-full z-[210]', body: 'max-h-[85vh] overflow-y-auto p-6', }" @update:open="(v: boolean) => !v && emit('close')" @@ -279,7 +241,7 @@ v-if="!signatureOnly && requiresEditReason" class="mb-4 text-sm font-medium text-gray-700 dark:text-gray-300" > - Enter a reason for this edit and your digital signature below. + Enter a reason for this edit and your signature below.

- - + +

-

- Sign in the box below using your mouse or touchscreen. -

+ +
- -
- Draw your signature here +
+

Saved signature

+

+ {{ savedSignature.name }}, {{ savedSignature.credentials }} +

+
-
- Clear signature -

- {{ signatureError }} -

+ + +
+ + +
+ +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + + +
+ + +
+

Preview

+
+ + +
+ {{ sigName || 'Your Name' }} +
+ + +
+

+ Signed by {{ sigName || ' ' }} +

+

+ {{ sigCredentials || ' ' }} +

+

+ {{ new Date().toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: '2-digit' }) }} +

+
+
+
+
-
- -
- Cancel - - {{ submitLabel }} - +

+ {{ signatureError }} +

+ + +
+ Cancel + + {{ submitLabel }} + +
+ + diff --git a/app/components/Notes.vue b/app/components/Notes.vue index 0783552..6ca2972 100644 --- a/app/components/Notes.vue +++ b/app/components/Notes.vue @@ -17,7 +17,7 @@ createdAt: string sessionName: string sessionNumber: number - attendanceStatus?: string + attendanceStatus?: string appointmentId: string | null appointmentStartTime: string | null kind?: NoteKind @@ -213,13 +213,11 @@ /** Currently selected session note row (if any) – used for admin approval UI. */ const selectedSessionNoteRow = computed(() => selectedSessionNoteId.value - ? localSessionNotes.value.find((n) => n.id === selectedSessionNoteId.value) ?? null + ? (localSessionNotes.value.find((n) => n.id === selectedSessionNoteId.value) ?? null) : null ) const canAdminApproveSelected = computed( - () => - isAdminViewer.value && - selectedSessionNoteRow.value?.status === 'CLINICIAN_SIGNED' + () => isAdminViewer.value && selectedSessionNoteRow.value?.status === 'CLINICIAN_SIGNED' ) function closeSelectedNote() { @@ -309,7 +307,8 @@ const newFormModalSelection = ref('') function openNewFormVersion() { - newFormModalSelection.value = props.forms.filter(f => f.label !== 'Application')[0]?.label ?? '' + newFormModalSelection.value = + props.forms.filter((f) => f.label !== 'Application')[0]?.label ?? '' showNewFormModal.value = true } @@ -395,13 +394,14 @@ if (!sessionStartIso) return false return new Date() >= new Date(sessionStartIso) } - const selectedAppointment = computed(() => - props.appointments.find((a) => a.id === selectedAppointmentId.value) ?? null + const selectedAppointment = computed( + () => props.appointments.find((a) => a.id === selectedAppointmentId.value) ?? null ) /** Existing note row for the selected session (if one has already been created). */ - const existingSelectedSessionNote = computed(() => - localSessionNotes.value.find((n) => n.appointmentId === selectedAppointmentId.value) ?? null + const existingSelectedSessionNote = computed( + () => + localSessionNotes.value.find((n) => n.appointmentId === selectedAppointmentId.value) ?? null ) /** Reason is only required when re-signing a clinician-signed note. */ const requiresEditReasonForSignSubmit = computed( @@ -417,7 +417,8 @@ canMarkAttendanceOnOrAfterSessionStart(selectedAppointment.value?.startTime ?? null) ) const currentNoteLockMessage = computed(() => { - if (!selectedAppointment.value) return 'Select a note to edit or create an appointment to start a new note.' + if (!selectedAppointment.value) + return 'Select a note to edit or create an appointment to start a new note.' if (canEditCurrentNote.value) return '' const when = selectedAppointment.value?.startTime ? new Date(selectedAppointment.value.startTime).toLocaleDateString('en-US') @@ -435,7 +436,10 @@ watch( appointmentOptions, (opts) => { - if (!selectedAppointmentId.value || !opts.some((o) => o.value === selectedAppointmentId.value)) { + if ( + !selectedAppointmentId.value || + !opts.some((o) => o.value === selectedAppointmentId.value) + ) { selectedAppointmentId.value = opts[0]?.value ?? '' } }, @@ -494,7 +498,8 @@ const severity = formSeverities.value[label] if (!severity) return '' const s = severity.toLowerCase() - if (s.includes('minimal') || s.includes('no exposure')) return 'text-green-600 dark:text-green-400' + if (s.includes('minimal') || s.includes('no exposure')) + return 'text-green-600 dark:text-green-400' if (s.includes('mild') || s.includes('low')) return 'text-yellow-500 dark:text-yellow-400' if (s.includes('moderate')) return 'text-orange-500 dark:text-orange-400' if (s.includes('moderately severe')) return 'text-orange-600 dark:text-orange-500' @@ -541,7 +546,7 @@ watch(formPreviewData, (val) => { isEditingForm.value = false - editableAnswers.value = val?.questions.map(q => ({ ...q })) ?? [] + editableAnswers.value = val?.questions.map((q) => ({ ...q })) ?? [] if (val && selectedForm.value) { if (val.score != null) { formScores.value[selectedForm.value] = val.score @@ -558,16 +563,14 @@ method: 'PATCH', body: { answers }, }) - + // Re-fetch to get updated score/severity - const data = await $fetch( - `/api/clients/${props.client.id}/forms/${key}` - ) + const data = await $fetch(`/api/clients/${props.client.id}/forms/${key}`) formPreviewData.value = data editableAnswers.value = data.questions.map((q) => ({ ...q })) if (data.score != null) formScores.value[selectedForm.value!] = data.score if (data.severity != null) formSeverities.value[selectedForm.value!] = data.severity - + isEditingForm.value = false } const isEditingPreviousPanel = ref(false) @@ -621,6 +624,24 @@ isEditingPreviousPanel.value = false } + const renderer = new marked.Renderer() + marked.use({ + extensions: [{ + name: 'underline', + level: 'inline', + start(src: string) { return src.indexOf('++') }, + tokenizer(src: string) { + const match = src.match(/^\+\+([^+]+)\+\+/) + if (match) { + return { type: 'underline', raw: match[0], text: match[1]! } + } + }, + renderer(token: any) { + return `${token.text}` + } + }] + }) + const renderedNoteContent = computed(() => selectedNoteData.value ? DOMPurify.sanitize(marked.parse(selectedNoteData.value.content) as string) @@ -631,7 +652,7 @@ if (!noteContent.value.trim() || !selectedAppointmentId.value) return saveStatus.value = 'saving' try { - const response = await $fetch(`/api/clients/${props.client.id}/notes`, { + const response = (await $fetch(`/api/clients/${props.client.id}/notes`, { method: 'POST', body: { content: noteContent.value, @@ -639,7 +660,7 @@ kind: currentNoteKind.value, action: 'save-draft', }, - }) as SessionNoteRow + })) as SessionNoteRow // Update or insert the saved note in the local list const existingIdx = localSessionNotes.value.findIndex((n) => n.id === response.id) @@ -666,26 +687,26 @@ saveStatus.value = 'error' } } -// if (!noteContent.value.trim() || !selectedAppointmentId.value) return -// saveStatus.value = 'saving' -// try { -// await $fetch(`/api/clients/${props.client.id}/notes`, { -// method: 'POST', -// body: { -// content: noteContent.value, -// appointmentId: selectedAppointmentId.value, -// kind: currentNoteKind.value, -// action: 'save-draft', -// }, -// }) -// localStorage.setItem(`note_draft_${props.client.id}`, noteContent.value) -// lastSaved.value = new Date() -// saveStatus.value = 'saved' -// } catch (err) { -// console.error('Draft save failed:', err) -// saveStatus.value = 'error' -// } -// } + // if (!noteContent.value.trim() || !selectedAppointmentId.value) return + // saveStatus.value = 'saving' + // try { + // await $fetch(`/api/clients/${props.client.id}/notes`, { + // method: 'POST', + // body: { + // content: noteContent.value, + // appointmentId: selectedAppointmentId.value, + // kind: currentNoteKind.value, + // action: 'save-draft', + // }, + // }) + // localStorage.setItem(`note_draft_${props.client.id}`, noteContent.value) + // lastSaved.value = new Date() + // saveStatus.value = 'saved' + // } catch (err) { + // console.error('Draft save failed:', err) + // saveStatus.value = 'error' + // } + // } function startEditPrevious() { const sd = selectedNoteData.value @@ -698,7 +719,9 @@ const canEdit = canEditOnOrAfterSessionDay(sessionRow?.appointmentStartTime) || canEditOnOrAfterSessionDay( - sessionRow?.appointmentId ? appointmentsById.value.get(sessionRow.appointmentId)?.startTime : null + sessionRow?.appointmentId + ? appointmentsById.value.get(sessionRow.appointmentId)?.startTime + : null ) if (!canEdit) { alert('This note is locked until the session day. You can edit on or after that date.') @@ -706,7 +729,7 @@ } editingSessionNoteId.value = sd.id editingNoteId.value = null - const sn = localSessionNotes.value.find(n => n.id === sd.id) + const sn = localSessionNotes.value.find((n) => n.id === sd.id) editingAttendanceStatus.value = sn?.attendanceStatus ?? 'show' } editingDate.value = sd.date @@ -730,7 +753,7 @@ editingNoteId.value = null // Load current attendance status into the edit form - const sn = localSessionNotes.value.find(n => n.id === sd.id) + const sn = localSessionNotes.value.find((n) => n.id === sd.id) editingAttendanceStatus.value = sn?.attendanceStatus ?? '' } else { pendingMeta.value.set(sd.id, { @@ -806,10 +829,9 @@ } const sig = meta.signature - const patchBody = - sig.startsWith('data:image/png;base64,') - ? { content: draft, reason: meta.reason, signatureData: sig } - : { content: draft, reason: meta.reason, signature: sig } + const patchBody = sig.startsWith('data:image/png;base64,') + ? { content: draft, reason: meta.reason, signatureData: sig } + : { content: draft, reason: meta.reason, signature: sig } isSavingPrevious.value = true try { @@ -818,7 +840,7 @@ body: { content: draft, reason: meta.reason, - signature: meta.signature, + signatureData: meta.signature, attendanceStatus: editingAttendanceStatus.value, }, }) @@ -868,10 +890,9 @@ } const sig = meta.signature - const patchBody = - sig.startsWith('data:image/png;base64,') - ? { content: draft, reason: meta.reason, signatureData: sig } - : { content: draft, reason: meta.reason, signature: sig } + const patchBody = sig.startsWith('data:image/png;base64,') + ? { content: draft, reason: meta.reason, signatureData: sig } + : { content: draft, reason: meta.reason, signature: sig } isSavingPrevious.value = true try { @@ -910,8 +931,8 @@ async function saveNote() { if (!noteContent.value.trim()) return if (!attendanceStatus.value) { - showAttendanceWarningModal.value = true - return + showAttendanceWarningModal.value = true + return } showSaveModal.value = true @@ -920,9 +941,12 @@ const attendanceStatus = ref('') const selectedNoteAttendance = computed(() => { - if (!selectedNoteData.value || selectedNoteData.value.source !== 'session') return null - const sn = localSessionNotes.value.find(n => n.id === selectedNoteData.value?.id) - return sn?.attendanceStatus ?? null + if (!selectedNoteData.value || selectedNoteData.value.source !== 'session') return null + if (isEditingPreviousPanel.value && editingSessionNoteId.value === selectedNoteData.value.id) { + return editingAttendanceStatus.value || null + } + const sn = localSessionNotes.value.find((n) => n.id === selectedNoteData.value?.id) + return sn?.attendanceStatus ?? null }) const editingAttendanceStatus = ref('show') @@ -1034,6 +1058,7 @@ id: string status: NoteStatus adminSignedAt: string | null + attendanceStatus: string } const idx = localSessionNotes.value.findIndex((n) => n.id === approvingNoteId.value) if (idx !== -1) { @@ -1042,6 +1067,7 @@ ...row, status: res.status, adminSignedAt: res.adminSignedAt ?? null, + attendanceStatus: res.attendanceStatus ?? row.attendanceStatus, } } showApproveModal.value = false @@ -1104,12 +1130,11 @@ } if (data.severity != null) { formSeverities.value[form.label] = data.severity - } + } } catch { // silently skip } } - }) function formatTime(date: Date) { @@ -1126,11 +1151,11 @@ try { const parsed = JSON.parse(val) if (Array.isArray(parsed)) { - return parsed.map((item: any) => - typeof item === 'object' - ? Object.values(item).filter(Boolean).join(' ') - : String(item) - ).join(', ') + return parsed + .map((item: any) => + typeof item === 'object' ? Object.values(item).filter(Boolean).join(' ') : String(item) + ) + .join(', ') } if (parsed && typeof parsed === 'object') { if (Array.isArray(parsed.values)) { @@ -1138,7 +1163,15 @@ } if (typeof parsed.value === 'string') return parsed.value if (typeof parsed.firstName === 'string') { - return [parsed.firstName, parsed.middleInitial, parsed.lastName, parsed.age ? `(age ${parsed.age})` : '', parsed.relationship].filter(Boolean).join(' ') + return [ + parsed.firstName, + parsed.middleInitial, + parsed.lastName, + parsed.age ? `(age ${parsed.age})` : '', + parsed.relationship, + ] + .filter(Boolean) + .join(' ') } } } catch { @@ -1156,7 +1189,7 @@
@@ -1213,7 +1246,7 @@
- {{ - sn.status === 'DRAFT' && !sn.content && sn.appointmentStartTime && new Date(sn.appointmentStartTime) > new Date() + {{ + sn.status === 'DRAFT' && + !sn.content && + sn.appointmentStartTime && + new Date(sn.appointmentStartTime) > new Date() ? 'Upcoming' : STATUS_LABELS[sn.status ?? 'DRAFT'] }} @@ -1469,28 +1508,33 @@
-
+
-

{{ selectedSessionNoteRow.sessionName }}

+

+ {{ selectedSessionNoteRow.sessionName }} +

{{ selectedNoteData.date }}

{{ selectedNoteAttendance.replace(/-/g, ' ') }} @@ -1520,7 +1566,9 @@ {{ STATUS_LABELS[selectedSessionNoteRow.status ?? 'DRAFT'] }} @@ -1530,13 +1578,17 @@ v-if="selectedSessionNoteRow.clinicianSignedAt" class="text-[10px] text-gray-500 dark:text-gray-400" > - Clinician signed {{ new Date(selectedSessionNoteRow.clinicianSignedAt).toLocaleString('en-US') }} + Clinician signed + {{ + new Date(selectedSessionNoteRow.clinicianSignedAt).toLocaleString('en-US') + }} - · Admin approved {{ new Date(selectedSessionNoteRow.adminSignedAt).toLocaleString('en-US') }} + · Admin approved + {{ new Date(selectedSessionNoteRow.adminSignedAt).toLocaleString('en-US') }}

-
+
-
- Attendance: - -
+
+ Attendance: + +
- +
-
+
-
+