17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 22 Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

added support for short format training report and created_by field

Browse Source
This commit is contained in:
ajdj100
2025-11-16 22:37:41 -05:00
parent 4d0dea553e
commit f6dd3a77dc
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/routes/course.ts
View File

@@ -17,7 +17,7 @@ courseRouter.get('/', async (req, res) => {
eventRouter.get('/', async (req: Request, res: Response) => { eventRouter.get('/', async (req: Request, res: Response) => {
try { try {
let events: CourseEventDetails[] = await getCourseEvents(); let events = await getCourseEvents();
res.status(200).json(events); res.status(200).json(events);
} catch (error) { } catch (error) {
console.error('failed to fetch reports', error); console.error('failed to fetch reports', error);

9
api/src/services/CourseSerivce.ts
View File

@@ -1,5 +1,5 @@
import pool from "../db" import pool from "../db"
import { Course, CourseAttendee, CourseEventDetails, RawAttendeeRow } from "@app/shared/types/course" import { Course, CourseAttendee, CourseEventDetails, CourseEventSummary, RawAttendeeRow } from "@app/shared/types/course"
export async function getAllCourses(): Promise<Course[]> { export async function getAllCourses(): Promise<Course[]> {
const sql = "SELECT * FROM courses WHERE deleted = false;" const sql = "SELECT * FROM courses WHERE deleted = false;"
@@ -86,8 +86,9 @@ export async function insertCourseEvent(event: CourseEventDetails): Promise<numb
} }
} }
export async function getCourseEvents(): Promise<CourseEventDetails[]> { export async function getCourseEvents(): Promise<CourseEventSummary[]> {
const sql = "SELECT * FROM course_events;"; const sql = "SELECT E.id, E.course_id, E.event_date, E.created_by, C.name FROM course_events as E LEFT JOIN courses AS C ON E.course_id = C.id;";
let events: CourseEventDetails[] = await pool.query(sql); let events: CourseEventSummary[] = await pool.query(sql);
console.log(events);
return events; return events;
} }

12
shared/types/course.ts
View File

@@ -25,8 +25,10 @@ export interface CourseEventDetails {
deleted: boolean | null; // tinyint(4), nullable deleted: boolean | null; // tinyint(4), nullable
report_url: string | null; // varchar(2048) report_url: string | null; // varchar(2048)
remarks: string | null; // text remarks: string | null; // text
attendees: CourseAttendee[] | null; attendees: CourseAttendee[] | null;
created_by: number | null;
} }
@@ -65,4 +67,12 @@ export interface RawAttendeeRow {
role_deleted: number | null; role_deleted: number | null;
role_created_at: string | null; role_created_at: string | null;
role_updated_at: string | null; role_updated_at: string | null;
}
export interface CourseEventSummary {
event_id: number;
course_id: number;
course_name: string;
date: string;
created_by: number;
} }