Fixed null check warnings

api/src/routes/course.ts

@@ -1,12 +1,84 @@
 import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
-import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent, updateCourseEvent } from "../services/db/CourseSerivce";
+import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent, editCourseEventReport } from "../services/db/CourseSerivce";
 import { Request, Response, Router } from "express";
-import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
+import { requireLogin, requireMemberState } from "../middleware/auth";
 import { MemberState } from "@app/shared/types/member";
 import { logger } from "../services/logging/logger";
 import { audit } from "../services/logging/auditLog";
 import { syncQualificationsForCourseEvent } from "../services/db/qualificationService";
 
+function validateTrainingReportPayload(payload: any): { valid: true; value: any } | { valid: false; message: string } {
+    if (!payload || typeof payload !== "object") {
+        return { valid: false, message: "Payload must be an object" };
+    }
+
+    if (!Number.isInteger(payload.course_id)) {
+        return { valid: false, message: "Must select a training" };
+    }
+
+    const eventDate = new Date(payload.event_date);
+    if (isNaN(eventDate.getTime())) {
+        return { valid: false, message: "Must be a valid date" };
+    }
+
+    const attendees = Array.isArray(payload.attendees) ? payload.attendees : [];
+    const trainerRole = 1;
+    const traineeRole = 2;
+    const seenAttendees = new Set<number>();
+    let hasTrainer = false;
+    let hasTrainee = false;
+
+    for (let i = 0; i < attendees.length; i++) {
+        const attendee = attendees[i];
+
+        if (!attendee || typeof attendee !== "object") {
+            return { valid: false, message: `Attendee at index ${i} is invalid` };
+        }
+
+        if (!Number.isInteger(attendee.attendee_id) || attendee.attendee_id <= 0) {
+            return { valid: false, message: "Must select a member" };
+        }
+
+        if (!Number.isInteger(attendee.attendee_role_id) || attendee.attendee_role_id <= 0) {
+            return { valid: false, message: "Must select a role" };
+        }
+
+        if (typeof attendee.passed_bookwork !== "boolean" || typeof attendee.passed_qual !== "boolean") {
+            return { valid: false, message: "Attendee pass fields must be boolean" };
+        }
+
+        if (typeof attendee.remarks !== "string") {
+            return { valid: false, message: "Attendee remarks must be a string" };
+        }
+
+        if (seenAttendees.has(attendee.attendee_id)) {
+            return { valid: false, message: "Cannot have duplicate attendee." };
+        }
+
+        seenAttendees.add(attendee.attendee_id);
+        hasTrainer = hasTrainer || attendee.attendee_role_id === trainerRole;
+        hasTrainee = hasTrainee || attendee.attendee_role_id === traineeRole;
+    }
+
+    if (!hasTrainer) {
+        return { valid: false, message: "At least one Primary Trainer is required." };
+    }
+
+    if (!hasTrainee) {
+        return { valid: false, message: "At least one Trainee is required." };
+    }
+
+    return {
+        valid: true,
+        value: {
+            ...payload,
+            attendees,
+            event_date: eventDate,
+            remarks: payload.remarks ?? null,
+        },
+    };
+}
+
 const cr = Router();
 const er = Router();
 
@@ -69,6 +141,11 @@ er.get('/', async (req: Request, res: Response) => {
         }
 
         const sortDir = allowedSorts.get(sort);
+        if (!sortDir) {
+            return res.status(400).json({
+                message: `Invalid sort direction '${req.query.sort}'. Allowed values are 'ascending' or 'descending'.`
+            });
+        }
 
         let events = await getCourseEvents(sortDir, search, page, pageSize);
         res.status(200).json(events);
@@ -145,21 +222,34 @@ er.post('/', async (req: Request, res: Response) => {
     }
 })
 
