gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[feat]Properly add timezone to events starttime and endtime; set now to be the time in conference timezone instead of the user s time zone in fullcalendar

Browse source
This commit is contained in:
Jimmy 2021-05-01 01:37:52 +08:00
parent 66767c33a2
commit bc115d6f90
No known key found for this signature in database
GPG key ID: FAE75C760A4A5CC6
6 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/services/full_calendar_formatter_spec.rb
View file

@ -45,8 +45,8 @@ describe FullCalendarFormatter do
{
id: event_schedule1.event.guid,
title: event_schedule1.event.title,
start: event_schedule1.start_time,
end: event_schedule1.end_time,
start: event_schedule1.start_time_in_conference_timezone,
end: event_schedule1.end_time_in_conference_timezone,
resourceId: room1.guid,
url: Rails.application.routes.url_helpers.conference_program_proposal_path(conference.short_title, event1.id),
borderColor: event1.event_type.color,
@ -56,8 +56,8 @@ describe FullCalendarFormatter do
{
id: event_schedule2.event.guid,
title: event_schedule2.event.title,
start: event_schedule2.start_time,
end: event_schedule2.end_time,
start: event_schedule2.start_time_in_conference_timezone,
end: event_schedule2.end_time_in_conference_timezone,
resourceId: room2.guid,
url: Rails.application.routes.url_helpers.conference_program_proposal_path(conference.short_title, event2.id),
borderColor: event2.event_type.color,