Add post-event feedback forms
A Feedback step in the event wizard builds a survey that is sent at a chosen time to everyone who checked in (or everyone registered), with personal links and one reminder after 3 days. Answers can be anonymous. Adds rating (1-5 stars) and multiple-choice field types, also usable on attendee forms, and a Feedback summary report with response rate, average ratings, choice breakdowns, comments and event comparison. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -16,6 +16,7 @@ import {
|
||||
TicketPercent,
|
||||
ShieldCheck,
|
||||
HeartPulse,
|
||||
MessageSquareHeart,
|
||||
} from "lucide-react";
|
||||
|
||||
export type ReportCategory = "Financial" | "Registration" | "Ticketing" | "Donations" | "Cashup" | "Other";
|
||||
@@ -37,6 +38,7 @@ export const REPORTS = [
|
||||
{ key: "profitReport", label: "Profit report", description: "View profit report", category: "Financial", icon: BarChart3, fields: 5 },
|
||||
{ key: "cashupAudit", label: "Cashup audit trail", description: "Audit trail of cashup actions", category: "Cashup", icon: ClipboardList, fields: 6 },
|
||||
{ key: "consentStatus", label: "Parental consent status", description: "Youth events: consent per attendee", category: "Registration", icon: ShieldCheck, fields: 5 },
|
||||
{ key: "feedbackSummary", label: "Feedback summary", description: "Post-event feedback: ratings, choices and comments; compare events", category: "Registration", icon: MessageSquareHeart, fields: 4 },
|
||||
{ key: "medicalList", label: "Medical & emergency list", description: "Youth events: confidential list for leaders (audited)", category: "Registration", icon: HeartPulse, fields: 5 },
|
||||
{ key: "discounts", label: "Discounts (coupon codes)", description: "Uses and value given away per code and event", category: "Financial", icon: TicketPercent, fields: 4 },
|
||||
] as const satisfies ReadonlyArray<{
|
||||
|
||||
@@ -5,7 +5,7 @@ import { useSearchParams } from "next/navigation";
|
||||
import { useAuth } from "@/hooks/useAuth";
|
||||
import { apiFetch, API_BASE } from "@/lib/api";
|
||||
import { downloadReportExcel, emailReportPdf, whatsappReportPdf, viewReportPdf, type ReportPdfPayload } from "@/lib/export";
|
||||
import { Printer, Mail, FileSpreadsheet, MessageCircle, ShoppingCart, CreditCard, Gift, Clock, HandHeart, Search, TrendingUp, TicketPercent, ShieldCheck } from "lucide-react";
|
||||
import { Printer, Mail, FileSpreadsheet, MessageCircle, ShoppingCart, CreditCard, Gift, Clock, HandHeart, Search, TrendingUp, TicketPercent, ShieldCheck, Star, MessageSquareHeart, Send } from "lucide-react";
|
||||
import { REPORTS, type ReportKey } from "./ReportCatalog";
|
||||
import ReportsShell from "./ReportsShell";
|
||||
import ReportViewerModal, { ReportActionButton } from "./ReportViewerModal";
|
||||
@@ -177,6 +177,8 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
||||
// Youth events (one row per attendee), each tagged with its event title.
|
||||
const [consentRows, setConsentRows] = useState<any[]>([]);
|
||||
const [medicalRows, setMedicalRows] = useState<any[]>([]);
|
||||
// Post-event feedback, one entry per event that had a feedback form.
|
||||
const [feedbackRows, setFeedbackRows] = useState<any[]>([]);
|
||||
|
||||
// Deep-linking: dashboards link here with ?report=<key>&range=trailing_month to jump
|
||||
// straight into a specific report, pre-filtered to every currently-visible event and the
|
||||
@@ -286,6 +288,15 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
||||
return byEv;
|
||||
};
|
||||
|
||||
const loadFeedback = async (eventIds: string[]) => {
|
||||
if (!token || !eventIds.length) return [] as any[];
|
||||
try {
|
||||
return await apiFetch<any[]>(`/api/feedback/summary?eventIds=${encodeURIComponent(eventIds.join(","))}`, { authToken: token });
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
};
|
||||
|
||||
// Coupon uses (active redemptions on non-cancelled registrations) for the Discounts report.
|
||||
const loadDiscounts = async (eventIds: string[]) => {
|
||||
if (!token || !eventIds.length) return [] as any[];
|
||||
@@ -352,6 +363,29 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
||||
};
|
||||
}, [discountRows]);
|
||||
|
||||
// Feedback summary: overall numbers, and the average star rating per event (for comparing events).
|
||||
const feedbackSummary = useMemo(() => {
|
||||
const invited = feedbackRows.reduce((s, f) => s + (f.invited || 0), 0);
|
||||
const responses = feedbackRows.reduce((s, f) => s + (f.responses || 0), 0);
|
||||
const ratingOf = (f: any) => {
|
||||
const avgs = (f.questions || []).filter((q: any) => q.type === "rating" && q.average != null).map((q: any) => q.average);
|
||||
return avgs.length ? Math.round((avgs.reduce((s: number, n: number) => s + n, 0) / avgs.length) * 10) / 10 : null;
|
||||
};
|
||||
const perEvent = feedbackRows.map(f => ({ ...f, rating: ratingOf(f) }));
|
||||
const rated = perEvent.filter(f => f.rating != null);
|
||||
return {
|
||||
perEvent, invited, responses,
|
||||
rate: invited ? Math.round((responses / invited) * 100) : null,
|
||||
rating: rated.length ? Math.round((rated.reduce((s, f) => s + f.rating, 0) / rated.length) * 10) / 10 : null,
|
||||
chart: rated.map(f => ({ label: f.title, value: f.rating })),
|
||||
};
|
||||
}, [feedbackRows]);
|
||||
const feedbackResult = (q: any) =>
|
||||
q.type === "rating" ? (q.average != null ? `${q.average} / 5` : "—")
|
||||
: q.type === "numeric" ? (q.average != null ? `average ${q.average}` : "—")
|
||||
: q.counts ? q.counts.map((c: any) => `${c.label}: ${c.value}`).join(" · ")
|
||||
: `${(q.texts || []).length} answer(s)`;
|
||||
|
||||
// View handler according to selected report
|
||||
const onView = async () => {
|
||||
setBusy(true);
|
||||
@@ -409,6 +443,8 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
||||
setDiscountRows(await loadDiscounts(selectedEventIds));
|
||||
} else if (report === "consentStatus") {
|
||||
setConsentRows(await loadConsent(selectedEventIds, "status"));
|
||||
} else if (report === "feedbackSummary") {
|
||||
setFeedbackRows(await loadFeedback(selectedEventIds));
|
||||
} else if (report === "medicalList") {
|
||||
setMedicalRows(await loadConsent(selectedEventIds, "medical"));
|
||||
}
|
||||
@@ -1004,6 +1040,25 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
||||
},
|
||||
};
|
||||
}
|
||||
if (report === "feedbackSummary") {
|
||||
const rows: (string | number)[][] = [];
|
||||
for (const f of feedbackSummary.perEvent) {
|
||||
for (const q of f.questions || []) {
|
||||
rows.push([f.title, q.label, q.answered, feedbackResult(q)]);
|
||||
for (const t of q.texts || []) rows.push(["", ` “${t.value}”`, "", t.name || ""]);
|
||||
}
|
||||
}
|
||||
return {
|
||||
title: 'Feedback summary', subtitle, kind: 'table', orientation: 'landscape',
|
||||
stats: [
|
||||
{ label: 'Responses', value: String(feedbackSummary.responses), tone: 'violet' },
|
||||
{ label: 'Response rate', value: feedbackSummary.rate != null ? `${feedbackSummary.rate}%` : '—', tone: 'blue' },
|
||||
{ label: 'Average rating', value: feedbackSummary.rating != null ? `${feedbackSummary.rating} / 5` : '—', tone: 'amber' },
|
||||
],
|
||||
...(feedbackSummary.chart.length > 1 ? { chart: { title: 'Average rating, by event', data: feedbackSummary.chart.map(c => ({ ...c, displayValue: `${c.value} / 5` })) } } : {}),
|
||||
table: { columns: ["Event", "Question", "Answered", "Result"], rows },
|
||||
};
|
||||
}
|
||||
if (report === "medicalList") {
|
||||
const fmt = (m: any) => m ? [m.allergies && `Allergies: ${m.allergies}`, m.medication && `Medication: ${m.medication}`, m.conditions && `Conditions: ${m.conditions}`, m.medicalAid && `Medical aid: ${m.medicalAid}`].filter(Boolean).join('; ') : '';
|
||||
return {
|
||||
@@ -1672,6 +1727,61 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{report === "feedbackSummary" && (
|
||||
<div>
|
||||
{feedbackSummary.perEvent.length === 0 ? (
|
||||
<div className="text-sm text-gray-500">None of the selected events has a feedback form. Add one in the event wizard's Feedback step.</div>
|
||||
) : (
|
||||
<>
|
||||
<StatTileRow>
|
||||
<StatTile icon={MessageSquareHeart} label="Responses" value={String(feedbackSummary.responses)} tone="violet" />
|
||||
<StatTile icon={Send} label="Response rate" value={feedbackSummary.rate != null ? `${feedbackSummary.rate}%` : "—"} tone="blue" />
|
||||
<StatTile icon={Star} label="Average rating" value={feedbackSummary.rating != null ? `${feedbackSummary.rating} / 5` : "—"} tone="amber" />
|
||||
</StatTileRow>
|
||||
{feedbackSummary.chart.length > 1 && (
|
||||
<div className="mt-4 border border-gray-100 rounded-xl p-4">
|
||||
<div className="text-xs text-gray-500 mb-3">Average rating, by event</div>
|
||||
<HorizontalBarChart data={feedbackSummary.chart} valueFormatter={v => `${v} / 5`} />
|
||||
</div>
|
||||
)}
|
||||
{feedbackSummary.perEvent.map((f: any) => (
|
||||
<div key={f.eventId} className="mt-4 border border-gray-100 rounded-xl p-4">
|
||||
<div className="flex flex-wrap items-baseline justify-between gap-2 mb-3">
|
||||
<div className="font-semibold">{f.title}</div>
|
||||
<div className="text-xs text-gray-500">
|
||||
{f.sentAt ? `${f.responses} of ${f.invited} responded${f.responseRate != null ? ` (${f.responseRate}%)` : ""}` : "Not sent yet"}{f.anonymous ? " · anonymous" : ""}
|
||||
</div>
|
||||
</div>
|
||||
<div className="space-y-4">
|
||||
{(f.questions || []).map((q: any) => (
|
||||
<div key={q.fieldId}>
|
||||
<div className="text-sm font-medium text-gray-800">{q.label} <span className="text-xs font-normal text-gray-500">· {q.answered} answer(s)</span></div>
|
||||
{q.type === "rating" && (
|
||||
<div className="mt-1">
|
||||
<div className="text-sm"><span className="text-lg font-semibold">{q.average ?? "—"}</span> / 5</div>
|
||||
<HorizontalBarChart data={q.distribution} valueFormatter={v => String(v)} />
|
||||
</div>
|
||||
)}
|
||||
{q.counts && <div className="mt-1"><HorizontalBarChart data={q.counts} valueFormatter={v => String(v)} /></div>}
|
||||
{q.type === "numeric" && <div className="text-sm mt-1">Average: {q.average ?? "—"}</div>}
|
||||
{q.texts && (
|
||||
q.texts.length === 0 ? <div className="text-xs text-gray-500 mt-1">No answers.</div> : (
|
||||
<ul className="mt-1 space-y-1 max-h-64 overflow-auto">
|
||||
{q.texts.map((t: any, i: number) => (
|
||||
<li key={i} className="text-sm text-gray-700 border-l-2 border-gray-200 pl-2">{t.value}{t.name && <span className="text-xs text-gray-500"> — {t.name}</span>}</li>
|
||||
))}
|
||||
</ul>
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{(report === "consentStatus" || report === "medicalList") && (() => {
|
||||
const payload: any = buildReportPayload();
|
||||
const rows: any[] = payload?.table?.rows || [];
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
"use client";
|
||||
|
||||
import React from "react";
|
||||
import { Star } from "lucide-react";
|
||||
|
||||
/** Field types added for feedback (also usable on attendee forms). */
|
||||
export const EXTRA_FIELD_TYPES = ["rating", "multiple_choice"] as const;
|
||||
export const isExtraFieldType = (t: string) => (EXTRA_FIELD_TYPES as readonly string[]).includes(t);
|
||||
|
||||
/** The choices of a multiple-choice field (stored as a JSON array of strings). */
|
||||
export const fieldChoices = (field: { options?: unknown }): string[] =>
|
||||
Array.isArray(field.options) ? field.options.map(String).filter(Boolean) : [];
|
||||
|
||||
/**
|
||||
* Input for a rating (1–5 stars) or multiple-choice field. Values are strings, like every
|
||||
* other form answer: "1".."5" for a rating, the chosen option for multiple choice.
|
||||
*/
|
||||
export function ExtraFieldInput({ field, value, onChange, idPrefix = "f" }: {
|
||||
field: { id?: string; type: string; label: string; options?: unknown };
|
||||
value: string;
|
||||
onChange: (v: string) => void;
|
||||
idPrefix?: string;
|
||||
}) {
|
||||
if (field.type === "rating") {
|
||||
const n = Number(value) || 0;
|
||||
return (
|
||||
<div className="flex items-center gap-1" role="radiogroup" aria-label={field.label}>
|
||||
{[1, 2, 3, 4, 5].map(star => (
|
||||
<button
|
||||
key={star}
|
||||
type="button"
|
||||
role="radio"
|
||||
aria-checked={n === star}
|
||||
aria-label={`${star} star${star === 1 ? "" : "s"}`}
|
||||
onClick={() => onChange(n === star ? "" : String(star))}
|
||||
className="p-0.5 rounded focus:outline-none focus:ring-2 focus:ring-amber-300"
|
||||
>
|
||||
<Star className={`w-7 h-7 ${star <= n ? "fill-amber-400 text-amber-400" : "text-gray-300"}`} />
|
||||
</button>
|
||||
))}
|
||||
{n > 0 && <span className="text-xs text-gray-500 ml-1">{n} of 5</span>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
const choices = fieldChoices(field);
|
||||
return (
|
||||
<div className="space-y-1" role="radiogroup" aria-label={field.label}>
|
||||
{choices.map(c => (
|
||||
<label key={c} className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<input type="radio" name={`${idPrefix}-${field.id || field.label}`} checked={value === c} onChange={() => onChange(c)} />
|
||||
{c}
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Builder controls for a multiple-choice field's options (one per line). */
|
||||
export function ChoicesEditor({ options, onChange }: { options: unknown; onChange: (opts: string[]) => void }) {
|
||||
const text = Array.isArray(options) ? options.join("\n") : "";
|
||||
return (
|
||||
<textarea
|
||||
className="border rounded px-2 py-1 text-xs w-full mt-1"
|
||||
rows={3}
|
||||
placeholder={"One choice per line, e.g.\nWorship\nTalks\nFood"}
|
||||
value={text}
|
||||
onChange={e => onChange(e.target.value.split("\n"))}
|
||||
onBlur={e => onChange(e.target.value.split("\n").map(s => s.trim()).filter(Boolean))}
|
||||
/>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user