-er.put('/:id', [requireLogin, requireMemberState(MemberState.Member), requireRole("dev")], async (req: Request, res: Response) => {
+er.put('/:id', async (req: Request, res: Response) => {
     const editorID: number = req.user.id;
     const reportId = Number(req.params.id);
 
     try {
-        let data: CourseEventDetails = req.body;
-        data.event_date = new Date(data.event_date);
+        const validation = validateTrainingReportPayload(req.body);
+        if (validation.valid === false) {
+            return res.status(400).json({
+                message: 'Invalid training report payload',
+                errors: validation.message,
+            });
+        }
 
-        await updateCourseEvent(reportId, data);
-        const syncOutcome = await syncQualificationsForCourseEvent(reportId, editorID);
+        const parsed = validation.value;
+        let data: CourseEventDetails = {
+            ...req.body,
+            ...parsed,
+            id: reportId,
+            event_date: parsed.event_date,
+        };
 
-        audit.course('report_edited', { actorId: editorID, targetId: reportId }, { qualificationSync: syncOutcome });
-        logger.info('app', 'Training report edited', { user: editorID, report: reportId, qualificationSync: syncOutcome })
+        const actorRoles = (req.user.roles || []).map((role) => role.name);
+        const result = await editCourseEventReport(reportId, data, editorID, actorRoles);
+
+        logger.info('app', 'Training report edited', { user: editorID, report: reportId, qualificationSync: result.syncOutcome })
         res.sendStatus(200);
     } catch (error) {
+        const status = typeof (error as any)?.status === 'number' ? (error as any).status : 500;
         logger.error(
             'app',
             'Failed to edit training report',
@@ -170,6 +260,11 @@ er.put('/:id', [requireLogin, requireMemberState(MemberState.Member), requireRol
                 stack: error instanceof Error ? error.stack : undefined,
             }
         );
+
+        if (status !== 500) {
+            return res.status(status).json(error instanceof Error ? error.message : String(error));
+        }
+
         res.status(500).json("failed to edit training\n" + error)
     }
 })

api/src/services/db/CourseSerivce.ts

@@ -2,6 +2,99 @@ import pool from "../../db"
 import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails, CourseEventSummary, RawAttendeeRow } from "@app/shared/types/course"
 import { PagedData } from "@app/shared/types/pagination";
 import { toDateTime } from "@app/shared/utils/time";
+import { syncQualificationsForCourseEvent } from "./qualificationService";
+import { audit } from "../logging/auditLog";
+
+type QualificationSyncOutcome = {
+    courseId: number | null;
+    awarded: number;
+    deactivated: number;
+    impactedMembers: number;
+};
+
+type EventEditResult = {
+    syncOutcome: QualificationSyncOutcome;
+};
+
+type EditableAttendee = {
+    attendee_id: number;
+    attendee_role_id: number | null;
+    passed_bookwork: boolean;
+    passed_qual: boolean;
+    remarks: string | null;
+    attendee_name: string | null;
+};
+
+type ModifiedAttendeeDiff = {
+    attendee_id: number;
+    attendee_name: string | null;
+    fields: Record<string, { before: any; after: any }>;
+};
+
+class CourseEditError extends Error {
+    status: number;
+
+    constructor(status: number, message: string) {
+        super(message);
+        this.status = status;
+    }
+}
+
+function normalizeRemarks(value: any): string | null {
+    if (value === null || value === undefined) {
+        return null;
+    }
+
+    return String(value);
+}
+
+function toEditableAttendee(attendee: any): EditableAttendee {
+    return {
+        attendee_id: Number(attendee.attendee_id),
+        attendee_role_id: attendee.attendee_role_id === null || attendee.attendee_role_id === undefined ? null : Number(attendee.attendee_role_id),
+        passed_bookwork: !!attendee.passed_bookwork,
+        passed_qual: !!attendee.passed_qual,
+        remarks: normalizeRemarks(attendee.remarks),
+        attendee_name: attendee.attendee_name ?? null,
+    };
+}
+
+function attendeeFieldDiff(before: EditableAttendee, after: EditableAttendee): Record<string, { before: any; after: any }> {
+    const fields: Record<string, { before: any; after: any }> = {};
+
+    if (before.attendee_role_id !== after.attendee_role_id) {
+        fields.attendee_role_id = { before: before.attendee_role_id, after: after.attendee_role_id };
+    }
+
+    if (before.passed_bookwork !== after.passed_bookwork) {
+        fields.passed_bookwork = { before: before.passed_bookwork, after: after.passed_bookwork };
+    }
+
+    if (before.passed_qual !== after.passed_qual) {
+        fields.passed_qual = { before: before.passed_qual, after: after.passed_qual };
+    }
+
+    if (normalizeRemarks(before.remarks) !== normalizeRemarks(after.remarks)) {
+        fields.remarks = { before: normalizeRemarks(before.remarks), after: normalizeRemarks(after.remarks) };
+    }
+
+    return fields;
+}
+
+function deriveTrainerIds(attendees: EditableAttendee[]): number[] {
+    return attendees
+        .filter((attendee) => attendee.attendee_role_id === 1)
+        .map((attendee) => attendee.attendee_id)
+        .sort((a, b) => a - b);
+}
+
+function hasSeventeenthAdminRole(roles: string[]): boolean {
+    return roles.some((role) => role.toLowerCase() === "17th administrator");
+}
+
+function sameDateInstant(left: Date, right: Date): boolean {
+    return left.getTime() === right.getTime();
+}
 export async function getAllCourses(): Promise<Course[]> {
     const sql = "SELECT * FROM courses WHERE deleted = false ORDER BY name ASC;"
 
@@ -33,8 +126,8 @@ function buildAttendee(row: RawAttendeeRow): CourseAttendee {
                 name: row.role_name,
                 description: row.role_description,
                 deleted: !!row.role_deleted,
-                created_at: new Date(row.role_created_at),
-                updated_at: new Date(row.role_updated_at),
+                created_at: row.role_created_at ? new Date(row.role_created_at) : null,
+                updated_at: row.role_updated_at ? new Date(row.role_updated_at) : null,
             }
             : null
     };
@@ -74,14 +167,29 @@ export async function getCourseEventDetails(id: number): Promise<CourseEventDeta
                 `;
     let rows: CourseEventDetails[] = await pool.query(sql, [id]);
     let event = rows[0];
+
+    if (!event) {
+        throw new CourseEditError(404, "Training report not found");
+    }
+
+    if (event.course_id === null) {
+        throw new CourseEditError(500, "Training report is missing course linkage");
+    }
+
     event.attendees = await getCourseEventAttendees(id);
     event.course = await getCourseByID(event.course_id);
     return event;
 }
 
 export async function insertCourseEvent(event: CourseEventDetails): Promise<number> {
+    let con: any = null;
+
     try {
-        var con = await pool.getConnection();
+        if (event.course_id === null) {
+            throw new CourseEditError(400, "Invalid course selection");
+        }
+
+        con = await pool.getConnection();
 
         let course: Course = await getCourseByID(event.course_id);
 
@@ -89,7 +197,7 @@ export async function insertCourseEvent(event: CourseEventDetails): Promise<numb
         const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by, hasBookwork, hasQual) VALUES (?, ?, ?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by, course.hasBookwork, course.hasQual]);
         var eventID: number = res.insertId;
 
-        for (const attendee of event.attendees) {
+        for (const attendee of event.attendees || []) {
             await con.query(`INSERT INTO course_attendees (
                         attendee_id,
                         course_event_id,
@@ -162,14 +270,142 @@ export async function getCourseEventRoles(): Promise<CourseAttendeeRole[]> {
     return roles;
 }
 
-export async function updateCourseEvent(eventId: number, event: CourseEventDetails): Promise<void> {
+export async function editCourseEventReport(eventId: number, event: CourseEventDetails, actorId: number, actorRoleNames: string[]): Promise<EventEditResult> {
+    let con: any = null;
+
     try {
-        var con = await pool.getConnection();
-
-        let course: Course = await getCourseByID(event.course_id);
+        if (event.course_id === null) {
+            throw new CourseEditError(400, "Invalid course selection");
+        }
 
+        con = await pool.getConnection();
         await con.beginTransaction();
 
+        const eventRows = await con.query(
+            `SELECT id, course_id, event_date, remarks, created_by, hasBookwork, hasQual
+             FROM course_events
+             WHERE id = ?
+             LIMIT 1;`,
+            [eventId]
+        );
+
+        if (!eventRows.length) {
+            throw new CourseEditError(404, "Training report not found");
+        }
+
+        const existingEvent = eventRows[0];
+        const editorIsAuthor = Number(existingEvent.created_by) === actorId;
+        const editorIsAdmin = hasSeventeenthAdminRole(actorRoleNames);
+
+        if (!editorIsAuthor && !editorIsAdmin) {
+            throw new CourseEditError(403, "Only the report author or a 17th administrator can edit this report");
+        }
+
+        const courseRows = await con.query(
+            `SELECT id, hasBookwork, hasQual
+             FROM courses
+             WHERE id = ?
+             LIMIT 1;`,
+            [event.course_id]
+        );
+
+        if (!courseRows.length) {
+            throw new CourseEditError(400, "Invalid course selection");
+        }
+
+        const selectedCourse = courseRows[0];
+
+        const attendeeRows = await con.query(
+            `SELECT
+                ca.attendee_id,
+                ca.attendee_role_id,
+                ca.passed_bookwork,
+                ca.passed_qual,
+                ca.remarks,
+                mem.name AS attendee_name
+            FROM course_attendees ca
+            LEFT JOIN members mem ON mem.id = ca.attendee_id
+            WHERE ca.course_event_id = ?;`,
+            [eventId]
+        );
+
+        const existingAttendees: EditableAttendee[] = attendeeRows.map((row: any) => toEditableAttendee(row));
+        const incomingAttendees: EditableAttendee[] = (event.attendees ?? []).map((attendee) => toEditableAttendee(attendee));
+
+        const existingById = new Map<number, EditableAttendee>(existingAttendees.map((attendee) => [attendee.attendee_id, attendee]));
+        const incomingById = new Map<number, EditableAttendee>(incomingAttendees.map((attendee) => [attendee.attendee_id, attendee]));
+
+        const added: EditableAttendee[] = [];
+        const removed: EditableAttendee[] = [];
+        const modified: ModifiedAttendeeDiff[] = [];
+
+        for (const attendee of incomingAttendees) {
+            const existingAttendee = existingById.get(attendee.attendee_id);
+            if (!existingAttendee) {
+                added.push(attendee);
+                continue;
+            }
+
+            const fields = attendeeFieldDiff(existingAttendee, attendee);
+            if (Object.keys(fields).length > 0) {
+                modified.push({
+                    attendee_id: attendee.attendee_id,
+                    attendee_name: attendee.attendee_name || existingAttendee.attendee_name,
+                    fields,
+                });
+            }
+        }
+
+        for (const attendee of existingAttendees) {
+            if (!incomingById.has(attendee.attendee_id)) {
+                removed.push(attendee);
+            }
+        }
+
+        const existingEventDate = new Date(existingEvent.event_date);
+        const incomingEventDate = new Date(event.event_date);
+        if (isNaN(incomingEventDate.getTime())) {
+            throw new CourseEditError(400, "Invalid event date");
+        }
+
+        const existingRemarks = normalizeRemarks(existingEvent.remarks);
+        const incomingRemarks = normalizeRemarks(event.remarks);
+
+        const eventChanges: Record<string, { before: any; after: any }> = {};
+
+        if (Number(existingEvent.course_id) !== Number(event.course_id)) {
+            eventChanges.course_id = { before: Number(existingEvent.course_id), after: Number(event.course_id) };
+        }
+
+        if (!sameDateInstant(existingEventDate, incomingEventDate)) {
+            eventChanges.event_date = { before: existingEventDate.toISOString(), after: incomingEventDate.toISOString() };
+        }
+
+        if (existingRemarks !== incomingRemarks) {
+            eventChanges.remarks = { before: existingRemarks, after: incomingRemarks };
+        }
+
+        const previousTrainerIds = deriveTrainerIds(existingAttendees);
+        const nextTrainerIds = deriveTrainerIds(incomingAttendees);
+        if (JSON.stringify(previousTrainerIds) !== JSON.stringify(nextTrainerIds)) {
+            eventChanges.trainer_attendee_ids = { before: previousTrainerIds, after: nextTrainerIds };
+        }
+
+        if (!!existingEvent.hasBookwork !== !!selectedCourse.hasBookwork) {
+            eventChanges.hasBookwork = { before: !!existingEvent.hasBookwork, after: !!selectedCourse.hasBookwork };
+        }
+
+        if (!!existingEvent.hasQual !== !!selectedCourse.hasQual) {
+            eventChanges.hasQual = { before: !!existingEvent.hasQual, after: !!selectedCourse.hasQual };
+        }
+
+        const hasEventChanges = Object.keys(eventChanges).length > 0;
+        const hasAttendeeChanges = added.length > 0 || removed.length > 0 || modified.length > 0;
+
+        if (!hasEventChanges && !hasAttendeeChanges) {
+            throw new CourseEditError(409, "No report changes detected");
+        }
+
         await con.query(
             `UPDATE course_events
              SET course_id = ?,
@@ -178,12 +414,10 @@ export async function updateCourseEvent(eventId: number, event: CourseEventDetai
                  hasBookwork = ?,
                  hasQual = ?
              WHERE id = ?;`,
-            [event.course_id, toDateTime(event.event_date), event.remarks, course.hasBookwork, course.hasQual, eventId]
+            [event.course_id, toDateTime(incomingEventDate), incomingRemarks, !!selectedCourse.hasBookwork, !!selectedCourse.hasQual, eventId]
         );
 
-        await con.query(`DELETE FROM course_attendees WHERE course_event_id = ?;`, [eventId]);
-
-        for (const attendee of event.attendees) {
+        for (const attendee of added) {
             await con.query(
                 `INSERT INTO course_attendees (
                     attendee_id,
@@ -194,11 +428,101 @@ export async function updateCourseEvent(eventId: number, event: CourseEventDetai
                     remarks
                 )
                 VALUES (?, ?, ?, ?, ?, ?);`,
-                [attendee.attendee_id, eventId, attendee.attendee_role_id, attendee.passed_bookwork, attendee.passed_qual, attendee.remarks]
+                [
+                    attendee.attendee_id,
+                    eventId,
+                    attendee.attendee_role_id,
+                    attendee.passed_bookwork,
+                    attendee.passed_qual,
+                    attendee.remarks,
+                ]
             );
         }
 
+        for (const attendee of modified) {
+            const updates: string[] = [];
+            const params: any[] = [];
+
+            if (attendee.fields.attendee_role_id) {
+                updates.push("attendee_role_id = ?");
+                params.push(attendee.fields.attendee_role_id.after);
+            }
+
+            if (attendee.fields.passed_bookwork) {
+                updates.push("passed_bookwork = ?");
+                params.push(attendee.fields.passed_bookwork.after);
+            }
+
+            if (attendee.fields.passed_qual) {
+                updates.push("passed_qual = ?");
+                params.push(attendee.fields.passed_qual.after);
+            }
+
+            if (attendee.fields.remarks) {
+                updates.push("remarks = ?");
+                params.push(attendee.fields.remarks.after);
+            }
+
+            if (updates.length > 0) {
+                params.push(eventId, attendee.attendee_id);
+                await con.query(
+                    `UPDATE course_attendees
+                     SET ${updates.join(", ")}
+                     WHERE course_event_id = ?
+                       AND attendee_id = ?;`,
+                    params
+                );
+            }
+        }
+
+        if (removed.length > 0) {
+            const removeIds = removed.map((attendee) => attendee.attendee_id);
+            const placeholders = removeIds.map(() => "?").join(", ");
+            await con.query(
+                `DELETE FROM course_attendees
+                 WHERE course_event_id = ?
+                   AND attendee_id IN (${placeholders});`,
+                [eventId, ...removeIds]
+            );
+        }
+
+        const syncOutcome = await syncQualificationsForCourseEvent(eventId, actorId, con);
+
+        const auditPayload = {
+            meta: {
+                reportId: eventId,
+                actorId,
+                editedAt: new Date().toISOString(),
+                authorizationPathUsed: editorIsAuthor ? "author" : "17th_admin",
+            },
+            eventChanges,
+            attendeeChanges: {
+                added,
+                removed,
+                modified,
+            },
+            qualificationSync: {
+                ...syncOutcome,
+                status: "success",
+            },
+            validationContext: {
+                hasBookwork: !!selectedCourse.hasBookwork,
+                hasQual: !!selectedCourse.hasQual,
+            },
+        };
+
+        await audit.course(
+            "report_edited",
+            { actorId, targetId: eventId },
+            auditPayload,
+            { connection: con, throwOnError: true }
+        );
+
         await con.commit();
+
+        return {
+            syncOutcome,
+        };
     } catch (error) {
         if (con) await con.rollback();
         throw error;

api/src/services/logging/auditLog.ts

@@ -8,53 +8,64 @@ export interface AuditContext {
     targetId?: number;     // The ID of the thing being changed (target_id)
 }
 
+interface AuditRecordOptions {
+    connection?: any;
+    throwOnError?: boolean;
+}
+
 class AuditLogger {
     async record(
         area: AuditArea,
         action: string,
         context: AuditContext,
-        data: Record<string, any> = {} // Already optional with default {}
+        data: Record<string, any> = {}, // Already optional with default {}
+        options: AuditRecordOptions = {}
     ) {
         const actionType = `${area}.${action}`;
+        const queryTarget = options.connection ?? pool;
 
         try {
-            await pool.query(
+            await queryTarget.query(
                 `INSERT INTO audit_log (action_type, payload, target_id, created_by) 
                  VALUES (?, ?, ?, ?)`, // Fixed: removed extra comma/placeholder
                 [
                     actionType,
                     JSON.stringify(data),
-                    context.targetId || null,
+                    context.targetId ?? null,
                     context.actorId,
                 ]
             );
         } catch (err) {
             logger.error('audit', `AUDIT_FAILURE: Failed to log ${actionType}`, { error: err });
+
+            if (options.throwOnError) {
+                throw err;
+            }
         }
     }
     
-    member(action: 'update_rank'| 'update_unit' | 'suspension_added' | 'suspension_removed' | 'discharged', context: AuditContext, data: any = {}) {
-        return this.record('member', action, context, data);
+    member(action: 'update_rank'| 'update_unit' | 'suspension_added' | 'suspension_removed' | 'discharged', context: AuditContext, data: any = {}, options: AuditRecordOptions = {}) {
+        return this.record('member', action, context, data, options);
     }
 
-    roles(action: 'add_member' | 'remove_member' | 'create' | 'delete', context: AuditContext, data: any = {}) {
-        return this.record('roles', action, context, data);
+    roles(action: 'add_member' | 'remove_member' | 'create' | 'delete', context: AuditContext, data: any = {}, options: AuditRecordOptions = {}) {
+        return this.record('roles', action, context, data, options);
     }
 
-    leaveOfAbsence(action: 'created' | 'admin_created' | 'ended' | 'admin_ended' | 'extended', context: AuditContext, data: any = {}) {
-        return this.record('leave_of_absence', action, context, data);
+    leaveOfAbsence(action: 'created' | 'admin_created' | 'ended' | 'admin_ended' | 'extended', context: AuditContext, data: any = {}, options: AuditRecordOptions = {}) {
+        return this.record('leave_of_absence', action, context, data, options);
     }
 
-    calendar(action: 'event_created' | 'event_updated' | 'attendance_set' | 'cancelled' | 'un-cancelled', context: AuditContext, data: any = {}) {
-        return this.record('calendar', action, context, data);
+    calendar(action: 'event_created' | 'event_updated' | 'attendance_set' | 'cancelled' | 'un-cancelled', context: AuditContext, data: any = {}, options: AuditRecordOptions = {}) {
+        return this.record('calendar', action, context, data, options);
     }
 
-    application(action: 'created' | 'approved' | 'denied' | 'restarted', context: AuditContext, data: any = {}) {
-        return this.record('application', action, context, data);
+    application(action: 'created' | 'approved' | 'denied' | 'restarted', context: AuditContext, data: any = {}, options: AuditRecordOptions = {}) {
+        return this.record('application', action, context, data, options);
     }
 
-    course(action: 'report_created' | 'report_edited', context: AuditContext, data: any = {}) {
-        return this.record('course', action, context, data);
+    course(action: 'report_created' | 'report_edited', context: AuditContext, data: any = {}, options: AuditRecordOptions = {}) {
+        return this.record('course', action, context, data, options);
     }
 }
 

ui/src/components/trainingReport/trainingReportForm.vue

@@ -4,7 +4,7 @@ import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails } from '
 import { useForm, useFieldArray, FieldArray as VeeFieldArray, ErrorMessage, Field as VeeField } from 'vee-validate'
 import { toTypedSchema } from '@vee-validate/zod'
 import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
-import { getAllAttendeeRoles, getAllTrainings, postTrainingReport } from '@/api/trainingReport'
+import { getAllAttendeeRoles, getAllTrainings, postTrainingReport, putTrainingReport } from '@/api/trainingReport'
 import { getAllLightMembers, getLightMembers, getMembers } from '@/api/member'
 import { Member, MemberLight } from '@shared/types/member'
 
@@ -28,6 +28,40 @@ import Combobox from '../ui/combobox/Combobox.vue'
 import Tooltip from '../tooltip/Tooltip.vue'
 import Spinner from '../ui/spinner/Spinner.vue'
 
+const props = withDefaults(defineProps<{
+    mode?: 'create' | 'edit';
+    report?: CourseEventDetails | null;
+    reportId?: number | null;
+}>(), {
+    mode: 'create',
+    report: null,
+    reportId: null,
+})
+
+const emit = defineEmits(['submit'])
+
+function toFormDate(dateValue: Date | string | null | undefined): string {
+    if (!dateValue) return "";
+    const d = new Date(dateValue);
+    if (isNaN(d.getTime())) return "";
+    return d.toISOString().split('T')[0];
+}
+
+function toFormValues(report: CourseEventDetails) {
+    return {
+        course_id: report.course_id,
+        event_date: toFormDate(report.event_date),
+        remarks: report.remarks ?? "",
+        attendees: (report.attendees ?? []).map((attendee) => ({
+            attendee_id: attendee.attendee_id,
+            attendee_role_id: attendee.attendee_role_id,
+            passed_bookwork: !!attendee.passed_bookwork,
+            passed_qual: !!attendee.passed_qual,
+            remarks: attendee.remarks ?? "",
+        })),
+    };
+}
+
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
     validationSchema: toTypedSchema(trainingReportSchema),
@@ -40,6 +74,53 @@ const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
     }
 })
 
+const hydratedReportId = ref<number | null>(null);
+const comboboxRenderEpoch = ref(0);
+
+watch(() => props.report, (report) => {
+    hydratedReportId.value = null;
+
+    if (!report) {
+        if (props.mode === 'create') {
+            resetForm();
+            comboboxRenderEpoch.value++;
+        }
+        return;
+    }
+
+    resetForm({
+        values: toFormValues(report),
+    });
+
+    comboboxRenderEpoch.value++;
+}, { immediate: true });
+
+function hydrateEditValuesWhenOptionsReady() {
+    if (props.mode !== 'edit' || !props.report) {
+        return;
+    }
+
+    if (!trainings.value || !members.value || !eventRoles.value) {
+        return;
+    }
+
+    const reportId = Number(props.report.id);
+    if (!Number.isFinite(reportId)) {
+        return;
+    }
+
+    if (hydratedReportId.value === reportId) {
+        return;
+    }
+
+    resetForm({
+        values: toFormValues(props.report),
+    });
+
+    hydratedReportId.value = reportId;
+    comboboxRenderEpoch.value++;
+}
+
 // watch(errors, (newErrors) => {
 //     console.log(newErrors)
 // }, { deep: true })
@@ -79,9 +160,19 @@ async function onSubmit(vals) {
             event_date: new Date(vals.event_date),
         }
 
-        await postTrainingReport(clean).then((newID) => {
-            emit("submit", newID);
-        });
+        if (props.mode === 'edit') {
+            const id = Number(props.reportId);
+            if (!id || Number.isNaN(id)) {
+                throw new Error('Cannot edit report without a valid reportId');
+            }
+
+            await putTrainingReport(id, clean);
+            emit("submit", id);
+        } else {
+            await postTrainingReport(clean).then((newID) => {
+                emit("submit", newID);
+            });
+        }
     } catch (err) {
         console.error("There was an error submitting the training report", err);
     } finally {
@@ -97,14 +188,18 @@ const trainings = ref<Course[] | null>(null);
 const members = ref<MemberLight[] | null>(null);
 const eventRoles = ref<CourseAttendeeRole[] | null>(null);
 
-const emit = defineEmits(['submit'])
-
 onMounted(async () => {
     trainings.value = await getAllTrainings();
     members.value = await getAllLightMembers();
     eventRoles.value = await getAllAttendeeRoles();
+
+    hydrateEditValuesWhenOptionsReady();
 })
 
+watch([trainings, members, eventRoles, () => props.report], () => {
+    hydrateEditValuesWhenOptionsReady();
+});
+
 const selectCourse = ref(false);
 const openMap = reactive<Record<string, boolean>>({})
 
@@ -143,6 +238,7 @@ const filteredMembers = computed(() => {
                         <Field :data-invalid="!!errors.length">
                             <FieldLabel class="scroll-m-20 text-lg tracking-tight">Training Course</FieldLabel>
                             <Combobox :model-value="field.value" @update:open="selectCourse = $event"
+                                :key="`course-${comboboxRenderEpoch}`"
                                 :open="selectCourse" @update:model-value="(v) => {
                                     field.onChange(v);
                                     selectCourse = false
@@ -150,7 +246,7 @@ const filteredMembers = computed(() => {
                                 <ComboboxAnchor class="w-full">
                                     <ComboboxInput @focus="selectCourse = true" placeholder="Search courses..."
                                         class="w-full pl-3" :display-value="(id) => {
-                                            const c = trainings?.find(t => t.id === id)
+                                            const c = trainings?.find(t => Number(t.id) === Number(id))
                                             return c ? c.name : '';
                                         }" />
                                 </ComboboxAnchor>
@@ -249,6 +345,7 @@ const filteredMembers = computed(() => {
                             <VeeField :name="`attendees[${index}].attendee_id`" v-slot="{ field: f, errors: e }">
                                 <div>
                                     <Combobox :model-value="f.value"
+                                        :key="`member-${field.key}-${comboboxRenderEpoch}`"
                                         @update:open="openMap['member-' + field.key] = $event"
                                         :open="openMap['member-' + field.key]" @update:model-value="(v) => {
                                             f.onChange(v);
@@ -258,7 +355,7 @@ const filteredMembers = computed(() => {
                                             <ComboboxInput
                                                 @focus="() => { openMap['member-' + field.key] = true; memberSearch = memberMap[f.value] }"
                                                 placeholder="Search members..." class="w-full pl-3"
-                                                :display-value="(id) => memberMap[id] || ''"
+                                                :display-value="(id) => memberMap[String(id)] || ''"
                                                 @input="memberSearch = $event.target.value" />
                                         </ComboboxAnchor>
                                         <ComboboxList class="w-full">
@@ -290,6 +387,7 @@ const filteredMembers = computed(() => {
                             <VeeField :name="`attendees[${index}].attendee_role_id`" v-slot="{ field: f, errors: e }">
                                 <div>
                                     <Combobox :model-value="f.value"
+                                        :key="`role-${field.key}-${comboboxRenderEpoch}`"
                                         @update:open="openMap['role-' + field.key] = $event"
                                         :open="openMap['role-' + field.key]" @update:model-value="(v) => {
                                             f.onChange(v);
@@ -298,7 +396,7 @@ const filteredMembers = computed(() => {
                                         <ComboboxAnchor class="w-full">
                                             <ComboboxInput @focus="openMap['role-' + field.key] = true"
                                                 placeholder="Search roles..." class="w-full pl-3" :display-value="(id) => {
-                                                    const er = eventRoles?.find(t => t.id === id)
+                                                    const er = eventRoles?.find(t => Number(t.id) === Number(id))
                                                     return er?.name;
                                                 }" />
                                         </ComboboxAnchor>
@@ -410,9 +508,9 @@ const filteredMembers = computed(() => {
             <Button type="button" variant="outline" @click="resetForm">Reset</Button>
             <Button type="submit" form="trainingForm" :disabled="submitting" class="w-35">
                 <span class="flex items-center gap-2" v-if="submitting">
-                    <Spinner></Spinner> Submitting…
+                    <Spinner></Spinner> {{ props.mode === 'edit' ? 'Saving…' : 'Submitting…' }}
                 </span>
-                <span v-else>Submit</span>
+                <span v-else>{{ props.mode === 'edit' ? 'Save Changes' : 'Submit' }}</span>
             </Button>
         </div>
     </form>

ui/src/pages/TrainingReport.vue

@@ -1,204 +1,229 @@
 <script setup lang="ts">
-import { getTrainingReport, getTrainingReports } from '@/api/trainingReport';
-import { CourseAttendee, CourseEventDetails, CourseEventSummary } from '@shared/types/course';
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
-import {
-    Table,
-    TableBody,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow,
-} from '@/components/ui/table'
-import { ArrowUpDown, ChevronDown, ChevronLeft, ChevronUp, Funnel, Link, Plus, Search, X } from 'lucide-vue-next';
-import Button from '@/components/ui/button/Button.vue';
-import TrainingReportForm from '@/components/trainingReport/trainingReportForm.vue';
-import Checkbox from '@/components/ui/checkbox/Checkbox.vue';
-import { useRoute, useRouter } from 'vue-router';
-import Select from '@/components/ui/select/Select.vue';
-import SelectTrigger from '@/components/ui/select/SelectTrigger.vue';
-import SelectValue from '@/components/ui/select/SelectValue.vue';
-import SelectContent from '@/components/ui/select/SelectContent.vue';
-import SelectItem from '@/components/ui/select/SelectItem.vue';
-import Input from '@/components/ui/input/Input.vue';
-import MemberCard from '@/components/members/MemberCard.vue';
-import Spinner from '@/components/ui/spinner/Spinner.vue';
-import { pagination } from '@shared/types/pagination';
-import {
-    Pagination,
-    PaginationContent,
-    PaginationEllipsis,
-    PaginationItem,
-    PaginationNext,
-    PaginationPrevious,
-} from '@/components/ui/pagination'
-import Tooltip from '@/components/tooltip/Tooltip.vue';
-import { CopyLink } from '@/lib/copyLink';
+    import { getTrainingReport, getTrainingReports } from '@/api/trainingReport';
+    import { CourseAttendee, CourseEventDetails, CourseEventSummary } from '@shared/types/course';
+    import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+    import {
+        Table,
+        TableBody,
+        TableCell,
+        TableHead,
+        TableHeader,
+        TableRow,
+    } from '@/components/ui/table'
+    import { ArrowUpDown, ChevronDown, ChevronLeft, ChevronUp, Funnel, Link, Pencil, Plus, Search, X } from 'lucide-vue-next';
+    import Button from '@/components/ui/button/Button.vue';
+    import TrainingReportForm from '@/components/trainingReport/trainingReportForm.vue';
+    import Checkbox from '@/components/ui/checkbox/Checkbox.vue';
+    import { useRoute, useRouter } from 'vue-router';
+    import Select from '@/components/ui/select/Select.vue';
+    import SelectTrigger from '@/components/ui/select/SelectTrigger.vue';
+    import SelectValue from '@/components/ui/select/SelectValue.vue';
+    import SelectContent from '@/components/ui/select/SelectContent.vue';
+    import SelectItem from '@/components/ui/select/SelectItem.vue';
+    import Input from '@/components/ui/input/Input.vue';
+    import MemberCard from '@/components/members/MemberCard.vue';
+    import Spinner from '@/components/ui/spinner/Spinner.vue';
+    import { pagination } from '@shared/types/pagination';
+    import {
+        Pagination,
+        PaginationContent,
+        PaginationEllipsis,
+        PaginationItem,
+        PaginationNext,
+        PaginationPrevious,
+    } from '@/components/ui/pagination'
+    import Tooltip from '@/components/tooltip/Tooltip.vue';
+    import { CopyLink } from '@/lib/copyLink';
+    import { useUserStore } from '@/stores/user';
 
-enum sidePanelState { view, create, closed };
+    enum sidePanelState { view, create, edit, closed };
 
-const trainingReports = ref<CourseEventSummary[] | null>(null);
-const loaded = ref(false);
+    const trainingReports = ref<CourseEventSummary[] | null>(null);
+    const loaded = ref(false);
 
-const route = useRoute();
-const router = useRouter();
+    const route = useRoute();
+    const router = useRouter();
+    const user = useUserStore();
 
-const sidePanel = computed<sidePanelState>(() => {
-    if (route.path.endsWith('/new')) return sidePanelState.create;
-    if (route.params.id) return sidePanelState.view;
-    return sidePanelState.closed;
-})
+    const sidePanel = computed<sidePanelState>(() => {
+        if (route.path.endsWith('/edit')) return sidePanelState.edit;
+        if (route.path.endsWith('/new')) return sidePanelState.create;
+        if (route.params.id) return sidePanelState.view;
+        return sidePanelState.closed;
+    })
 
-const isMobile = ref(false);
-const mobilePanel = ref<sidePanelState>(sidePanelState.closed);
-let mobileMediaQuery: MediaQueryList | null = null;
+    const isMobile = ref(false);
+    const mobilePanel = ref<sidePanelState>(sidePanelState.closed);
+    let mobileMediaQuery: MediaQueryList | null = null;
 
-function syncMobileMode() {
-    isMobile.value = mobileMediaQuery?.matches ?? window.innerWidth < 1024;
-    if (!isMobile.value) {
-        mobilePanel.value = sidePanelState.closed;
+    function syncMobileMode() {
+        isMobile.value = mobileMediaQuery?.matches ?? window.innerWidth < 1024;
+        if (!isMobile.value) {
+            mobilePanel.value = sidePanelState.closed;
+        }
     }
-}
 
-const effectivePanel = computed<sidePanelState>(() => {
-    return isMobile.value ? mobilePanel.value : sidePanel.value;
-})
+    const effectivePanel = computed<sidePanelState>(() => {
+        return isMobile.value ? mobilePanel.value : sidePanel.value;
+    })
 
-watch(() => route.params.id, async (newID) => {
-    if (!newID) {
-        focusedTrainingReport.value = null;
-        return;
-    }
-    TRLoaded.value = false;
-    expanded.value = null;
-    viewTrainingReport(Number(route.params.id));
-})
-
-const focusedTrainingReport = ref<CourseEventDetails | null>(null);
-const focusedTrainingTrainees = computed<CourseAttendee[] | null>(() => {
-    if (focusedTrainingReport.value == null) return null;
-    return focusedTrainingReport.value.attendees.filter((attendee) => attendee.role.name == 'Trainee');
-})
-const focusedNoShows = computed<CourseAttendee[] | null>(() => {
-    if (focusedTrainingReport.value == null) return null;
-    return focusedTrainingReport.value.attendees.filter((attendee) => attendee.role.name == 'No-Show');
-})
-const focusedTrainingTrainers = computed<CourseAttendee[] | null>(() => {
-    if (focusedTrainingReport.value == null) return null;
-    return focusedTrainingReport.value.attendees.filter((attendee) => attendee.role.name != 'Trainee' && attendee.role.name != 'No-Show');
-})
-async function viewTrainingReport(id: number) {
-    focusedTrainingReport.value = await getTrainingReport(id);
-    TRLoaded.value = true;
-}
-
-async function closeTrainingReport() {
-    router.push(`/trainingReport`)
-    focusedTrainingReport.value = null;
-}
-
-async function openTrainingReport(id: number) {
-    if (isMobile.value) {
-        focusedTrainingReport.value = null;
+    watch(() => route.params.id, async (newID) => {
+        if (!newID) {
+            focusedTrainingReport.value = null;
+            return;
+        }
         TRLoaded.value = false;
         expanded.value = null;
-        mobilePanel.value = sidePanelState.view;
-        await viewTrainingReport(id);
-        return;
+        viewTrainingReport(Number(route.params.id));
+    })
+
+    const focusedTrainingReport = ref<CourseEventDetails | null>(null);
+    const focusedTrainingTrainees = computed<CourseAttendee[] | null>(() => {
+        if (focusedTrainingReport.value == null) return null; //if no training report is focused
+        return focusedTrainingReport.value.attendees?.filter((attendee) => attendee.role?.name == 'Trainee') ?? null;
+    })
+    const focusedNoShows = computed<CourseAttendee[] | null>(() => {
+        if (focusedTrainingReport.value == null) return null; //if no training report is focused
+        return focusedTrainingReport.value.attendees?.filter((attendee) => attendee.role?.name == 'No-Show') ?? null;
+    })
+    const focusedTrainingTrainers = computed<CourseAttendee[] | null>(() => {
+        if (focusedTrainingReport.value == null) return null; //if no training report is focused
+        return focusedTrainingReport.value.attendees?.filter((attendee) => attendee.role?.name != 'Trainee' && attendee.role?.name != 'No-Show') ?? null;
+    })
+    async function viewTrainingReport(id: number) {
+        focusedTrainingReport.value = await getTrainingReport(id);
+        TRLoaded.value = true;
     }
 
-    router.push(`/trainingReport/${id}`);
-}
-
-function openCreatePanel() {
-    if (isMobile.value) {
-        mobilePanel.value = sidePanelState.create;
+    async function closeTrainingReport() {
+        router.push(`/trainingReport`)
         focusedTrainingReport.value = null;
-        return;
     }
 
-    router.push('/trainingReport/new');
-}
+    async function openTrainingReport(id: number) {
+        if (isMobile.value) {
+            focusedTrainingReport.value = null;
+            TRLoaded.value = false;
+            expanded.value = null;
+            mobilePanel.value = sidePanelState.view;
+            await viewTrainingReport(id);
+            return;
+        }
 
-async function closePanel() {
-    if (isMobile.value) {
-        mobilePanel.value = sidePanelState.closed;
-        focusedTrainingReport.value = null;
-        TRLoaded.value = false;
-        expanded.value = null;
-        return;
+        router.push(`/trainingReport/${id}`);
     }
 
-    await closeTrainingReport();
-}
+    async function openEditPanel() {
+        if (!focusedTrainingReport.value) return;
 
-const sortMode = ref<string>("descending");
-const searchString = ref<string>("");
-let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+        if (isMobile.value) {
+            mobilePanel.value = sidePanelState.edit;
+            return;
+        }
 
-watch(searchString, (newValue) => {
-    if (debounceTimer) clearTimeout(debounceTimer);
+        router.push(`/trainingReport/${focusedTrainingReport.value.id}/edit`);
+    }
 
-    debounceTimer = setTimeout(() => {
-        loadTrainingReports();
-    }, 300); // 300ms debounce
-});
+    function openCreatePanel() {
+        if (isMobile.value) {
+            mobilePanel.value = sidePanelState.create;
+            focusedTrainingReport.value = null;
+            return;
+        }
 
-watch(() => sortMode.value, async (newSortMode) => {
-    loadTrainingReports();
-})
+        router.push('/trainingReport/new');
+    }
 
-async function loadTrainingReports() {
-    let data = await getTrainingReports(sortMode.value, searchString.value, pageNum.value, pageSize.value);
-    trainingReports.value = data.data;
-    pageData.value = data.pagination;
-}
+    async function closePanel() {
+        if (isMobile.value) {
+            mobilePanel.value = sidePanelState.closed;
+            focusedTrainingReport.value = null;
+            TRLoaded.value = false;
+            expanded.value = null;
+            return;
+        }
 
-onMounted(async () => {
-    mobileMediaQuery = window.matchMedia('(max-width: 1023px)');
-    syncMobileMode();
-    mobileMediaQuery.addEventListener('change', syncMobileMode);
+        await closeTrainingReport();
+    }
 
-    await loadTrainingReports();
-    if (route.params.id)
-        viewTrainingReport(Number(route.params.id))
-    loaded.value = true;
-})
+    const canEditFocusedReport = computed<boolean>(() => {
+        const report = focusedTrainingReport.value;
+        if (!report) return false;
 
-onBeforeUnmount(() => {
-    mobileMediaQuery?.removeEventListener('change', syncMobileMode);
-})
+        const actorId = user.user?.member?.member_id;
+        const isAuthor = !!actorId && report.created_by === actorId;
+        const isAdmin = user.hasRole('17th Administrator');
 
-const TRLoaded = ref(false);
-
-const pageNum = ref<number>(1);
-const pageData = ref<pagination>();
-
-const pageSize = ref<number>(15)
-const pageSizeOptions = [10, 15, 30]
-
-function formatDate(date: Date | string): string {
-    if (!date) return '';
-    const dateObj = typeof date === 'string' ? new Date(date) : date;
-    return dateObj.toLocaleDateString('en-US', {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
+        return isAuthor || isAdmin;
     });
-}
 
-function setPageSize(size: number) {
-    pageSize.value = size
-    pageNum.value = 1;
-    loadTrainingReports();
-}
+    const sortMode = ref<string>("descending");
+    const searchString = ref<string>("");
+    let debounceTimer: ReturnType<typeof setTimeout> | null = null;
 
-function setPage(pagenum: number) {
-    pageNum.value = pagenum;
-    loadTrainingReports();
-}
+    watch(searchString, (newValue) => {
+        if (debounceTimer) clearTimeout(debounceTimer);
 
-const expanded = ref<number>(null);
+        debounceTimer = setTimeout(() => {
+            loadTrainingReports();
+        }, 300); // 300ms debounce
+    });
+
+    watch(() => sortMode.value, async (newSortMode) => {
+        loadTrainingReports();
+    })
+
+    async function loadTrainingReports() {
+        let data = await getTrainingReports(sortMode.value, searchString.value, pageNum.value, pageSize.value);
+        trainingReports.value = data.data;
+        pageData.value = data.pagination;
+    }
+
+    onMounted(async () => {
+        mobileMediaQuery = window.matchMedia('(max-width: 1023px)');
+        syncMobileMode();
+        mobileMediaQuery.addEventListener('change', syncMobileMode);
+
+        await loadTrainingReports();
+        if (route.params.id)
+            viewTrainingReport(Number(route.params.id))
+        loaded.value = true;
+    })
+
+    onBeforeUnmount(() => {
+        mobileMediaQuery?.removeEventListener('change', syncMobileMode);
+    })
+
+    const TRLoaded = ref(false);
+
+    const pageNum = ref<number>(1);
+    const pageData = ref<pagination>();
+
+    const pageSize = ref<number>(15)
+    const pageSizeOptions = [10, 15, 30]
+
+    function formatDate(date: Date | string): string {
+        if (!date) return '';
+        const dateObj = typeof date === 'string' ? new Date(date) : date;
+        return dateObj.toLocaleDateString('en-US', {
+            year: 'numeric',
+            month: 'short',
+            day: 'numeric',
+        });
+    }
+
+    function setPageSize(size: number) {
+        pageSize.value = size
+        pageNum.value = 1;
+        loadTrainingReports();
+    }
+
+    function setPage(pagenum: number) {
+        pageNum.value = pagenum;
+        loadTrainingReports();
+    }
+
+    const expanded = ref<number | null>(null);
 </script>
 
 <template>
@@ -259,34 +284,35 @@ const expanded = ref<number>(null);
                 </div>
 
                 <div class="hidden md:block">
-                <Table>
-                    <TableHeader class="">
-                        <TableRow>
-                            <TableHead class="w-[100px]">
-                                Training
-                            </TableHead>
-                            <TableHead>Date</TableHead>
-                            <TableHead class="text-right">
-                                Posted By
-                            </TableHead>
-                        </TableRow>
-                    </TableHeader>
-                    <TableBody v-if="loaded">
-                        <TableRow class="cursor-pointer" v-for="report in trainingReports" :key="report.event_id"
-                            @click="openTrainingReport(report.event_id)">
-                            <TableCell class="font-medium">{{ report.course_name.length > 30 ? report.course_shortname :
-                                report.course_name }}</TableCell>
-                            <TableCell>{{ report.date.split('T')[0] }}</TableCell>
-                            <TableCell class="text-right">
-                                <MemberCard v-if="report.created_by" :member-id="report.created_by"></MemberCard>
-                                <span v-else>Unknown User</span>
-                            </TableCell>
-                            <!-- <TableCell class="text-right">{{ report.created_by_name === null ? "Unknown User" :
+                    <Table>
+                        <TableHeader class="">
+                            <TableRow>
+                                <TableHead class="w-[100px]">
+                                    Training
+                                </TableHead>
+                                <TableHead>Date</TableHead>
+                                <TableHead class="text-right">
+                                    Posted By
+                                </TableHead>
+                            </TableRow>
+                        </TableHeader>
+                        <TableBody v-if="loaded">
+                            <TableRow class="cursor-pointer" v-for="report in trainingReports" :key="report.event_id"
+                                @click="openTrainingReport(report.event_id)">
+                                <TableCell class="font-medium">{{ report.course_name.length > 30 ?
+                                    report.course_shortname :
+                                    report.course_name }}</TableCell>
+                                <TableCell>{{ report.date.split('T')[0] }}</TableCell>
+                                <TableCell class="text-right">
+                                    <MemberCard v-if="report.created_by" :member-id="report.created_by"></MemberCard>
+                                    <span v-else>Unknown User</span>
+                                </TableCell>
+                                <!-- <TableCell class="text-right">{{ report.created_by_name === null ? "Unknown User" :
                                 report.created_by_name
                             }}</TableCell> -->
-                        </TableRow>
-                    </TableBody>
-                </Table>
+                            </TableRow>
+                        </TableBody>
+                    </Table>
                 </div>
             </div>
             <div class="mt-5 flex flex-col gap-3 md:flex-row md:items-center md:justify-between"
@@ -328,6 +354,10 @@ const expanded = ref<number>(null);
             <div class="flex justify-between items-center">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Report Details</p>
                 <div class="flex items-center gap-2">
+                    <Button v-if="canEditFocusedReport" @click="openEditPanel" class="cursor-pointer" variant="ghost"
+                        size="sm">
+                        <Pencil class="size-4"></Pencil>
+                    </Button>
                     <Button v-if="isMobile" @click="closePanel" class="cursor-pointer" variant="outline" size="sm">
                         <ChevronLeft class="size-4"></ChevronLeft> Back
                     </Button>
@@ -339,7 +369,8 @@ const expanded = ref<number>(null);
                     </Button>
                 </div>
             </div>
-            <div v-if="TRLoaded" :class="isMobile ? 'my-3 pb-8' : 'my-5 max-h-[70vh] overflow-y-auto overflow-x-hidden scrollbar-themed'">
+            <div v-if="TRLoaded"
+                :class="isMobile ? 'my-3 pb-8' : 'my-5 max-h-[70vh] overflow-y-auto overflow-x-hidden scrollbar-themed'">
                 <div class="flex flex-col mb-5 border rounded-lg bg-muted/70 p-2 py-3 px-4">
                     <p class="scroll-m-20 text-xl font-semibold tracking-tight">{{ focusedTrainingReport.course_name }}
                     </p>
@@ -357,15 +388,20 @@ const expanded = ref<number>(null);
                     <div>
                         <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainers</label>
                         <div class="mt-3 space-y-2 md:hidden">
-                            <article v-for="person in focusedTrainingTrainers" :key="person.attendee_id ?? person.attendee_name"
-                                class="rounded-xl border bg-card p-3 shadow-sm" :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
+                            <article v-for="person in focusedTrainingTrainers"
+                                :key="person.attendee_id ?? person.attendee_name"
+                                class="rounded-xl border bg-card p-3 shadow-sm"
+                                :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
                                 <div class="flex items-start justify-between gap-2">
                                     <div class="min-w-0">
                                         <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                            class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
-                                        <p v-else class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                            class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis">
+                                        </MemberCard>
+                                        <p v-else class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{
+                                            person.attendee_name }}</p>
                                     </div>
-                                    <Button @click.stop="expanded === person.attendee_id ? expanded = null : expanded = person.attendee_id"
+                                    <Button
+                                        @click.stop="expanded === person.attendee_id ? expanded = null : expanded = person.attendee_id"
                                         variant="ghost" size="icon" class="shrink-0">
                                         <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
                                         <ChevronUp v-else class="size-5" />
@@ -374,14 +410,15 @@ const expanded = ref<number>(null);
                                 <div class="mt-3 grid grid-cols-1 gap-2 text-xs">
                                     <div class="rounded-lg bg-muted px-3 py-2">
                                         <p class="text-muted-foreground">Role</p>
-                                        <p class="font-medium text-foreground">{{ person.role.name }}</p>
+                                        <p class="font-medium text-foreground">{{ person.role?.name }}</p>
                                     </div>
                                     <div class="rounded-lg bg-muted px-3 py-2">
                                         <p class="text-muted-foreground">Remarks</p>
                                         <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}</p>
                                     </div>
                                 </div>
-                                <div v-if="expanded === person.attendee_id" class="mt-3 rounded-lg border bg-background px-3 py-2">
+                                <div v-if="expanded === person.attendee_id"
+                                    class="mt-3 rounded-lg border bg-background px-3 py-2">
                                     <p class="text-sm font-medium text-foreground">Full Remarks</p>
                                     <p v-if="person.remarks"
                                         class="mt-1 text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
@@ -401,16 +438,20 @@ const expanded = ref<number>(null);
                                 <span class="text-right">Remarks</span>
                                 <span></span>
                             </div>
-                            <div v-for="person in focusedTrainingTrainers" :key="person.attendee_id ?? person.attendee_name"
+                            <div v-for="person in focusedTrainingTrainers"
+                                :key="person.attendee_id ?? person.attendee_name"
                                 class="items-center border-b last:border-none"
                                 :class="expanded === person.attendee_id && 'bg-muted/20'">
-                                <div class="grid grid-cols-[minmax(0,1.6fr)_minmax(0,1fr)_minmax(0,1.4fr)_2.5rem] items-center py-2 gap-x-2">
+                                <div
+                                    class="grid grid-cols-[minmax(0,1.6fr)_minmax(0,1fr)_minmax(0,1.4fr)_2.5rem] items-center py-2 gap-x-2">
                                     <div class="min-w-0">
                                         <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                            class="justify-self-start max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
-                                        <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                            class="justify-self-start max-w-full whitespace-nowrap overflow-hidden text-ellipsis">
+                                        </MemberCard>
+                                        <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{
+                                            person.attendee_name }}</p>
                                     </div>
-                                    <p class="truncate">{{ person.role.name }}</p>
+                                    <p class="truncate">{{ person.role?.name }}</p>
                                     <p class="text-right px-2 truncate"
                                         :class="person.remarks == '' ? 'text-muted-foreground' : ''">
                                         {{ person.remarks == "" ?
@@ -449,15 +490,21 @@ const expanded = ref<number>(null);
                         <div class="flex flex-col">
                             <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainees</label>
                             <div class="mt-3 space-y-2 md:hidden">
-                                <article v-for="person in focusedTrainingTrainees" :key="person.attendee_id ?? person.attendee_name"
-                                    class="rounded-xl border bg-card p-3 shadow-sm" :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
+                                <article v-for="person in focusedTrainingTrainees"
+                                    :key="person.attendee_id ?? person.attendee_name"
+                                    class="rounded-xl border bg-card p-3 shadow-sm"
+                                    :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
                                     <div class="flex items-start justify-between gap-2">
                                         <div class="min-w-0">
                                             <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                                class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
-                                            <p v-else class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                                class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis">
+                                            </MemberCard>
+                                            <p v-else
+                                                class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{
+                                                person.attendee_name }}</p>
                                         </div>
-                                        <Button @click.stop="expanded === person.attendee_id ? expanded = null : expanded = person.attendee_id"
+                                        <Button
+                                            @click.stop="expanded === person.attendee_id ? expanded = null : expanded = person.attendee_id"
                                             variant="ghost" size="icon" class="shrink-0">
                                             <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
                                             <ChevronUp v-else class="size-5" />
@@ -466,18 +513,25 @@ const expanded = ref<number>(null);
                                     <div class="mt-3 grid grid-cols-2 gap-2 text-xs">
                                         <div class="rounded-lg bg-muted px-3 py-2 text-center">
                                             <p class="text-muted-foreground">Bookwork</p>
-                                            <p class="font-semibold text-foreground">{{ !focusedTrainingReport.course.hasBookwork ? 'N/A' : (person.passed_bookwork ? 'Pass' : 'Fail') }}</p>
+                                            <p class="font-semibold text-foreground">{{
+                                                !focusedTrainingReport.course?.hasBookwork ? 'N/A' :
+                                                (person.passed_bookwork ?
+                                                'Pass' : 'Fail') }}</p>
                                         </div>
                                         <div class="rounded-lg bg-muted px-3 py-2 text-center">
                                             <p class="text-muted-foreground">Qual</p>
-                                            <p class="font-semibold text-foreground">{{ !focusedTrainingReport.course.hasQual ? 'N/A' : (person.passed_qual ? 'Pass' : 'Fail') }}</p>
+                                            <p class="font-semibold text-foreground">{{
+                                                !focusedTrainingReport.course?.hasQual ?
+                                                'N/A' : (person.passed_qual ? 'Pass' : 'Fail') }}</p>
                                         </div>
                                         <div class="col-span-2 rounded-lg bg-muted px-3 py-2">
                                             <p class="text-muted-foreground">Remarks</p>
-                                            <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}</p>
+                                            <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}
+                                            </p>
                                         </div>
                                     </div>
-                                    <div v-if="expanded === person.attendee_id" class="mt-3 rounded-lg border bg-background px-3 py-2">
+                                    <div v-if="expanded === person.attendee_id"
+                                        class="mt-3 rounded-lg border bg-background px-3 py-2">
                                         <p class="text-sm font-medium text-foreground">Full Remarks</p>
                                         <p v-if="person.remarks"
                                             class="mt-1 text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
@@ -498,26 +552,30 @@ const expanded = ref<number>(null);
                                     <span class="text-right">Remarks</span>
                                     <span class="w-15"></span>
                                 </div>
-                                <div v-for="person in focusedTrainingTrainees" :key="person.attendee_id ?? person.attendee_name" class="border-b last:border-none"
+                                <div v-for="person in focusedTrainingTrainees"
+                                    :key="person.attendee_id ?? person.attendee_name" class="border-b last:border-none"
                                     :class="expanded === person.attendee_id && 'bg-muted/20'">
-                                    <div class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 items-center px-2 gap-x-2">
+                                    <div
+                                        class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 items-center px-2 gap-x-2">
                                         <div class="min-w-0">
                                             <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                                class="justify-self-start max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
-                                            <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                                class="justify-self-start max-w-full whitespace-nowrap overflow-hidden text-ellipsis">
+                                            </MemberCard>
+                                            <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{
+                                                person.attendee_name }}</p>
                                         </div>
                                         <div class="flex justify-center">
-                                            <Tooltip :open="!focusedTrainingReport.course.hasBookwork"
+                                            <Tooltip :open="!focusedTrainingReport.course?.hasBookwork"
                                                 message="This course does not have bookwork">
-                                                <Checkbox :disabled="!focusedTrainingReport.course.hasBookwork"
+                                                <Checkbox :disabled="!focusedTrainingReport.course?.hasBookwork"
                                                     :model-value="person.passed_bookwork" class="pointer-events-none">
                                                 </Checkbox>
                                             </Tooltip>
                                         </div>
                                         <div class="flex justify-center">
-                                            <Tooltip :open="!focusedTrainingReport.course.hasQual"
+                                            <Tooltip :open="!focusedTrainingReport.course?.hasQual"
                                                 message="This course does not have a qualification">
-                                                <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
+                                                <Checkbox :disabled="!focusedTrainingReport.course?.hasQual"
                                                     :model-value="person.passed_qual" class="pointer-events-none">
                                                 </Checkbox>
                                             </Tooltip>
@@ -557,20 +615,24 @@ const expanded = ref<number>(null);
                         </div>
                     </div>
                     <!-- No Shows -->
-                    <div v-if="focusedNoShows.length != 0">
+                    <div v-if="focusedNoShows?.length != 0">
                         <div class="flex flex-col">
                             <label class="scroll-m-20 text-xl font-semibold tracking-tight">
                                 No Shows
                             </label>
 
                             <div class="mt-3 space-y-2 md:hidden">
-                                <article v-for="person in focusedNoShows" :key="person.attendee_id ?? person.attendee_name"
-                                    class="rounded-xl border bg-card p-3 shadow-sm" :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
+                                <article v-for="person in focusedNoShows"
+                                    :key="person.attendee_id ?? person.attendee_name"
+                                    class="rounded-xl border bg-card p-3 shadow-sm"
+                                    :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
                                     <div class="flex items-start justify-between gap-2">
                                         <div class="min-w-0">
                                             <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
                                                 class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis" />
-                                            <p v-else class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                            <p v-else
+                                                class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{
+                                                person.attendee_name }}</p>
                                         </div>
                                         <Button variant="ghost" size="icon" class="shrink-0" @click.stop="expanded === person.attendee_id
                                             ? expanded = null
@@ -590,11 +652,13 @@ const expanded = ref<number>(null);
                                         </div>
                                         <div class="col-span-2 rounded-lg bg-muted px-3 py-2">
                                             <p class="text-muted-foreground">Remarks</p>
-                                            <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}</p>
+                                            <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}
+                                            </p>
                                         </div>
                                     </div>
 
-                                    <div v-if="expanded === person.attendee_id" class="mt-3 rounded-lg border bg-background px-3 py-2">
+                                    <div v-if="expanded === person.attendee_id"
+                                        class="mt-3 rounded-lg border bg-background px-3 py-2">
                                         <p class="text-sm font-medium text-foreground">
                                             Full Remarks
                                         </p>
@@ -624,17 +688,20 @@ const expanded = ref<number>(null);
                                 <div v-for="person in focusedNoShows" :key="person.attendee_id ?? person.attendee_name"
                                     class="border-b last:border-none transition-colors"
                                     :class="expanded === person.attendee_id && 'bg-muted/20'">
-                                    <div class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 items-center gap-x-2">
+                                    <div
+                                        class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 items-center gap-x-2">
                                         <div class="min-w-0">
                                             <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
                                                 class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis" />
-                                            <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                            <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{
+                                                person.attendee_name }}</p>
                                         </div>
 
                                         <p class="text-center text-muted-foreground">-</p>
                                         <p class="text-center text-muted-foreground">-</p>
 
-                                        <p class="text-right px-2 truncate" :class="!person.remarks && 'text-muted-foreground'">
+                                        <p class="text-right px-2 truncate"
+                                            :class="!person.remarks && 'text-muted-foreground'">
                                             {{ person.remarks || '--' }}
                                         </p>
 
@@ -678,7 +745,8 @@ const expanded = ref<number>(null);
                 <Spinner class="size-8"></Spinner>
             </div>
         </div>
-        <div v-if="effectivePanel == sidePanelState.create" :class="isMobile ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3' : 'mt-2 w-full max-w-5xl lg:mt-0 lg:w-3/5 lg:border-l lg:pl-7'"
+        <div v-if="effectivePanel == sidePanelState.create"
+            :class="isMobile ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3' : 'mt-2 w-full max-w-5xl lg:mt-0 lg:w-3/5 lg:border-l lg:pl-7'"
             :style="isMobile ? { top: 'var(--app-header-height, 60px)' } : {}">
             <div class="flex justify-between items-center my-3">
                 <div class="flex gap-5 lg:pl-2">
@@ -692,17 +760,46 @@ const expanded = ref<number>(null);
                 </Button>
             </div>
             <div :class="isMobile ? 'mt-3 pb-8' : 'overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed'">
-                <TrainingReportForm class="w-full lg:pl-2"
-                    @submit="async (newID) => {
+                <TrainingReportForm class="w-full lg:pl-2" @submit="async (newID) => {
+                    if (isMobile) {
+                        await viewTrainingReport(newID);
+                        mobilePanel = sidePanelState.view;
+                    } else {
+                        router.push(`/trainingReport/${newID}`);
+                    }
+                    loadTrainingReports()
+                }">
+                </TrainingReportForm>
+            </div>
+        </div>
+        <div v-if="focusedTrainingReport != null && effectivePanel == sidePanelState.edit"
+            :class="isMobile ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3' : 'mt-2 w-full max-w-5xl lg:mt-0 lg:w-3/5 lg:border-l lg:pl-7'"
+            :style="isMobile ? { top: 'var(--app-header-height, 60px)' } : {}">
+            <div class="flex justify-between items-center my-3">
+                <div class="flex gap-5 lg:pl-2">
+                    <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Edit Training Report</p>
+                </div>
+                <Button v-if="isMobile" @click="mobilePanel = sidePanelState.view" class="cursor-pointer"
+                    variant="outline" size="sm">
+                    <ChevronLeft class="size-4"></ChevronLeft> Back
+                </Button>
+                <Button v-else @click="router.push(`/trainingReport/${focusedTrainingReport.id}`)"
+                    class="cursor-pointer" variant="ghost" size="icon">
+                    <X class="size-6"></X>
+                </Button>
+            </div>
+            <div :class="isMobile ? 'mt-3 pb-8' : 'overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed'">
+                <TrainingReportForm class="w-full lg:pl-2" mode="edit" :report-id="focusedTrainingReport.id"
+                    :report="focusedTrainingReport" @submit="async (id) => {
+                        await loadTrainingReports();
+                        await viewTrainingReport(id);
+
                         if (isMobile) {
-                            await viewTrainingReport(newID);
                             mobilePanel = sidePanelState.view;
                         } else {
-                            router.push(`/trainingReport/${newID}`);
+                            router.push(`/trainingReport/${id}`);
                         }
-                        loadTrainingReports()
-                    }">
-                </TrainingReportForm>
+                    }" />
             </div>
         </div>
     </div>

ui/src/router/index.ts

@@ -26,6 +26,7 @@ const router = createRouter({
 
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
+    { path: '/trainingReport/:id/edit', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/:id', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
 
     { path: '/developer', component: () => import('@/pages/DeveloperTools.vue'), meta: { requiresAuth: true, memberOnly: true, roles: ['Dev'] } },