Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🐛 Fix date grouping (#2279)

Luke Vellaee8ae788cd44
diff --git a/apps/web/src/components/poll/desktop-poll/poll-header.tsx b/apps/web/src/components/poll/desktop-poll/poll-header.tsx
index 59c9a93a7..65c6b2a29 100644
--- a/apps/web/src/components/poll/desktop-poll/poll-header.tsx
+++ b/apps/web/src/components/poll/desktop-poll/poll-header.tsx
@@ -68,7 +68,9 @@ const PollHeader: React.FunctionComponent = () => {
<TimelineRow top={0}>
{options.map((option, i) => {
const firstOfMonth =
- i === 0 || options[i - 1]?.month !== option.month;
+ i === 0 ||
+ options[i - 1]?.month !== option.month ||
+ options[i - 1]?.year !== option.year;
return (
<th
@@ -101,10 +103,14 @@ const PollHeader: React.FunctionComponent = () => {
const firstOfDay =
i === 0 ||
options[i - 1]?.day !== option.day ||
- options[i - 1]?.month !== option.month;
+ options[i - 1]?.month !== option.month ||
+ options[i - 1]?.year !== option.year;
const lastOfDay =
- i === options.length - 1 || options[i + 1]?.day !== option.day;
+ i === options.length - 1 ||
+ options[i + 1]?.day !== option.day ||
+ options[i + 1]?.month !== option.month ||
+ options[i + 1]?.year !== option.year;
return (
<th
key={option.optionId}
diff --git a/apps/web/src/components/poll/mobile-poll.tsx b/apps/web/src/components/poll/mobile-poll.tsx
index ba8dc9193..678d03471 100644
--- a/apps/web/src/components/poll/mobile-poll.tsx
+++ b/apps/web/src/components/poll/mobile-poll.tsx
@@ -184,7 +184,7 @@ const MobilePoll: React.FunctionComponent = () => {
editable={isEditing}
group={(option) => {
if (option.type === "timeSlot") {
- return `${option.dow} ${option.day} ${option.month}`;
+ return `${option.dow} ${option.day} ${option.month} ${option.year}`;
}
return `${option.month} ${option.year}`;
}}