Implemented systems for editing training reports.

Reviewed-on: #209

api/migrations/20260330120000-qualification-sync.js

@@ -0,0 +1,45 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260330120000-qualification-sync-up.sql');
+  return new Promise(function(resolve, reject) {
+    fs.readFile(filePath, { encoding: 'utf-8' }, function(err, data) {
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+      resolve(data);
+    });
+  }).then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260330120000-qualification-sync-down.sql');
+  return new Promise(function(resolve, reject) {
+    fs.readFile(filePath, { encoding: 'utf-8' }, function(err, data) {
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+      resolve(data);
+    });
+  }).then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  version: 1,
+};

api/migrations/sqls/20260330120000-qualification-sync-down.sql

@@ -0,0 +1,18 @@
+ALTER TABLE members_qualifications
+    DROP FOREIGN KEY fk_members_qualifications_course_id,
+    DROP FOREIGN KEY fk_members_qualifications_awarded_by,
+    DROP FOREIGN KEY fk_members_qualifications_revoked_by,
+    DROP FOREIGN KEY fk_members_qualifications_source_event,
+    DROP KEY uq_members_qualifications_member_course,
+    DROP KEY idx_members_qualifications_active,
+    DROP KEY idx_members_qualifications_source_event,
+    DROP COLUMN course_id,
+    DROP COLUMN active,
+    DROP COLUMN awarded_by_id,
+    DROP COLUMN revoked_by_id,
+    DROP COLUMN revoked_reason,
+    DROP COLUMN revoked_at,
+    DROP COLUMN source_course_event_id,
+    ADD COLUMN qualification_id INT(11) DEFAULT 0,
+    ADD KEY fk_members_qualifications_qualifications_id (qualification_id),
+    ADD CONSTRAINT fk_members_qualifications_qualifications_id FOREIGN KEY (qualification_id) REFERENCES qualifications(id) ON UPDATE CASCADE;

api/migrations/sqls/20260330120000-qualification-sync-up.sql

@@ -0,0 +1,18 @@
+ALTER TABLE members_qualifications
+    DROP FOREIGN KEY fk_members_qualifications_qualifications_id,
+    DROP KEY fk_members_qualifications_qualifications_id,
+    DROP COLUMN qualification_id,
+    ADD COLUMN course_id INT(11) NOT NULL AFTER member_id,
+    ADD COLUMN active TINYINT(1) NOT NULL DEFAULT 1,
+    ADD COLUMN awarded_by_id INT(11) DEFAULT NULL,
+    ADD COLUMN revoked_by_id INT(11) DEFAULT NULL,
+    ADD COLUMN revoked_reason TEXT DEFAULT NULL,
+    ADD COLUMN revoked_at DATETIME DEFAULT NULL,
+    ADD COLUMN source_course_event_id INT(11) DEFAULT NULL,
+    ADD UNIQUE KEY uq_members_qualifications_member_course (member_id, course_id),
+    ADD KEY idx_members_qualifications_active (member_id, course_id, active),
+    ADD KEY idx_members_qualifications_source_event (source_course_event_id),
+    ADD CONSTRAINT fk_members_qualifications_course_id FOREIGN KEY (course_id) REFERENCES courses(id) ON UPDATE CASCADE,
+    ADD CONSTRAINT fk_members_qualifications_awarded_by FOREIGN KEY (awarded_by_id) REFERENCES members(id) ON UPDATE CASCADE,
+    ADD CONSTRAINT fk_members_qualifications_revoked_by FOREIGN KEY (revoked_by_id) REFERENCES members(id) ON UPDATE CASCADE,
+    ADD CONSTRAINT fk_members_qualifications_source_event FOREIGN KEY (source_course_event_id) REFERENCES course_events(id) ON UPDATE CASCADE;

api/package.json

@@ -11,7 +11,9 @@
     "dev": "tsc && tsc-alias && node ./built/api/src/index.js",
     "prod": "tsc && tsc-alias && node ./built/api/src/index.js",
     "build": "tsc && tsc-alias",
