Skip to content

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

Put times for ongoing timers into the correct TZ

Klaus Zanders25b47ef3faa0
diff --git a/modules/costs/lib/full_calendar/time_entry_event.rb b/modules/costs/lib/full_calendar/time_entry_event.rb
index 5d810d7a9df..406ad0aebe5 100644
--- a/modules/costs/lib/full_calendar/time_entry_event.rb
+++ b/modules/costs/lib/full_calendar/time_entry_event.rb
@@ -50,7 +50,10 @@ module FullCalendar
def start_and_end_time_from_time_entry(time_entry)
if time_entry.ongoing?
- [time_entry.created_at, Time.current]
+ [
+ time_entry.created_at.in_time_zone(time_entry.time_zone),
+ Time.current.in_time_zone(time_entry.time_zone)
+ ]
else
[
time_entry.start_timestamp || time_entry.spent_on,