From f90d848188bc5cdb4e2d4afaf72c54c4dbe90da9 Mon Sep 17 00:00:00 2001 From: Dylan Cashman Date: Fri, 4 Oct 2024 11:11:04 -0400 Subject: [PATCH] fix room links on calendar --- scripts/fix_file_extensions.sh | 4 +- static/2024/js/views/calendar.js | 78 ++++++++++++++++---------------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/scripts/fix_file_extensions.sh b/scripts/fix_file_extensions.sh index 446fc7f3d..a730e6f28 100755 --- a/scripts/fix_file_extensions.sh +++ b/scripts/fix_file_extensions.sh @@ -15,7 +15,9 @@ for i in `find _site/year/{2016,2017,2018,2019,2020,2021,2022,2023,2024} _site/g if [[ $i != *"program/session_"* ]]; then if [[ $i != *"program/poster_"* ]]; then if [[ $i != *"/events.html" ]]; then - mv $i `echo $i | sed s/.html$//`; + if [[ $i != *"program/room_"* ]]; then + mv $i `echo $i | sed s/.html$//`; + fi fi fi fi diff --git a/static/2024/js/views/calendar.js b/static/2024/js/views/calendar.js index 763b3b903..4d8fcbf9a 100644 --- a/static/2024/js/views/calendar.js +++ b/static/2024/js/views/calendar.js @@ -781,17 +781,17 @@ function populateDays(calendarSelection, config) { function populateRooms(calendarSelection, roomNames, day) { // TODO: use room names - NEED TO CHANGE let roomData = [ - { link: 'bayshorefoyer', roomId: 'bayshorefoyer', text: "Bayshore Foyer" }, - { link: 'bayshoreplenary', roomId: 'bayshoreplenary', text: "Bayshore I + II + III" }, - { link: 'bayshore1', roomId: 'bayshore1', text: "Bayshore I" }, - { link: 'bayshore2', roomId: 'bayshore2', text: "Bayshore II" }, - { link: 'bayshore3', roomId: 'bayshore3', text: "Bayshore III" }, - { link: 'bayshore5', roomId: 'bayshore5', text: "Bayshore V" }, - { link: 'bayshore6', roomId: 'bayshore6', text: "Bayshore VI" }, - { link: 'bayshore7', roomId: 'bayshore7', text: "Bayshore VII" }, - { link: 'palmaceia234', roomId: 'palmaceia234', text: "Palma Ceia II+III+IV" }, - { link: 'palmaceia1', roomId: 'palmaceia1', text: "Palma Ceia I " }, - { link: 'esplanadesuites', roomId: 'esplanadesuites', text: "Esplanade Suites I + II + III" } + { link: 'room_bayshorefoyer.html', roomId: 'bayshorefoyer', text: "Bayshore Foyer" }, + { link: 'room_bayshoreplenary.html', roomId: 'bayshoreplenary', text: "Bayshore I + II + III" }, + { link: 'room_bayshore1.html', roomId: 'bayshore1', text: "Bayshore I" }, + { link: 'room_bayshore2.html', roomId: 'bayshore2', text: "Bayshore II" }, + { link: 'room_bayshore3.html', roomId: 'bayshore3', text: "Bayshore III" }, + { link: 'room_bayshore5.html', roomId: 'bayshore5', text: "Bayshore V" }, + { link: 'room_bayshore6.html', roomId: 'bayshore6', text: "Bayshore VI" }, + { link: 'room_bayshore7.html', roomId: 'bayshore7', text: "Bayshore VII" }, + { link: 'room_palmaceia234.html', roomId: 'palmaceia234', text: "Palma Ceia II+III+IV" }, + { link: 'room_palmaceia1.html', roomId: 'palmaceia1', text: "Palma Ceia I " }, + { link: 'room_esplanadesuites.html', roomId: 'esplanadesuites', text: "Esplanade Suites I + II + III" } ]; @@ -802,50 +802,50 @@ function populateRooms(calendarSelection, roomNames, day) { case "Sunday": case "Monday": roomData = [ - { link: 'bayshore1', roomId: 'bayshore1', text: "Bayshore I" }, - { link: 'bayshore2', roomId: 'bayshore2', text: "Bayshore II" }, - { link: 'bayshore3', roomId: 'bayshore3', text: "Bayshore III" }, - { link: 'bayshore5', roomId: 'bayshore5', text: "Bayshore V" }, - { link: 'bayshore6', roomId: 'bayshore6', text: "Bayshore VI" }, - { link: 'bayshore7', roomId: 'bayshore7', text: "Bayshore VII" }, - { link: 'esplanadesuites', roomId: 'esplanadesuites', text: "Esplanade Suites I + II + III" } + { link: 'room_bayshore1.html', roomId: 'bayshore1', text: "Bayshore I" }, + { link: 'room_bayshore2.html', roomId: 'bayshore2', text: "Bayshore II" }, + { link: 'room_bayshore3.html', roomId: 'bayshore3', text: "Bayshore III" }, + { link: 'room_bayshore5.html', roomId: 'bayshore5', text: "Bayshore V" }, + { link: 'room_bayshore6.html', roomId: 'bayshore6', text: "Bayshore VI" }, + { link: 'room_bayshore7.html', roomId: 'bayshore7', text: "Bayshore VII" }, + { link: 'room_esplanadesuites.html', roomId: 'esplanadesuites', text: "Esplanade Suites I + II + III" } ]; break; case "Tuesday": roomData = [ - { link: 'bayshorefoyer', roomId: 'bayshorefoyer', text: "Bayshore Foyer" }, - { link: 'bayshoreplenary', roomId: 'bayshoreplenary', text: "Bayshore I + II + III" }, - { link: 'palmaceia234', roomId: 'palmaceia234', text: "Palma Ceia II+III+IV" }, - { link: 'palmaceia1', roomId: 'palmaceia1', text: "Palma Ceia I " }, + { link: 'room_bayshorefoyer.html', roomId: 'bayshorefoyer', text: "Bayshore Foyer" }, + { link: 'room_bayshoreplenary.html', roomId: 'bayshoreplenary', text: "Bayshore I + II + III" }, + { link: 'room_palmaceia234.html', roomId: 'palmaceia234', text: "Palma Ceia II+III+IV" }, + { link: 'room_palmaceia1.html', roomId: 'palmaceia1', text: "Palma Ceia I " }, ]; break; case "Wednesday": roomData = [ - { link: 'bayshore1', roomId: 'bayshore1', text: "Bayshore I" }, - { link: 'bayshore2', roomId: 'bayshore2', text: "Bayshore II" }, - { link: 'bayshore3', roomId: 'bayshore3', text: "Bayshore III" }, - { link: 'bayshore5', roomId: 'bayshore5', text: "Bayshore V" }, - { link: 'bayshore6', roomId: 'bayshore6', text: "Bayshore VI" }, - { link: 'bayshore7', roomId: 'bayshore7', text: "Bayshore VII" }, - { link: 'palmaceia1', roomId: 'palmaceia1', text: "Palma Ceia I " } + { link: 'room_bayshore1.html', roomId: 'bayshore1', text: "Bayshore I" }, + { link: 'room_bayshore2.html', roomId: 'bayshore2', text: "Bayshore II" }, + { link: 'room_bayshore3.html', roomId: 'bayshore3', text: "Bayshore III" }, + { link: 'room_bayshore5.html', roomId: 'bayshore5', text: "Bayshore V" }, + { link: 'room_bayshore6.html', roomId: 'bayshore6', text: "Bayshore VI" }, + { link: 'room_bayshore7.html', roomId: 'bayshore7', text: "Bayshore VII" }, + { link: 'room_palmaceia1.html', roomId: 'palmaceia1', text: "Palma Ceia I " } ]; break; case "Thursday": roomData = [ - { link: 'bayshore1', roomId: 'bayshore1', text: "Bayshore I" }, - { link: 'bayshore2', roomId: 'bayshore2', text: "Bayshore II" }, - { link: 'bayshore3', roomId: 'bayshore3', text: "Bayshore III" }, - { link: 'bayshore5', roomId: 'bayshore5', text: "Bayshore V" }, - { link: 'bayshore6', roomId: 'bayshore6', text: "Bayshore VI" }, - { link: 'bayshore7', roomId: 'bayshore7', text: "Bayshore VII" } + { link: 'room_bayshore1.html', roomId: 'bayshore1', text: "Bayshore I" }, + { link: 'room_bayshore2.html', roomId: 'bayshore2', text: "Bayshore II" }, + { link: 'room_bayshore3.html', roomId: 'bayshore3', text: "Bayshore III" }, + { link: 'room_bayshore5.html', roomId: 'bayshore5', text: "Bayshore V" }, + { link: 'room_bayshore6.html', roomId: 'bayshore6', text: "Bayshore VI" }, + { link: 'room_bayshore7.html', roomId: 'bayshore7', text: "Bayshore VII" } ]; break; case "Friday": roomData = [ - { link: 'bayshoreplenary', roomId: 'bayshoreplenary', text: "Bayshore I + II + III" }, - { link: 'bayshore5', roomId: 'bayshore5', text: "Bayshore V" }, - { link: 'bayshore6', roomId: 'bayshore6', text: "Bayshore VI" }, - { link: 'bayshore7', roomId: 'bayshore7', text: "Bayshore VII" } + { link: 'room_bayshoreplenary.html', roomId: 'bayshoreplenary', text: "Bayshore I + II + III" }, + { link: 'room_bayshore5.html', roomId: 'bayshore5', text: "Bayshore V" }, + { link: 'room_bayshore6.html', roomId: 'bayshore6', text: "Bayshore VI" }, + { link: 'room_bayshore7.html', roomId: 'bayshore7', text: "Bayshore VII" } ]; break; }