From bbb5d260bb8b9b46929e612d24a2570e054094cf Mon Sep 17 00:00:00 2001
From: Harini312821 <harini280905@gmail.com>
Date: Fri, 2 Aug 2024 10:41:31 +0800
Subject: [PATCH] edit event

---
 client/src/pages/EditEventsPage.tsx | 14 +++----
 client/src/pages/EventsPage.tsx     |  7 +++-
 server/routes/events.js             | 62 +++++++++++++++++++++++++++--
 3 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/client/src/pages/EditEventsPage.tsx b/client/src/pages/EditEventsPage.tsx
index f65bd9c..7382be3 100644
--- a/client/src/pages/EditEventsPage.tsx
+++ b/client/src/pages/EditEventsPage.tsx
@@ -54,7 +54,10 @@ const EditEventsPage = () => {
     const fetchEvent = async () => {
       try {
         const response = await axios.get(`${config.serverAddress}/events/${id}`);
-        setInitialValues(response.data);
+        // Convert the date to the correct format for the input field
+        const event = response.data;
+        event.date = new Date(event.date).toISOString().split('T')[0];
+        setInitialValues(event);
       } catch (error) {
         console.error("Failed to fetch event data:", error);
       }
@@ -157,13 +160,6 @@ const EditEventsPage = () => {
                 placeholder="Enter slots available"
                 labelPlacement="inside"
               />
-              <NextUIFormikInput
-                label="Image URL"
-                name="imageUrl"
-                type="text"
-                placeholder="Enter image URL"
-                labelPlacement="inside"
-              />
               <div className="flex flex-row-reverse border">
                 <Button
                   type="submit"
@@ -181,4 +177,4 @@ const EditEventsPage = () => {
   );
 };
 
-export default EditEventsPage;
\ No newline at end of file
+export default EditEventsPage;
diff --git a/client/src/pages/EventsPage.tsx b/client/src/pages/EventsPage.tsx
index 1607292..25114d2 100644
--- a/client/src/pages/EventsPage.tsx
+++ b/client/src/pages/EventsPage.tsx
@@ -77,7 +77,12 @@ const EventsPage: React.FC = () => {
       const matchTownCouncil = selectedTownCouncil
         ? event.location === selectedTownCouncil
         : true;
-      const matchTime = selectedTime ? event.time === selectedTime : true;
+      const matchTime = selectedTime 
+      ? event.time.toLowerCase().trim() === selectedTime.toLowerCase().trim() 
+      : true;
+
+      console.log('Event Time:', event.time);
+      console.log(`Filtering: ${event.title} | Category: ${matchCategory} | Town Council: ${matchTownCouncil} | Time: ${matchTime}`);
 
       return matchCategory && matchTownCouncil && matchTime;
     });
diff --git a/server/routes/events.js b/server/routes/events.js
index 23e4b69..69a857f 100644
--- a/server/routes/events.js
+++ b/server/routes/events.js
@@ -9,6 +9,55 @@ const sharp = require("sharp");
 
 const upload = multer({ storage: multer.memoryStorage() });
 
+router.get("/", async (req, res) => {
+    try {
+        // Extract filter criteria from query parameters
+        const { category, townCouncil, time } = req.query;
+
+        // Log incoming parameters
+        console.log("Filter Parameters:", { category, townCouncil, time });
+
+        // Map time to category
+        const timeToCategory = (time) => {
+            if (!time) return null;
+            const hour = new Date(time).getHours();
+            if (hour < 12) return 'Morning';
+            if (hour < 18) return 'Afternoon';
+            return 'Evening';
+        };
+
+        // Convert the time query parameter to a category
+        const timeCategory = timeToCategory(time);
+
+        // Construct the filter object
+        let filter = {};
+        if (category) filter.category = category;
+        if (townCouncil) filter.townCouncil = townCouncil;
+        if (timeCategory) filter.timeCategory = timeCategory;
+
+        // Log constructed filter object
+        console.log("Constructed Filter Object:", filter);
+
+        // Fetch filtered events from the database
+        const filteredEvents = await Events.findAll({
+            where: {
+                [Op.and]: [
+                    category ? { category } : {},
+                    townCouncil ? { townCouncil } : {},
+                    timeCategory ? { timeCategory } : {}
+                ]
+            }
+        });
+
+        // Respond with the filtered events
+        res.json(filteredEvents);
+    } catch (error) {
+        console.error("Error fetching events:", error);
+        res.status(500).json({ message: "Internal Server Error" });
+    }
+});
+
+
 router.post("/", upload.fields([
     { name: 'evtPicture', maxCount: 1 },
 ]), async (req, res) => {
@@ -30,9 +79,16 @@ router.post("/", upload.fields([
         data = await validationSchema.validate(data, { abortEarly: false });
 
         // Process valid data
-        let evtPicture = files.evtPicture[0].buffer;
+        let evtPicture = files.evtPicture ? files.evtPicture[0].buffer : null;
 
-        let result = await Events.create({ ...data, evtPicture });
+        if (evtPicture) {
+            evtPicture = await sharp(evtPicture)
+                .resize(800, 600)
+                .jpeg()
+                .toBuffer();
+        }
+
+        let result = await Events.create({ ...data, evtPicture});
 
         res.json(result);
     } catch (err) {
@@ -46,6 +102,7 @@ router.post("/", upload.fields([
       let list = await Events.findAll({
         order: [['createdAt', 'DESC']],
       });
+
       res.json(list);
     } catch (error) {
       console.error("Error fetching events:", error);
@@ -92,7 +149,6 @@ router.put("/:id", async (req, res) => {
         time: yup.string(),
         location: yup.string(),
         category: yup.string(),
-        imageUrl: yup.string(),
         slotsAvailable: yup.number().integer(),
     });