OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Present meetings in their correctly planned timezone
Klaus Zandersb054604eb3fc
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rbindex 69409e72b01..9ad5c72a040 100644--- a/modules/meeting/app/services/meetings/icalendar_builder.rb+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb@@ -96,8 +96,8 @@ module Meetingse.sequence = recurring_meeting.template.lock_versione.rrule = recurring_meeting.schedule.rrules.first.to_ical # We currently only have one recurrence rule- e.dtstart = ical_datetime(recurring_meeting.template.start_time)- e.dtend = ical_datetime(recurring_meeting.template.end_time)+ e.dtstart = ical_datetime(recurring_meeting.template.start_time, timezone: recurring_meeting.time_zone)+ e.dtend = ical_datetime(recurring_meeting.template.end_time, timezone: recurring_meeting.time_zone)e.location = recurring_meeting.template.location.presencee.status = if cancelled"CANCELLED"@@ -108,7 +108,9 @@ module Meetingsadd_attendees(event: e, meeting: recurring_meeting.template)# Add all occurence dates to the dates set, so that we bake in all timezone rules correcly- all_times[build_timezone].push(recurring_meeting.schedule.all_occurrences.max)+ all_times[recurring_meeting.time_zone].push(+ recurring_meeting.schedule.all_occurrences.max.in_time_zone(recurring_meeting.time_zone)+ )# Add exceptions for all cancelled recurrencesset_excluded_recurrence_dates(event: e, recurring_meeting: recurring_meeting)@@ -137,9 +139,9 @@ module Meetingse.last_modified = meeting.updated_at.utce.sequence = meeting.lock_version- e.recurrence_id = ical_datetime(scheduled_meeting.start_time)- e.dtstart = ical_datetime(meeting.start_time)- e.dtend = ical_datetime(meeting.end_time)+ e.recurrence_id = ical_datetime(scheduled_meeting.start_time, timezone: recurring_meeting.time_zone)+ e.dtstart = ical_datetime(meeting.start_time, timezone: recurring_meeting.time_zone)+ e.dtend = ical_datetime(meeting.end_time, timezone: recurring_meeting.time_zone)e.location = meeting.location.presenceadd_attendees(event: e, meeting: meeting)@@ -228,7 +230,7 @@ module Meetingscalendar_generated_for_user == user && @action_needed_from_user_as_attendeeend- def ical_datetime(time, timezone = build_timezone)+ def ical_datetime(time, timezone: build_timezone)tzid = timezone.tzinfo.canonical_identifiertime_in_time_zone = time.in_time_zone(timezone)@@ -290,7 +292,7 @@ module Meetings.scheduled_meetings.cancelled.pluck(:start_time)- .map { ical_datetime(it) }+ .map { ical_datetime(it, timezone: recurring_meeting.time_zone) }endenddiff --git a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rbindex 68f7e334b66..8df05d49561 100644--- a/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb+++ b/modules/meeting/spec/services/meetings/icalendar_builder_spec.rb@@ -387,6 +387,55 @@ RSpec.describe Meetings::IcalendarBuilder,endend+ context "with recurring meetings in multiple timezones" do+ subject(:builder) { described_class.new(timezone:) }++ let(:parsed_calendar) { Icalendar::Calendar.parse(builder.to_ical).first }++ let(:recurring_meeting) do+ create(:recurring_meeting,+ start_time: Time.zone.parse("2025-08-25 09:00"),+ iterations: 10,+ end_after: :iterations,+ time_zone: "Europe/Paris")+ end++ let(:other_recurring_meeting) do+ create(:recurring_meeting,+ start_time: Time.zone.parse("2025-08-25 09:00"),+ iterations: 10,+ end_after: :iterations,+ time_zone: "America/New_York")+ end++ before do+ builder.add_series_event(recurring_meeting: recurring_meeting)+ builder.add_series_event(recurring_meeting: other_recurring_meeting)+ end++ it "adds timezone definitions for both timezones of recurring meetings, but not builder timezone" do+ expect(parsed_calendar.timezones.size).to eq(2)+ tzids = parsed_calendar.timezones.map(&:tzid)+ expect(tzids).to contain_exactly("Europe/Paris", "America/New_York")+ # Berlin is not included because there is no event in that timezone+ # We only have recurring meetings, and those are not converted to the builder timezone+ end++ context "when adding another single meeting" do+ let(:single_meeting) { create(:meeting, start_time: Time.zone.parse("2025-10-01 10:00")) }++ before do+ builder.add_single_meeting_event(meeting: single_meeting)+ end++ it "also adds the builder timezone because single meetings are converted" do+ expect(parsed_calendar.timezones.size).to eq(3)+ tzids = parsed_calendar.timezones.map(&:tzid)+ expect(tzids).to contain_exactly("Europe/Paris", "America/New_York", timezone.tzinfo.canonical_identifier)+ end+ end+ end+context "for timezone transitions across multiple years" dosubject(:builder) { described_class.new(timezone:) }