Remove slot merging

Author: user890104

src/hooks/useScheduleTable.js

@@ -18,99 +18,45 @@ export default function useScheduleTable({
         const trackIds = Array.from(new Set(events.map(event => event.track_id)));
         const tracks = allTracks.filter(track => trackIds.includes(track.id));
         const slots = allSlots.sort(sorter('starts_at')).filter(slot => eventIds.includes(slot.event_id));
+        const hallIds = new Set(slots.map(slot => slot.hall_id));
+        const halls = allHalls.filter(hall => hallIds.has(hall.id));
+
         const microslots = Array.from(new Set(slots.flatMap(slot => [
             getTime(slot.starts_at),
             getTime(slot.ends_at),
         ]))).sort().map(ts => toDate(ts));
-        const hallIds = new Set(slots.map(slot => slot.hall_id));
-        const halls = allHalls.filter(hall => hallIds.has(hall.id));
-        const skipHallSlots = new Map();
 
         const rows = microslots.flatMap((date, slotsIndex, slotsArray) => {
             const isFirst = slotsIndex === 0;
             const isLast = slotsIndex === slotsArray.length - 1;
             const nextDate = !isLast ? slotsArray[slotsIndex + 1] : null;
             const isFirstForTheDay = slotsIndex > 0 && !isSameDay(date, slotsArray[slotsIndex - 1]);
             const isLastForTheDay = slotsArray?.[slotsIndex + 1] && !isSameDay(date, slotsArray[slotsIndex + 1]);
-            const rowEvents = new Set();
-
-            const eventCells = halls.flatMap((hall, hallIndex, hallsArray) => {
-                if (skipHallSlots.has(hall.id)) {
-                    const leftToSkip = skipHallSlots.get(hall.id);
 
-                    if (leftToSkip <= 1) {
-                        skipHallSlots.delete(hall.id);
-                    }
-                    else {
-                        skipHallSlots.set(hall.id, leftToSkip - 1);
-                    }
-
-                    return [];
-                }
-
-                const currentTimeSlots = slots.filter(slot => compareAsc(slot.starts_at, date) === 0);
-                const currentHallSlot = currentTimeSlots.find(slot => slot.hall_id === hall.id);
+            const eventCells = halls.flatMap(hall => {
+                const currentHallSlot = slots.find(slot =>
+                    slot.hall_id === hall.id &&
+                    compareAsc(slot.starts_at, date) <= 0 &&
+                    compareAsc(slot.ends_at, nextDate) >= 0
+                );
 
                 if (!currentHallSlot) {
                     return [{
                         id: 'blank-'.concat(hall.id),
                     }];
                 }
 
-                if (rowEvents.has(currentHallSlot.event_id)) {
-                    return [];
-                }
-
-                let rowSpan = 1;
-
-                const spanningMicroslots = microslots.filter(slotDate =>
-                    currentHallSlot.starts_at <= slotDate &&
-                    currentHallSlot.ends_at >= slotDate
-                );
-
-                if (spanningMicroslots.length > 1) {
-                    rowSpan = spanningMicroslots.length - 1;
-
-                    if (rowSpan > 1) {
-                        skipHallSlots.set(hall.id, rowSpan - 1);
-                    }
-                }
-
-                let colSpan = 1;
-
-                for (const index of hallsArray.keys()) {
-                    if (index <= hallIndex) {
-                        continue;
-                    }
-
-                    const currentHall = hallsArray[index];
-                    const currentSlot = currentTimeSlots.find(slot =>
-                        slot.hall_id === currentHall.id &&
-                        slot.event_id === currentHallSlot.event_id
-                    );
-
-                    if (!currentSlot) {
-                        break;
-                    }
-
-                    rowEvents.add(currentHallSlot.event_id);
-                    colSpan++;
-                }
-
                 return [{
                     id: 'slot-'.concat(currentHallSlot.id),
                     attributes: {
                         className: 'schedule-'.concat(currentHallSlot.event.language).concat(' ').concat(currentHallSlot.event.track?.css_class),
-                        colSpan,
-                        rowSpan,
                     },
                     event: currentHallSlot.event,
                 }];
             });
 
-            const isEmptyRow = false; // TODO !eventCells.find(slot => !!slot?.event);
             const showHeader = isFirst || isFirstForTheDay;
-            const showSlot = !isLast && !isLastForTheDay && !isEmptyRow;
+            const showSlot = !isLast && !isLastForTheDay;
 
             return [
                 ...showHeader ? [{