yangli/worldshine-redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix
All checks were successful
Build And Deploy Main / build-and-deploy (push) Successful in 34s
Details

Browse Source
This commit is contained in:
Lixian Zhou
2026-03-17 16:05:23 -04:00
parent d90f65f4b7
commit 5764f3ff9a
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/components/center-calendar/CenterCalendar.js
View File

@@ -338,7 +338,12 @@ const EventsCalendar = () => {
const getGroupedEvents = () => { const getGroupedEvents = () => {
const eventsDateMap = new Map(); const eventsDateMap = new Map();
const filteredEvents = getFilteredEvents(); const filteredEvents = getFilteredEvents();
for (const eventItem of filteredEvents) { const sortedFilteredEvents = [...filteredEvents].sort((a, b) => {
const aTime = moment(a?.start_time).valueOf();
const bTime = moment(b?.start_time).valueOf();
return aTime - bTime;
});
for (const eventItem of sortedFilteredEvents) {
const dateString = moment(eventItem.start_time).format('MMM Do, YYYY'); const dateString = moment(eventItem.start_time).format('MMM Do, YYYY');
if (eventsDateMap.has(dateString)) { if (eventsDateMap.has(dateString)) {
eventsDateMap.set(dateString, [...eventsDateMap.get(dateString), eventItem]); eventsDateMap.set(dateString, [...eventsDateMap.get(dateString), eventItem]);
@@ -357,7 +362,13 @@ const EventsCalendar = () => {
}); });
eventsDateMap.set(key, sortedItems); eventsDateMap.set(key, sortedItems);
}); });
return eventsDateMap; return new Map(
[...eventsDateMap.entries()].sort((a, b) => {
const aDate = moment(a[1]?.[0]?.start_time).valueOf();
const bDate = moment(b[1]?.[0]?.start_time).valueOf();
return aDate - bDate;
})
);
}; };