Skip to content

Change copy alternative logic #442

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

Merged
kaospr merged 1 commit into from
Jan 19, 2026
Merged

Change copy alternative logic #442

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
7 changes: 7 additions & 0 deletions app/helpers/time_regs_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ def weekdays_of_week(date, exclude: nil)
(0..4).map { |i| start_of_week + i.days }.reject { |d| d == exclude }
end

def rest_of_weekdays(date)
end_of_work_week = date.beginning_of_week + 4.days # Friday
return [] if date > end_of_work_week # If after Friday, no remaining days

((date + 1.day)..end_of_work_week).to_a
end

def minutes_by_day_of_week(date, user)
start_of_week = date.beginning_of_week
end_of_week = date.end_of_week
Expand Down
2 changes: 1 addition & 1 deletion app/views/time_regs/_time_reg.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
class: "gap-x-2",
dropdown_items: [
{ label: t("common.copy_to_next_day"), path: time_reg_copies_path(time_reg, date: time_reg.date_worked + 1.day), method: :post },
{ label: t("common.copy_to_week"), path: time_reg_copies_path(time_reg, dates: weekdays_of_week(time_reg.date_worked, exclude: time_reg.date_worked)), method: :post },
{ label: t("common.copy_to_week"), path: time_reg_copies_path(time_reg, dates: rest_of_weekdays(time_reg.date_worked)), method: :post },
{ label: t("common.copy_to_next_week"), path: time_reg_copies_path(time_reg, dates: weekdays_of_week(time_reg.date_worked + 1.week)), method: :post }
]
) do %>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ en:
week: "Week"
copy_to_today: "Copy to today"
copy_to_next_day: "Copy to <b>next day</b>"
copy_to_week: "Copy to all of <b>week</b>"
copy_to_week: "Copy through rest of <b>week</b>"
copy_to_next_week: "Copy to all of <b>next week</b>"
unable_to_proceed: "Unable to proceed"
organization_name: "Organization name"
Expand Down
2 changes: 1 addition & 1 deletion config/locales/nb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ nb:
week: "Uke"
copy_to_today: "Kopier til i dag"
copy_to_next_day: "Kopier til <b>neste dag</b>"
copy_to_week: "Kopier til hele <b>uken</b>"
copy_to_week: "Kopier til resten av <b>uken</b>"
copy_to_next_week: "Kopier til hele <b>neste uke</b>"
unable_to_proceed: "Kan ikke fortsette"
organization_name: "Organisasjonsnavn"
Expand Down