diff --git a/pages/cart/reports/coverMe.tsx b/pages/cart/reports/coverMe.tsx index d2e2971..e076646 100644 --- a/pages/cart/reports/coverMe.tsx +++ b/pages/cart/reports/coverMe.tsx @@ -25,11 +25,11 @@ export default function EventLogList() { useEffect(() => { const fetchLocations = async () => { try { - const { data: eventLogsData } = await axiosInstance.get(`/api/data/prisma/eventLog?where={"type":"${EventLogType.AssignmentReplacementAccepted}"} - &include={"publisher":{"select":{"firstName":true,"lastName":true}},"shift":{"include":{"publishers":{"select":{"firstName":true,"lastName":true}}}}}`); + const { data: eventLogsData } = await axiosInstance.get(`/api/data/prisma/eventLog?where={"type":"${EventLogType.AssignmentReplacementAccepted}"}&include={"publisher":{"select":{"firstName":true,"lastName":true}},"shift":{"include":{"assignments":{"include":{"publisher":{"select":{"firstName":true,"lastName":true}}}}}}}`); + setEventLog(eventLogsData); - const { data: shiftsData } = await axiosInstance.get(`/api/data/prisma/assignment?where={"publicGuid":{"not":"null"}}&include={"shift":{"include":{"publishers":{"select":{"firstName":true,"lastName":true}}}},"publisher":{"select":{"firstName":true,"lastName":true}}}`) + const { data: shiftsData } = await axiosInstance.get(`/api/data/prisma/assignment?where={"publicGuid":{"not":"null"}}&include={"shift":{"include":{"assignments":{"include":{"publisher":{"select":{"firstName":true,"lastName":true}}}}}},"publisher":{"select":{"firstName":true,"lastName":true}}}`); setRequestedAssignments(shiftsData); } catch (error) { @@ -77,8 +77,12 @@ export default function EventLogList() { {!showOpenRequests && (eventLogs.map((event) => ( {event.publisher.firstName + " " + event.publisher.lastName} - {common.getDateFormated(new Date(event.date))} - {event.shift?.name} + {new Date(event.shift?.startTime).toLocaleString('bg')} + + {event.shift?.assignments.map((ass) => ( +
{ass.publisher.firstName + " " + ass.publisher.lastName}
+ ))} + {event.content} @@ -96,8 +100,8 @@ export default function EventLogList() { {assignment.publisher.firstName + " " + assignment.publisher.lastName} {new Date(assignment.shift.startTime).toLocaleString('bg')} - {assignment.shift.publishers.map((publisher) => ( -
{publisher.firstName + " " + publisher.lastName}
+ {assignment.shift.assignments.map((ass) => ( +
{ass.publisher.firstName + " " + ass.publisher.lastName}
))}