From 137a68c867c58560e65717502d71c48d46c6be04 Mon Sep 17 00:00:00 2001
From: chark1es <charles15851@gmail.com>
Date: Tue, 8 Apr 2025 21:43:06 -0700
Subject: [PATCH] Add event type

---
 .../dashboard/EventsSection/EventCheckIn.tsx  |  1 +
 .../dashboard/EventsSection/EventLoad.tsx     |  5 +++
 .../Officer_EventManagement/EventEditor.tsx   | 44 ++++++++++++++++---
 src/schemas/pocketbase/schema.ts              |  1 +
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/components/dashboard/EventsSection/EventCheckIn.tsx b/src/components/dashboard/EventsSection/EventCheckIn.tsx
index ef8fd79..d690657 100644
--- a/src/components/dashboard/EventsSection/EventCheckIn.tsx
+++ b/src/components/dashboard/EventsSection/EventCheckIn.tsx
@@ -12,6 +12,7 @@ import type { Event, EventAttendee, LimitedUser } from "../../../schemas/pocketb
 // Extended Event interface with additional properties needed for this component
 interface ExtendedEvent extends Event {
     description?: string; // This component uses 'description' but schema has 'event_description'
+    event_type: string; // Add event_type field from schema
 }
 
 // Note: Date conversion is now handled automatically by the Get and Update classes.
diff --git a/src/components/dashboard/EventsSection/EventLoad.tsx b/src/components/dashboard/EventsSection/EventLoad.tsx
index 3698a90..8d3c143 100644
--- a/src/components/dashboard/EventsSection/EventLoad.tsx
+++ b/src/components/dashboard/EventsSection/EventLoad.tsx
@@ -10,6 +10,7 @@ import type { Event, AttendeeEntry, EventAttendee } from "../../../schemas/pocke
 // Extended Event interface with additional properties needed for this component
 interface ExtendedEvent extends Event {
     description?: string; // This component uses 'description' but schema has 'event_description'
+    event_type: string; // Add event_type field from schema
 }
 
 declare global {
@@ -277,6 +278,10 @@ const EventLoad = () => {
                                 <Icon icon="heroicons:map-pin" className="h-3.5 w-3.5 text-primary" />
                                 <span className="line-clamp-1">{event.location || "No location specified"}</span>
                             </div>
+                            <div className="flex items-center gap-2">
+                                <Icon icon="heroicons:tag" className="h-3.5 w-3.5 text-primary" />
+                                <span className="line-clamp-1 capitalize">{event.event_type || "Other"}</span>
+                            </div>
                         </div>
 
                         {/* Action Buttons */}
diff --git a/src/components/dashboard/Officer_EventManagement/EventEditor.tsx b/src/components/dashboard/Officer_EventManagement/EventEditor.tsx
index b7a8778..250a2ec 100644
--- a/src/components/dashboard/Officer_EventManagement/EventEditor.tsx
+++ b/src/components/dashboard/Officer_EventManagement/EventEditor.tsx
@@ -133,6 +133,28 @@ const EventForm = memo(({
                         />
                     </div>
 
+                    {/* Event Type */}
+                    <div className="form-control">
+                        <label className="label">
+                            <span className="label-text">Event Type</span>
+                            <span className="label-text-alt text-error">*</span>
+                        </label>
+                        <select
+                            name="editEventType"
+                            className="select select-bordered"
+                            value={event?.event_type || "other"}
+                            onChange={(e) => handleChange('event_type', e.target.value)}
+                            required
+                        >
+                            <option value="social">Social</option>
+                            <option value="technical">Technical</option>
+                            <option value="outreach">Outreach</option>
+                            <option value="professional">Professional</option>
+                            <option value="workshop">Projects</option>
+                            <option value="other">Other</option>
+                        </select>
+                    </div>
+
                     {/* Points to Reward */}
                     <div className="form-control">
                         <label className="label">
@@ -435,6 +457,7 @@ interface EventChanges {
     end_date?: string;
     published?: boolean;
     has_food?: boolean;
+    event_type?: string;
 }
 
 interface FileChanges {
@@ -521,7 +544,8 @@ class ChangeTracker {
             'start_date',
             'end_date',
             'published',
-            'has_food'
+            'has_food',
+            'event_type'
         ];
 
         for (const field of fields) {
@@ -588,7 +612,8 @@ export default function EventEditor({ onEventSaved }: EventEditorProps) {
         start_date: "",
         end_date: "",
         published: false,
-        has_food: false
+        has_food: false,
+        event_type: "other"
     });
 
     const [previewUrl, setPreviewUrl] = useState("");
@@ -681,7 +706,8 @@ export default function EventEditor({ onEventSaved }: EventEditorProps) {
                     start_date: eventData.start_date || '',
                     end_date: eventData.end_date || '',
                     published: eventData.published || false,
-                    has_food: eventData.has_food || false
+                    has_food: eventData.has_food || false,
+                    event_type: eventData.event_type || 'other'
                 });
 
                 // Set up realtime subscription for this event
@@ -727,7 +753,8 @@ export default function EventEditor({ onEventSaved }: EventEditorProps) {
                     start_date: Get.formatLocalDate(now, false),
                     end_date: Get.formatLocalDate(oneHourLater, false),
                     published: false,
-                    has_food: false
+                    has_food: false,
+                    event_type: "other"
                 });
             }
             setSelectedFiles(new Map());
@@ -800,7 +827,8 @@ export default function EventEditor({ onEventSaved }: EventEditorProps) {
             start_date: "",
             end_date: "",
             published: false,
-            has_food: false
+            has_food: false,
+            event_type: "other"
         });
         setSelectedFiles(new Map());
         setFilesToDelete(new Set());
@@ -839,7 +867,8 @@ export default function EventEditor({ onEventSaved }: EventEditorProps) {
             start_date: "",
             end_date: "",
             published: false,
-            has_food: false
+            has_food: false,
+            event_type: "other"
         });
         setSelectedFiles(new Map());
         setFilesToDelete(new Set());
@@ -889,7 +918,8 @@ export default function EventEditor({ onEventSaved }: EventEditorProps) {
                 start_date: formData.get("editEventStartDate") as string,
                 end_date: formData.get("editEventEndDate") as string,
                 published: formData.get("editEventPublished") === "on",
-                has_food: formData.get("editEventHasFood") === "on"
+                has_food: formData.get("editEventHasFood") === "on",
+                event_type: formData.get("editEventType") as string || "other"
             };
 
             // Log the update attempt
diff --git a/src/schemas/pocketbase/schema.ts b/src/schemas/pocketbase/schema.ts
index fb8daa0..22b142e 100644
--- a/src/schemas/pocketbase/schema.ts
+++ b/src/schemas/pocketbase/schema.ts
@@ -68,6 +68,7 @@ export interface Event extends BaseRecord {
   start_date: string;
   end_date: string;
   published: boolean;
+  event_type: string; // social, technical, outreach, professional, projects, other
   has_food: boolean;
 }