various fixes to imports and filtering;

some API rewrited
This commit is contained in:
Dobromir Popov
2024-04-11 02:38:36 +03:00
parent 76edfb13a2
commit 7e7e01f14c
5 changed files with 316 additions and 36 deletions

View File

@ -110,7 +110,7 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
const { data: shiftsForDate } = await axiosInstance.get(`/api/?action=getShiftsForDay&date=${dateStr}`);
setShifts(shiftsForDate);
setIsPublished(shiftsForDate.some(shift => shift.isPublished));
let { data: availablePubsForDate } = await axiosInstance.get(`/api/?action=filterPublishers&assignments=true&availabilities=true&date=${dateStr}&select=id,firstName,lastName,isActive,desiredShiftsPerMonth`);
let { data: availablePubsForDate } = await axiosInstance.get(`/api/?action=filterPublishersNew&date=${dateStr}&select=id,firstName,lastName,isActive,desiredShiftsPerMonth`);
availablePubsForDate.forEach(pub => {
pub.canTransport = pub.availabilities.some(av =>
@ -143,6 +143,8 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
const handleShiftSelection = (selectedShift) => {
setSelectedShiftId(selectedShift.id);
const updatedPubs = availablePubs.map(pub => {
pub.isAvailableForShift = false;
pub.canTransport = false;
const av = pub.availabilities?.find(avail =>
avail.startTime <= selectedShift.startTime
&& avail.endTime >= selectedShift.endTime