Merge commit '0919997e0f90ec5463f63f470213acd7e39493af' into #54-Application-tweaks

shared/schemas/loaSchema.ts

@@ -0,0 +1,51 @@
+import * as z from "zod";
+import { LOAType } from "../types/loa";
+
+export const loaTypeSchema = z.object({
+    id: z.number(),
+    name: z.string(),
+    max_length_days: z.number(),
+});
+
+export const loaSchema = z.object({
+    member_id: z.number(),
+    start_date: z.date(),
+    end_date: z.date(),
+    type: loaTypeSchema,
+    reason: z.string(),
+})
+    .superRefine((data, ctx) => {
+        const { start_date, end_date, type } = data;
+
+        const today = new Date();
+        today.setHours(0, 0, 0, 0);
+
+        if (start_date < today) {
+            ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["start_date"],
+            message: "Start date cannot be in the past.",
+            });
+        }
+
+        // 1. end > start
+        if (end_date <= start_date) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["end_date"],
+                message: "End date must be after start date.",
+            });
+        }
+
+        // 2. calculate max
+        const maxEnd = new Date(start_date);
+        maxEnd.setDate(maxEnd.getDate() + type.max_length_days);
+
+        if (end_date > maxEnd) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["end_date"],
+                message: `This LOA type allows a maximum of ${type.max_length_days} days.`,
+            });
+        }
+    });

shared/types/calendar.ts

@@ -26,6 +26,7 @@ export interface CalendarSignup {
     eventID: number;
     status: CalendarAttendance;
     member_name?: string;
+    member_unit?: string;
 }    
 
 export interface CalendarEventShort {

shared/types/loa.ts

@@ -0,0 +1,24 @@
+export interface LOARequest {
+    id?: number;
+    member_id?: number;
+    filed_date?: Date;   // ISO 8601 string
+    start_date: Date;   // ISO 8601 string
+    end_date: Date;     // ISO 8601 string
+    extended_till?: Date;
+    type_id?: number;
+    reason?: string;
+    expired?: boolean;
+    closed?: boolean;
+    closed_by?: number;
+    created_by?: number;
+
+    name?: string;  //member name
+    type_name?: string;
+};
+
+export interface LOAType {
+    id: number;
+    name: string;
+    max_length_days: number;
+    extendable: boolean;
+}

shared/utils/time.ts

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