-    "seed": "node ./scripts/seed.js"
+    "seed": "node ./scripts/seed.js",
+    "backfill:qualifications:dry": "node ./scripts/backfillQualifications.js --dry-run",
+    "backfill:qualifications": "node ./scripts/backfillQualifications.js"
   },
   "dependencies": {
     "@rsol/hashmig": "^1.0.7",

api/scripts/backfillQualifications.js

@@ -0,0 +1,237 @@
+const dotenv = require("dotenv");
+const path = require("path");
+const mariadb = require("mariadb");
+
+dotenv.config({ path: path.resolve(process.cwd(), ".env") });
+
+const {
+    DB_HOST,
+    DB_PORT,
+    DB_USERNAME,
+    DB_PASSWORD,
+    DB_DATABASE,
+} = process.env;
+
+function parseArgs(argv) {
+    const args = {
+        dryRun: false,
+        actorId: null,
+        courseId: null,
+        memberId: null,
+    };
+
+    for (let i = 2; i < argv.length; i++) {
+        const token = argv[i];
+        if (token === "--dry-run") {
+            args.dryRun = true;
+            continue;
+        }
+
+        if (token.startsWith("--actor=")) {
+            args.actorId = Number(token.split("=")[1]);
+            continue;
+        }
+
+        if (token.startsWith("--course=")) {
+            args.courseId = Number(token.split("=")[1]);
+            continue;
+        }
+
+        if (token.startsWith("--member=")) {
+            args.memberId = Number(token.split("=")[1]);
+            continue;
+        }
+    }
+
+    if (args.actorId !== null && Number.isNaN(args.actorId)) {
+        throw new Error("--actor must be a number");
+    }
+    if (args.courseId !== null && Number.isNaN(args.courseId)) {
+        throw new Error("--course must be a number");
+    }
+    if (args.memberId !== null && Number.isNaN(args.memberId)) {
+        throw new Error("--member must be a number");
+    }
+
+    return args;
+}
+
+function buildScopeClause(args, tableAlias = "") {
+    const prefix = tableAlias ? `${tableAlias}.` : "";
+    const clauses = [];
+    const params = [];
+
+    if (args.courseId !== null) {
+        clauses.push(`${prefix}course_id = ?`);
+        params.push(args.courseId);
+    }
+
+    if (args.memberId !== null) {
+        clauses.push(`${prefix}member_id = ?`);
+        params.push(args.memberId);
+    }
+
+    if (!clauses.length) {
+        return { sql: "", params };
+    }
+
+    return {
+        sql: ` AND ${clauses.join(" AND ")}`,
+        params,
+    };
+}
+
+function key(memberId, courseId) {
+    return `${memberId}:${courseId}`;
+}
+
+(async () => {
+    const args = parseArgs(process.argv);
+
+    const conn = await mariadb.createConnection({
+        host: DB_HOST,
+        port: Number(DB_PORT),
+        user: DB_USERNAME,
+        password: DB_PASSWORD,
+        database: DB_DATABASE,
+        multipleStatements: false,
+    });
+
+    try {
+        const schemaCheck = await conn.query("SHOW COLUMNS FROM members_qualifications LIKE 'course_id';");
+        if (!schemaCheck.length) {
+            throw new Error("members_qualifications.course_id does not exist. Run qualification migration first.");
+        }
+
+        const scoped = buildScopeClause(args);
+
+        const passRows = await conn.query(
+            `SELECT
+                ca.attendee_id AS member_id,
+                e.course_id,
+                e.id AS course_event_id,
+                e.event_date
+             FROM course_events e
+             INNER JOIN course_attendees ca ON ca.course_event_id = e.id
+             WHERE ca.attendee_role_id = 2
+               AND (e.deleted IS NULL OR e.deleted = 0)
+               AND (
+                    (e.hasBookwork = 1 AND e.hasQual = 1 AND ca.passed_bookwork = 1 AND ca.passed_qual = 1)
+                    OR (e.hasBookwork = 1 AND IFNULL(e.hasQual, 0) = 0 AND ca.passed_bookwork = 1)
+                    OR (IFNULL(e.hasBookwork, 0) = 0 AND e.hasQual = 1 AND ca.passed_qual = 1)
+               )
+               ${scoped.sql}
+             ORDER BY ca.attendee_id ASC, e.course_id ASC, e.event_date DESC, e.id DESC;`,
+            scoped.params
+        );
+
+        const latestByPair = new Map();
+        for (const row of passRows) {
+            const mapKey = key(Number(row.member_id), Number(row.course_id));
+            if (!latestByPair.has(mapKey)) {
+                latestByPair.set(mapKey, {
+                    memberId: Number(row.member_id),
+                    courseId: Number(row.course_id),
+                    courseEventId: Number(row.course_event_id),
+                    eventDate: row.event_date,
+                });
+            }
+        }
+
+        const currentRows = await conn.query(
+            `SELECT member_id, course_id
+             FROM members_qualifications
+             WHERE active = 1
+               AND (deleted IS NULL OR deleted = 0)
+               ${scoped.sql};`,
+            scoped.params
+        );
+
+        const currentKeys = new Set(currentRows.map((r) => key(Number(r.member_id), Number(r.course_id))));
+        const nextKeys = new Set(Array.from(latestByPair.keys()));
+
+        let wouldDeactivate = 0;
+        currentKeys.forEach((k) => {
+            if (!nextKeys.has(k)) {
+                wouldDeactivate++;
+            }
+        });
+
+        const summary = {
+            dryRun: args.dryRun,
+            scope: {
+                memberId: args.memberId,
+                courseId: args.courseId,
+            },
+            actorId: args.actorId,
+            historicalPassingRows: passRows.length,
+            activePairsComputed: latestByPair.size,
+            currentlyActivePairs: currentRows.length,
+            wouldDeactivate,
+        };
+
+        if (args.dryRun) {
+            console.log("Qualification backfill dry run summary:");
+            console.log(JSON.stringify(summary, null, 2));
+            return;
+        }
+
+        await conn.beginTransaction();
+
+        const deactivateReason = "Backfill recompute from historical training reports";
+
+        const deactivateResult = await conn.query(
+            `UPDATE members_qualifications mq
+             SET mq.active = 0,
+                 mq.revoked_by_id = ?,
+                 mq.revoked_reason = ?,
+                 mq.revoked_at = UTC_TIMESTAMP(),
+                 mq.updated_at = current_timestamp()
+             WHERE mq.active = 1
+               AND (mq.deleted IS NULL OR mq.deleted = 0)
+               ${buildScopeClause(args, "mq").sql};`,
+            [args.actorId, deactivateReason].concat(buildScopeClause(args, "mq").params)
+        );
+
+        let upserts = 0;
+        for (const item of latestByPair.values()) {
+            await conn.query(
+                `INSERT INTO members_qualifications
+                    (member_id, course_id, event_date, active, awarded_by_id, revoked_by_id, revoked_reason, revoked_at, source_course_event_id, deleted)
+                 VALUES (?, ?, ?, 1, ?, NULL, NULL, NULL, ?, 0)
+                 ON DUPLICATE KEY UPDATE
+                    event_date = VALUES(event_date),
+                    active = 1,
+                    awarded_by_id = VALUES(awarded_by_id),
+                    revoked_by_id = NULL,
+                    revoked_reason = NULL,
+                    revoked_at = NULL,
+                    source_course_event_id = VALUES(source_course_event_id),
+                    deleted = 0,
+                    updated_at = current_timestamp();`,
+                [item.memberId, item.courseId, item.eventDate, args.actorId, item.courseEventId]
+            );
+            upserts++;
+        }
+
+        await conn.commit();
+
+        console.log("Qualification backfill complete:");
+        console.log(JSON.stringify({
+            ...summary,
+            deactivatedRows: deactivateResult.affectedRows,
+            upserts,
+        }, null, 2));
+    } catch (error) {
+        try {
+            await conn.rollback();
+        } catch (_ignored) {
+            // No-op rollback failure.
+        }
+        console.error("Qualification backfill failed:");
+        console.error(error);
+        process.exitCode = 1;
+    } finally {
+        await conn.end();
+    }
+})();

api/src/routes/course.ts

@@ -1,10 +1,83 @@
 import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
-import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } 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 } 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();
@@ -68,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);
@@ -125,9 +203,10 @@ er.post('/', async (req: Request, res: Response) => {
         data.created_by = posterID;
         data.event_date = new Date(data.event_date);
         const id = await insertCourseEvent(data);
+        const syncOutcome = await syncQualificationsForCourseEvent(id, posterID);
 
-        audit.course('report_created', { actorId: posterID, targetId: id });
-        logger.info('app', 'Training report posted', { user: posterID, report: id })
+        audit.course('report_created', { actorId: posterID, targetId: id }, { qualificationSync: syncOutcome });
+        logger.info('app', 'Training report posted', { user: posterID, report: id, qualificationSync: syncOutcome })
         res.status(201).json(id);
     } catch (error) {
         logger.error(
@@ -143,5 +222,52 @@ er.post('/', 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 {
+        const validation = validateTrainingReportPayload(req.body);
+        if (validation.valid === false) {
+            return res.status(400).json({
+                message: 'Invalid training report payload',
+                errors: validation.message,
+            });
+        }
+
+        const parsed = validation.value;
+        let data: CourseEventDetails = {
+            ...req.body,
+            ...parsed,
+            id: reportId,
+            event_date: parsed.event_date,
+        };
+
+        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',
+            {
+                user: editorID,
+                report: reportId,
+                error: error instanceof Error ? error.message : String(error),
+                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)
+    }
+})
+
 export const courseRouter = cr;
 export const eventRouter = er;

api/src/routes/members.ts

@@ -16,6 +16,7 @@ import { memberCache } from './auth';
 import { cancelLatestRank } from '../services/db/rankService';
 import { cancelLatestUnit } from '../services/db/unitService';
 import { audit } from '../services/logging/auditLog';
+import { getMemberActiveQualifications } from '../services/db/qualificationService';
 
 //get all users
 router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
@@ -211,6 +212,27 @@ router.post('/full/bulk', async (req: Request, res: Response) => {
     }
 })
 
+router.get('/:id/qualifications', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    const memberId = Number(req.params.id);
+    if (Number.isNaN(memberId) || memberId <= 0) {
+        return res.status(400).json({ error: 'Invalid member id' });
+    }
+
+    try {
+        const qualifications = await getMemberActiveQualifications(memberId);
+        return res.status(200).json(qualifications);
+    } catch (error) {
+        logger.error('app', 'Failed to fetch member qualifications', {
+            memberId,
+            caller: req.user?.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        });
+
+        return res.status(500).json({ error: 'Failed to fetch member qualifications' });
+    }
+})
+
 router.post('/cache/user/bust', [requireLogin, requireMemberState(MemberState.Member), requireRole('dev')], async (req: Request, res: Response) => {
     try {
         const clearedEntries = memberCache.Clear();

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,
@@ -161,3 +269,264 @@ export async function getCourseEventRoles(): Promise<CourseAttendeeRole[]> {
     const roles: CourseAttendeeRole[] = await pool.query(sql);
     return roles;
 }
+
+export async function editCourseEventReport(eventId: number, event: CourseEventDetails, actorId: number, actorRoleNames: string[]): Promise<EventEditResult> {
+    let con: any = null;
+
+    try {
+        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 = ?,
+                 event_date = ?,
+                 remarks = ?,
+                 hasBookwork = ?,
+                 hasQual = ?
+             WHERE id = ?;`,
+            [event.course_id, toDateTime(incomingEventDate), incomingRemarks, !!selectedCourse.hasBookwork, !!selectedCourse.hasQual, eventId]
+        );
+
+        for (const attendee of added) {
+            await con.query(
+                `INSERT INTO course_attendees (
+                    attendee_id,
+                    course_event_id,
+                    attendee_role_id,
+                    passed_bookwork,
+                    passed_qual,
+                    remarks
+                )
+                VALUES (?, ?, ?, ?, ?, ?);`,
+                [
+                    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;
+    } finally {
+        if (con) await con.release();
+    }
+}

api/src/services/db/qualificationService.ts

@@ -0,0 +1,283 @@
+import pool from "../../db";
+import { CourseAttendee } from "@app/shared/types/course";
+import { MemberQualificationView } from "@app/shared/types/qualification";
+
+interface EventQualificationContext {
+    courseId: number;
+    eventDate: Date;
+    hasBookwork: boolean;
+    hasQual: boolean;
+    attendees: CourseAttendee[];
+}
+
+interface SyncOutcome {
+    courseId: number | null;
+    awarded: number;
+    deactivated: number;
+    impactedMembers: number;
+}
+
+async function getEventQualificationContext(con: any, courseEventId: number): Promise<EventQualificationContext | null> {
+    const eventRows = await con.query(
+        `SELECT e.event_date, e.hasBookwork, e.hasQual, c.id AS course_id
+         FROM course_events e
+         INNER JOIN courses c ON c.id = e.course_id
+         WHERE e.id = ?;`,
+        [courseEventId]
+    );
+
+    if (!eventRows.length) {
+        return null;
+    }
+
+    const attendeeRows = await con.query(
+        `SELECT
+            ca.passed_bookwork,
+            ca.passed_qual,
+            ca.attendee_id,
+            ca.course_event_id,
+            ca.attendee_role_id,
+            ca.created_at,
+            ca.updated_at,
+            ca.remarks,
+            mem.name AS attendee_name,
+            ar.id AS role_id,
+            ar.name AS role_name,
+            ar.description AS role_description,
+            ar.deleted AS role_deleted,
+            ar.created_at AS role_created_at,
+            ar.updated_at AS role_updated_at
+        FROM course_attendees ca
+        LEFT JOIN members mem ON ca.attendee_id = mem.id
+        LEFT JOIN course_attendee_roles ar ON ca.attendee_role_id = ar.id
+        WHERE ca.course_event_id = ?;`,
+        [courseEventId]
+    );
+
+    const attendees: CourseAttendee[] = attendeeRows.map((row: any) => ({
+        passed_bookwork: !!row.passed_bookwork,
+        passed_qual: !!row.passed_qual,
+        attendee_id: row.attendee_id,
+        course_event_id: row.course_event_id,
+        attendee_role_id: row.attendee_role_id,
+        created_at: new Date(row.created_at),
+        updated_at: new Date(row.updated_at),
+        remarks: row.remarks,
+        attendee_name: row.attendee_name,
+        role: row.role_id
+            ? {
+                id: row.role_id,
+                name: row.role_name,
+                description: row.role_description,
+                deleted: !!row.role_deleted,
+                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,
+    }));
+
+    return {
+        courseId: Number(eventRows[0].course_id),
+        eventDate: new Date(eventRows[0].event_date),
+        hasBookwork: !!eventRows[0].hasBookwork,
+        hasQual: !!eventRows[0].hasQual,
+        attendees,
+    };
+}
+
+function attendeePassed(attendee: CourseAttendee, hasBookwork: boolean, hasQual: boolean): boolean {
+    if (attendee.attendee_role_id !== 2) {
+        return false;
+    }
+
+    if (hasBookwork && hasQual) {
+        return attendee.passed_bookwork && attendee.passed_qual;
+    }
+
+    if (hasBookwork && !hasQual) {
+        return attendee.passed_bookwork;
+    }
+
+    if (!hasBookwork && hasQual) {
+        return attendee.passed_qual;
+    }
+
+    return false;
+}
+
+async function getLatestPassingCourseEvent(con: any, memberId: number, courseId: number): Promise<{ course_event_id: number, event_date: Date } | null> {
+    const rows = await con.query(
+        `SELECT e.id AS course_event_id, e.event_date
+         FROM course_events e
+         INNER JOIN course_attendees ca ON ca.course_event_id = e.id
+         WHERE e.course_id = ?
+           AND ca.attendee_id = ?
+           AND ca.attendee_role_id = 2
+           AND (e.deleted IS NULL OR e.deleted = 0)
+           AND (
+                (e.hasBookwork = 1 AND e.hasQual = 1 AND ca.passed_bookwork = 1 AND ca.passed_qual = 1)
+                OR (e.hasBookwork = 1 AND IFNULL(e.hasQual, 0) = 0 AND ca.passed_bookwork = 1)
+                OR (IFNULL(e.hasBookwork, 0) = 0 AND e.hasQual = 1 AND ca.passed_qual = 1)
+           )
+         ORDER BY e.event_date DESC, e.id DESC
+         LIMIT 1;`,
+        [courseId, memberId]
+    );
+
+    if (!rows.length) {
+        return null;
+    }
+
+    return {
+        course_event_id: Number(rows[0].course_event_id),
+        event_date: new Date(rows[0].event_date),
+    };
+}
+
+export async function syncQualificationsForCourseEvent(courseEventId: number, actorId: number, existingConnection: any | null = null): Promise<SyncOutcome> {
+    let con = existingConnection;
+    let ownConnection = false;
+
+    if (!con) {
+        con = await pool.getConnection();
+        ownConnection = true;
+    }
+
+    try {
+        if (ownConnection) {
+            await con.beginTransaction();
+        }
+
+        const context = await getEventQualificationContext(con, courseEventId);
+        if (!context) {
+            if (ownConnection) {
+                await con.commit();
+            }
+            return { courseId: null, awarded: 0, deactivated: 0, impactedMembers: 0 };
+        }
+
+        if (!context.hasBookwork && !context.hasQual) {
+            if (ownConnection) {
+                await con.commit();
+            }
+            return { courseId: context.courseId, awarded: 0, deactivated: 0, impactedMembers: 0 };
+        }
+
+        const expectedMembers = new Set<number>();
+        for (const attendee of context.attendees) {
+            if (attendeePassed(attendee, context.hasBookwork, context.hasQual)) {
+                expectedMembers.add(attendee.attendee_id);
+            }
+        }
+
+        const existingAwardedByThisEvent = await con.query(
+            `SELECT member_id
+             FROM members_qualifications
+             WHERE course_id = ?
+               AND source_course_event_id = ?
+               AND active = 1
+               AND (deleted IS NULL OR deleted = 0);`,
+            [context.courseId, courseEventId]
+        );
+
+        const existingMembers = new Set<number>(existingAwardedByThisEvent.map((row: any) => Number(row.member_id)));
+
+        const expectedMemberList = Array.from(expectedMembers);
+        const impactedMembers = new Set<number>(expectedMemberList.concat(Array.from(existingMembers)));
+        const impactedList = Array.from(impactedMembers);
+
+        let awarded = 0;
+        let deactivated = 0;
+
+        for (let i = 0; i < impactedList.length; i++) {
+            const memberId = impactedList[i];
+            const latestPass = await getLatestPassingCourseEvent(con, memberId, context.courseId);
+
+            if (latestPass) {
+                await con.query(
+                    `INSERT INTO members_qualifications
+                        (member_id, course_id, event_date, active, awarded_by_id, revoked_by_id, revoked_reason, revoked_at, source_course_event_id, deleted)
+                     VALUES (?, ?, ?, 1, ?, NULL, NULL, NULL, ?, 0)
+                     ON DUPLICATE KEY UPDATE
+                        event_date = VALUES(event_date),
+                        active = 1,
+                        awarded_by_id = VALUES(awarded_by_id),
+                        revoked_by_id = NULL,
+                        revoked_reason = NULL,
+                        revoked_at = NULL,
+                        source_course_event_id = VALUES(source_course_event_id),
+                        deleted = 0,
+                        updated_at = current_timestamp();`,
+                    [memberId, context.courseId, latestPass.event_date, actorId, latestPass.course_event_id]
+                );
+                awarded++;
+            } else {
+                const result = await con.query(
+                    `UPDATE members_qualifications
+                     SET active = 0,
+                         revoked_by_id = ?,
+                         revoked_reason = ?,
+                         revoked_at = UTC_TIMESTAMP(),
+                         updated_at = current_timestamp()
+                     WHERE member_id = ?
+                       AND course_id = ?
+                       AND active = 1;`,
+                    [actorId, 'No passing record remains for this course after report reconciliation', memberId, context.courseId]
+                );
+
+                if (result.affectedRows > 0) {
+                    deactivated++;
+                }
+            }
+        }
+
+        if (ownConnection) {
+            await con.commit();
+        }
+
+        return {
+            courseId: context.courseId,
+            awarded,
+            deactivated,
+            impactedMembers: impactedMembers.size,
+        };
+    } catch (error) {
+        if (ownConnection) {
+            await con.rollback();
+        }
+        throw error;
+    } finally {
+        if (ownConnection && con) {
+            await con.release();
+        }
+    }
+}
+
+export async function getMemberActiveQualifications(memberId: number): Promise<MemberQualificationView[]> {
+    const rows = await pool.query(
+        `SELECT
+            mq.course_id,
+            c.name AS course_name,
+            c.short_name AS course_short_name,
+            mq.event_date AS awarded_on,
+            mq.source_course_event_id,
+            mq.active
+        FROM members_qualifications mq
+        INNER JOIN courses c ON c.id = mq.course_id
+        WHERE mq.member_id = ?
+          AND mq.active = 1
+          AND (mq.deleted IS NULL OR mq.deleted = 0)
+          AND (c.deleted IS NULL OR c.deleted = 0)
+        ORDER BY mq.event_date DESC, c.name ASC;`,
+        [memberId]
+    );
+
+    return rows.map((row: any) => ({
+        course_id: row.course_id,
+        course_name: row.course_name,
+        course_short_name: row.course_short_name,
+        awarded_on: row.awarded_on ? new Date(row.awarded_on) : null,
+        active: !!row.active,
+        source_course_event_id: row.source_course_event_id,
+    }));
+}

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);
     }
 }
 

shared/types/qualification.ts

@@ -0,0 +1,23 @@
+export interface MemberQualification {
+  id: number;
+  member_id: number;
+  course_id: number;
+  event_date: Date | null;
+  active: boolean;
+  awarded_by_id: number | null;
+  revoked_by_id: number | null;
+  revoked_reason: string | null;
+  revoked_at: Date | null;
+  source_course_event_id: number | null;
+  created_at: Date;
+  updated_at: Date;
+}
+
+export interface MemberQualificationView {
+  course_id: number;
+  course_name: string;
+  course_short_name: string;
+  awarded_on: Date | null;
+  active: boolean;
+  source_course_event_id: number | null;
+}

ui/src/api/member.ts

@@ -1,5 +1,6 @@
 import { Discharge } from "@shared/schemas/dischargeSchema";
 import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers, MemberState, UserCacheBustResult } from "@shared/types/member";
+import { MemberQualificationView } from "@shared/types/qualification";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -117,6 +118,18 @@ export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]
     return response.json();
 }
 
+export async function getMemberQualifications(memberID: number): Promise<MemberQualificationView[]> {
+    const response = await fetch(`${addr}/members/${memberID}/qualifications`, {
+        credentials: 'include',
+    });
+
+    if (!response.ok) {
+        throw new Error("Failed to fetch member qualifications");
+    }
+
+    return response.json();
+}
+
 /**
  * Requests for the given member to be discharged
  * @param data discharge packet

ui/src/api/trainingReport.ts

@@ -91,3 +91,19 @@ export async function postTrainingReport(report: CourseEventDetails) {
 
     return res.json(); // expected to return the inserted report or new ID
 }
+
+export async function putTrainingReport(reportId: number, report: CourseEventDetails): Promise<void> {
+    const res = await fetch(`${addr}/courseEvent/${reportId}`, {
+        method: "PUT",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(report),
+        credentials: 'include',
+    });
+
+    if (!res.ok) {
+        const errorText = await res.text();
+        throw new Error(`Failed to update training report: ${res.status} ${errorText}`);
+    }
+}

ui/src/components/members/TransferMember.vue

@@ -53,6 +53,7 @@ const reasonOptions = [
     { label: 'Leadership Vote', value: 'leadership_vote' },
     { label: 'Appointment', value: 'appointment' },
     { label: 'Step Down', value: 'step_down' },
+    { label: 'Completed Basic', value: 'completed_basic' },
     { label: 'Custom', value: 'custom' },
 ]
 

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

@@ -34,16 +34,19 @@ import {
 } 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 route = useRoute();
 const router = useRouter();
+const user = useUserStore();
 
 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;
@@ -110,6 +113,17 @@ async function openTrainingReport(id: number) {
     router.push(`/trainingReport/${id}`);
 }
 
+async function openEditPanel() {
+    if (!focusedTrainingReport.value) return;
+
+    if (isMobile.value) {
+        mobilePanel.value = sidePanelState.edit;
+        return;
+    }
+
+    router.push(`/trainingReport/${focusedTrainingReport.value.id}/edit`);
+}
+
 function openCreatePanel() {
     if (isMobile.value) {
         mobilePanel.value = sidePanelState.create;
@@ -132,6 +146,17 @@ async function closePanel() {
     await closeTrainingReport();
 }
 
+const canEditFocusedReport = computed<boolean>(() => {
+    const report = focusedTrainingReport.value;
+    if (!report) return false;
+
+    const actorId = user.user?.member?.member_id;
+    const isAuthor = !!actorId && report.created_by === actorId;
+    const isAdmin = user.hasRole('17th Administrator');
+
+    return isAuthor || isAdmin;
+});
+
 const sortMode = ref<string>("descending");
 const searchString = ref<string>("");
 let debounceTimer: ReturnType<typeof setTimeout> | null = null;
@@ -328,6 +353,9 @@ 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="outline" size="sm">
+                        Edit
+                    </Button>
                     <Button v-if="isMobile" @click="closePanel" class="cursor-pointer" variant="outline" size="sm">
                         <ChevronLeft class="size-4"></ChevronLeft> Back
                     </Button>
@@ -705,5 +733,33 @@ const expanded = ref<number>(null);
                 </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) {
+                            mobilePanel = sidePanelState.view;
+                        } else {
+                            router.push(`/trainingReport/${id}`);
+                        }
+                    }" />
+            </div>
+        </div>
     </div>
 </template>

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'] } },