From 196eb5f51d2ce52ebe21a769117fa0e067b93970 Mon Sep 17 00:00:00 2001
From: Anthony Correa <a@correa.co>
Date: Thu, 23 May 2024 08:03:30 -0500
Subject: [PATCH] fixed adjacent lineup

---
 src/controllers/eventlineup.js | 6 +++---
 src/helpers/eventlineup.js     | 2 +-
 src/public/js/eventlineup.js   | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/controllers/eventlineup.js b/src/controllers/eventlineup.js
index 071857f..08aca98 100644
--- a/src/controllers/eventlineup.js
+++ b/src/controllers/eventlineup.js
@@ -38,14 +38,14 @@ exports.getAdjacentEventLineup = async (req, res) => {
     return
   }
   const availabilitySummary = event.availabilitySummary
-  const event_lineup = req.timeline.event_lineups.find(i=>i.eventId==event.id)
+  const event_lineup = req.timeline.event_lineups?.find(i=>i.eventId==event.id)
   const event_lineup_entries = req.timeline.event_lineup_entries?.filter(i=>i.eventId==event.id)
   const availabilities = req.timeline.availabilities.filter(i=>i.eventId==event.id)
   attachBenchcoachPropertiesToMember(members, event_lineup_entries, availabilities)
   members.sort(tsUtils.teamsnapMembersSortLineupAvailabilityLastName)
   console.log()
-  // res.status(200).send('Received')
-  res.render("eventlineup/edit", {user, team, members, event, layout: null, event_lineup, event_lineup_entries, availabilitySummary, csrfToken})
+
+  res.render("eventlineup/edit", {user, team, members, event, layout: null, event_lineup, event_lineup_entries, availabilitySummary, availabilities, csrfToken})
 }
 
 attachBenchcoachPropertiesToMember = (members, event_lineup_entries, availabilities) => {
diff --git a/src/helpers/eventlineup.js b/src/helpers/eventlineup.js
index 8f4e381..94cc85a 100644
--- a/src/helpers/eventlineup.js
+++ b/src/helpers/eventlineup.js
@@ -95,7 +95,7 @@ exports.loadSlots = (options) =>{
   var s = ""
   const {members, event_lineup, event_lineup_entries, event, availabilities} = options.data.root
   event_lineup_entries.forEach(eventLineupEntry =>{
-    const availability = availabilities.find(a=>a.memberId==eventLineupEntry.memberId)
+    const availability = availabilities?.find(a=>a.memberId==eventLineupEntry.memberId)
     const member = members.find(m=>m.id==eventLineupEntry.memberId)
     const {positionFlags} = parsePositionLabel(eventLineupEntry.label)
     const initial_slotset = `lineup-${positionFlags.has('PO') ? 'positiononly' : 'starting'}-${event.id}`
diff --git a/src/public/js/eventlineup.js b/src/public/js/eventlineup.js
index 0b6bb30..9ef8112 100644
--- a/src/public/js/eventlineup.js
+++ b/src/public/js/eventlineup.js
@@ -640,9 +640,11 @@ function insertLineup(direction, teamId, eventId, element) {
 function initSlots () {
   const slots = Array.from(document.querySelectorAll('.lineup-slot'))
   slots.forEach(slot=>{
-    const parent = document.querySelector(`#${slot.dataset.initialSlotset} .slot-set`)
-    parent.appendChild(slot)
-    slot.removeAttribute('data-initial-slotset')
+    if (slot.dataset.initialSlotset) {
+      const parent = document.querySelector(`#${slot.dataset.initialSlotset} .slot-set`)
+      parent.appendChild(slot)
+      slot.removeAttribute('data-initial-slotset')
+    }
   })
 }
 function initPage (){