Skip to content

[#68272] Wrong calendar week in My time tracking #23116

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

Draft
mrmir wants to merge 1 commit into
base: dev
Choose a base branch
from
+3 −7
Draft

[#68272] Wrong calendar week in My time tracking #23116

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
10 changes: 3 additions & 7 deletions modules/costs/app/components/my/time_tracking/list_component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def grouped_time_entries

def date_title(date)
if mode == :month
I18n.t(:label_specific_week, week: week_number(date))
week_date_range(date)
else
I18n.l(date, format: "%A %d")
end
Expand All @@ -82,12 +82,8 @@ def month_days
date.all_month.map(&:beginning_of_week).uniq
end

def week_number(date)
if Setting.start_of_week == 1 # monday
I18n.l(date, format: "%W")
else # 6 saturday, 7 sunday
I18n.l(date, format: "%U")
end
def week_date_range(date)
SubHeaderComponent.new(mode: :week, date:, view_mode: :list).title
end

def week_start_day
Expand Down
Loading