Skip to content

Commit d11568a

Browse files
authored
Merge branch 'ep2025' into ep2025-issue-1126
2 parents 5304e33 + dafb500 commit d11568a

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/components/schedule/day.astro

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ for (let i = 0; i < sessionAndTimes.length - 1; i++) {
141141
if (nextStart !== end) {
142142
const duration = differenceInMinutes(nextStart, end);
143143

144-
if (duration === 5) {
144+
if (duration >= 5) {
145145
const roomChangeStart = end;
146146
const roomChangeTime = format(roomChangeStart, "HH:mm");
147147
const roomChangeEnd = addMinutes(roomChangeStart, 5);
@@ -167,7 +167,9 @@ for (let i = 0; i < sessionAndTimes.length - 1; i++) {
167167
},
168168
];
169169
} else {
170-
console.warn("Missing room change", end, nextStart, duration);
170+
if (duration != 0){
171+
console.warn("Missing room change", end, nextStart, duration);
172+
}
171173
}
172174
}
173175
}

src/components/sessions/filter.astro

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import { Select } from "../form/select";
1212

1313
<form class="mb-12 filter-sessions">
1414
<div class="w-full mb-6">
15-
<Label htmlFor="search">Search</Label>
15+
<Label htmlFor="sessionSearch">Search</Label>
1616
<input
1717
type="text"
18-
id="search"
18+
id="sessionSearch"
1919
name="search"
2020
class="block w-full bg-transparent text-lg h-16 py-2 pr-16 pl-4 border-[3px] border-primary appearance-none focus:outline-none focus:border-black focus-visible:bg-white"
2121
placeholder="Search sessions..."
@@ -101,7 +101,7 @@ import { Select } from "../form/select";
101101
const trackSelect = form.querySelector<HTMLSelectElement>("#track");
102102
const typeSelect = form.querySelector<HTMLSelectElement>("#type");
103103
const levelSelect = form.querySelector<HTMLSelectElement>("#level");
104-
const searchInput = form.querySelector<HTMLInputElement>("#search");
104+
const searchInput = form.querySelector<HTMLInputElement>("#sessionSearch");
105105

106106
if (trackSelect) trackSelect.value = track;
107107
if (typeSelect) typeSelect.value = type;
@@ -130,7 +130,7 @@ import { Select } from "../form/select";
130130
const trackSelect = form.querySelector<HTMLSelectElement>("#track");
131131
const typeSelect = form.querySelector<HTMLSelectElement>("#type");
132132
const levelSelect = form.querySelector<HTMLSelectElement>("#level");
133-
const searchInput = form.querySelector<HTMLInputElement>("#search");
133+
const searchInput = form.querySelector<HTMLInputElement>("#sessionSearch");
134134

135135
const track = trackSelect?.value || "";
136136
const type = typeSelect?.value || "";
@@ -190,7 +190,7 @@ import { Select } from "../form/select";
190190
select.addEventListener("change", filterSessions);
191191
});
192192

193-
const searchInput = form.querySelector<HTMLInputElement>("#search");
193+
const searchInput = form.querySelector<HTMLInputElement>("#sessionSearch");
194194
if (searchInput) {
195195
searchInput.addEventListener("input", filterSessions);
196196
}

0 commit comments

Comments
 (0)