Skip to content

Fix timezone handling causing newly created events to disappear (#108) #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sakshibhatia17 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix timezone handling causing newly created events to disappear (#108) #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/pages/Home/BookRoomView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default function BookRoomView({ onRoomBooked }: BookRoomViewProps) {
async function setAvailableRooms() {
const { startTime, duration, seats } = formData;
const { floor } = preferences;
const currentDate = date.toISOString().split('T')[0];
const currentDate = date.format('YYYY-MM-DD');
const formattedStartTime = convertToRFC3339(currentDate, startTime);

setRoomLoading(true);
Expand Down Expand Up @@ -214,7 +214,7 @@ export default function BookRoomView({ onRoomBooked }: BookRoomViewProps) {
return;
}

const formattedStartTime = convertToRFC3339(date.toISOString().split('T')[0], startTime);
const formattedStartTime = convertToRFC3339(date.format('YYYY-MM-DD'), startTime);
const { floor, title: preferredTitle } = preferences;

const payload: BookRoomDto = {
Expand Down
3 changes: 1 addition & 2 deletions client/src/pages/Home/MyEventsView/EditEventsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import Dropdown, { DropdownOption } from '@components/Dropdown';
import RoomsDropdown, { RoomsDropdownOption } from '@components/RoomsDropdown';
import {
chromeBackground,
convertToLocaleDate,
convertToLocaleTime,
convertToRFC3339,
createDropdownOptions,
Expand Down Expand Up @@ -123,7 +122,7 @@ export default function EditEventsView({ open, event, handleClose, currentRoom,
async function setAvailableRooms() {
const { startTime, duration, seats } = formData;
const { floor } = preferences;
const currentDate = convertToLocaleDate(new Date(date.toISOString()).toISOString());
const currentDate = date.format('YYYY-MM-DD');
const formattedStartTime = convertToRFC3339(currentDate, startTime);

setRoomLoading(true);
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Home/MyEventsView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export default function MyEventsView({ redirectedDate }: MyEventsViewProps) {
setEvents((prevEvents) =>
prevEvents
.map((event) => (event.eventId === data.eventId ? res.data : event))
.filter((event) => event.start.split('T')[0] === currentDate.toISOString().split('T')[0]),
.filter((event) => event.start.split('T')[0] === currentDate.format('YYYY-MM-DD')),
);

toast.success('Room has been updated');
Expand Down Expand Up @@ -210,7 +210,7 @@ export default function MyEventsView({ redirectedDate }: MyEventsViewProps) {
setEvents((prevEvents) =>
prevEvents
.map((event) => (event.eventId === eventId ? { ...event, ...res.data } : event))
.filter((event) => event.start.split('T')[0] === currentDate.toISOString().split('T')[0]),
.filter((event) => event.start.split('T')[0] === currentDate.format('YYYY-MM-DD')),
);

toast.success('Event response has been updated');
Expand Down
8 changes: 5 additions & 3 deletions server/src/google-api/mock.database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,11 @@ export class CalenderMockDb {
});

for (const event of filteredEvents) {
for (const attendee of event.attendees) {
if (attendee.email.includes('resource.calendar.google.com')) {
attendee.resource = true;
if (event.attendees) {
for (const attendee of event.attendees) {
if (attendee.email.includes('resource.calendar.google.com')) {
attendee.resource = true;
}
}
}
}
Expand Down