From 2809bca0e2825dc4bbbb68e6ed688e83f44f1a4d Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Sun, 28 Apr 2024 13:49:33 +0300
Subject: [PATCH] usable open requests list

---
 pages/cart/reports/coverMe.tsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pages/cart/reports/coverMe.tsx b/pages/cart/reports/coverMe.tsx
index fcb888a..b4c8e97 100644
--- a/pages/cart/reports/coverMe.tsx
+++ b/pages/cart/reports/coverMe.tsx
@@ -9,13 +9,13 @@ import { useSession } from "next-auth/react"
 import common from '../../../src/helpers/common';
 import Layout from "../../../components/layout";
 import ProtectedRoute from '../../../components/protectedRoute';
-import { Location, Shift, UserRole, EventLog, EventType } from "@prisma/client";
+import { Location, Shift, UserRole, EventLog, EventType, EventLogType } from "@prisma/client";
 import { set } from 'date-fns';
 
 
 export default function EventLogList() {
     const [eventLogs, setEventLog] = useState([]);
-    const [publicShifts, setPublicShifts] = useState([]);
+    const [requestedAssignments, setRequestedAssignments] = useState([]);
     const router = useRouter();
     const { data: session } = useSession();
 
@@ -40,9 +40,12 @@ export default function EventLogList() {
                     .catch((err) => {
                         console.log(err);
                     });
+
+                const { data: eventLogsData } = await axiosInstance.get(`/api/data/prisma/eventlog?where={"type":"${EventLogType.AssignmentReplacementAccepted}"}`)
+                setEventLog(eventLogsData);
                 //get shifts where publicGuid is not null
-                const { data: shiftsData } = await axiosInstance.get(`/api/data/prisma/assignment?where={"publicGuid":{"not":"NULL"}}`)
-                setPublicShifts(shiftsData);
+                const { data: shiftsData } = await axiosInstance.get(`/api/data/prisma/assignment?where={"publicGuid":{"not":"null"}}&include={"shift":true,"publisher":{"select":{"firstName":true,"lastName":true}}}`)
+                setRequestedAssignments(shiftsData);
 
             } catch (error) {
                 console.error(error);
@@ -89,7 +92,7 @@ export default function EventLogList() {
                                     {!showOpenRequests && (eventLogs.map((event) => (
                                         <tr key={event.id}>
                                             <td className="border px-2 py-2">{event.publisher.firstName + " " + event.publisher.lastName}</td>
-                                            <td className="border px-2 py-2">{common.getDateFormated(new Date(event.date))}</td>
+                                            <td className="border px-2 py-2">{common.getDateFormated(new Date(event.startTime))}</td>
                                             <td className="border px-2 py-2">{event.shift?.name}</td>
                                             <td className="border px-2 py-2">
                                                 {event.content}
@@ -103,13 +106,12 @@ export default function EventLogList() {
                                         </tr>
                                     ))
                                     )}
-                                    {showOpenRequests && (publicShifts.map((shift) => (
-                                        <tr key={shift.id}>
-                                            <td className="border px-2 py-2">{shift.publisher.firstName + " " + shift.publisher.lastName}</td>
-                                            <td className="border px-2 py-2">{common.getDateFormated(new Date(shift.date))}</td>
-                                            <td className="border px-2 py-2">{shift.name}</td>
+                                    {showOpenRequests && (requestedAssignments.map((assignment) => (
+                                        <tr key={assignment.id}>
+                                            <td className="border px-2 py-2">{assignment.publisher.firstName + " " + assignment.publisher.lastName}</td>
+                                            <td className="border px-2 py-2">{new Date(assignment.shift.startTime).toLocaleString('bg')}</td>
                                             <td className="border px-2 py-2">
-                                                {shift.content}
+                                                {assignment.shift.content}
                                             </td>
                                             <td className="border px-4 py-2">
                                                 <button