Integrated new time handling system

This commit is contained in:
2025-11-28 15:31:35 -05:00
parent f499e33fe1
commit d24a01db8c
5 changed files with 19 additions and 16 deletions

View File

@@ -76,6 +76,7 @@ eventRouter.post('/', async (req: Request, res: Response) => {
console.log(); console.log();
let data: CourseEventDetails = req.body; let data: CourseEventDetails = req.body;
data.created_by = posterID; data.created_by = posterID;
data.event_date = new Date(data.event_date);
const id = await insertCourseEvent(data); const id = await insertCourseEvent(data);
res.status(201).json(id); res.status(201).json(id);
} catch (error) { } catch (error) {

View File

@@ -1,6 +1,6 @@
import pool from "../db" import pool from "../db"
import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails, CourseEventSummary, RawAttendeeRow } from "@app/shared/types/course" import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails, CourseEventSummary, RawAttendeeRow } from "@app/shared/types/course"
import { toDateTime } from "@app/shared/utils/time";
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;"
@@ -21,8 +21,8 @@ function buildAttendee(row: RawAttendeeRow): CourseAttendee {
passed_qual: !!row.passed_qual, passed_qual: !!row.passed_qual,
attendee_id: row.attendee_id, attendee_id: row.attendee_id,
course_event_id: row.course_event_id, course_event_id: row.course_event_id,
created_at: row.created_at, created_at: new Date(row.created_at),
updated_at: row.updated_at, updated_at: new Date(row.updated_at),
remarks: row.remarks, remarks: row.remarks,
attendee_role_id: row.attendee_role_id, attendee_role_id: row.attendee_role_id,
attendee_name: row.attendee_name, attendee_name: row.attendee_name,
@@ -32,8 +32,8 @@ function buildAttendee(row: RawAttendeeRow): CourseAttendee {
name: row.role_name, name: row.role_name,
description: row.role_description, description: row.role_description,
deleted: !!row.role_deleted, deleted: !!row.role_deleted,
created_at: row.role_created_at, created_at: new Date(row.role_created_at),
updated_at: row.role_updated_at, updated_at: new Date(row.role_updated_at),
} }
: null : null
}; };
@@ -83,7 +83,7 @@ export async function insertCourseEvent(event: CourseEventDetails): Promise<numb
const con = await pool.getConnection(); const con = await pool.getConnection();
try { try {
await con.beginTransaction(); await con.beginTransaction();
const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by) VALUES (?, ?, ?, ?);", [event.course_id, event.event_date, event.remarks, event.created_by]); const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by) VALUES (?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by]);
var eventID: number = res.insertId; var eventID: number = res.insertId;
for (const attendee of event.attendees) { for (const attendee of event.attendees) {

View File

@@ -5,8 +5,8 @@ export interface Course {
category: string; category: string;
description?: string | null; description?: string | null;
image_url?: string | null; image_url?: string | null;
created_at: string; created_at: Date;
updated_at: string; updated_at: Date;
deleted?: number | boolean; deleted?: number | boolean;
prereq_id?: number | null; prereq_id?: number | null;
hasBookwork: boolean; hasBookwork: boolean;
@@ -17,12 +17,12 @@ export interface CourseEventDetails {
id: number | null; // PK id: number | null; // PK
course_id: number | null; // FK → courses.id course_id: number | null; // FK → courses.id
event_type: number | null; // FK → event_types.id event_type: number | null; // FK → event_types.id
event_date: string; // datetime (not nullable) event_date: Date; // datetime (not nullable)
guilded_event_id: number | null; guilded_event_id: number | null;
created_at: string; // datetime created_at: Date; // datetime
updated_at: string; // datetime updated_at: Date; // datetime
deleted: boolean | null; // tinyint(4), nullable deleted: boolean | null; // tinyint(4), nullable
report_url: string | null; // varchar(2048) report_url: string | null; // varchar(2048)
@@ -44,8 +44,8 @@ export interface CourseAttendee {
course_event_id: number; // PK course_event_id: number; // PK
attendee_role_id: number | null; attendee_role_id: number | null;
role: CourseAttendeeRole | null; role: CourseAttendeeRole | null;
created_at: string; // datetime → ISO string created_at: Date; // datetime → ISO string
updated_at: string; // datetime → ISO string updated_at: Date; // datetime → ISO string
remarks: string | null; remarks: string | null;
attendee_name: string | null; attendee_name: string | null;
@@ -55,8 +55,8 @@ export interface CourseAttendeeRole {
id: number; // PK, auto-increment id: number; // PK, auto-increment
name: string | null; // varchar(50), unique, nullable name: string | null; // varchar(50), unique, nullable
description: string | null; // text description: string | null; // text
created_at: string | null; // datetime (nullable) created_at: Date | null; // datetime (nullable)
updated_at: string | null; // datetime (nullable) updated_at: Date | null; // datetime (nullable)
deleted: boolean; // tinyint(4) deleted: boolean; // tinyint(4)
} }

View File

@@ -1,4 +1,5 @@
export function toDateTime(date: Date): string { export function toDateTime(date: Date): string {
console.log(date);
// This produces a CST-local time because server runs in CST // This produces a CST-local time because server runs in CST
const year = date.getFullYear(); const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, "0"); const month = (date.getMonth() + 1).toString().padStart(2, "0");

View File

@@ -61,8 +61,9 @@ function onSubmit(vals) {
try { try {
const clean: CourseEventDetails = { const clean: CourseEventDetails = {
...vals, ...vals,
event_date: toMySQLDateTime(new Date(vals.event_date)), event_date: new Date(vals.event_date),
} }
postTrainingReport(clean).then((newID) => { postTrainingReport(clean).then((newID) => {
emit("submit", newID); emit("submit", newID);
}); });