From 6d9981975ec123ad86903ba05863d8862a42c448 Mon Sep 17 00:00:00 2001 From: MAEDA Go Date: Fri, 16 Oct 2026 19:02:41 +0900 Subject: [PATCH] Show the day of the week next to each date heading on the activity page --- app/assets/stylesheets/application.css | 1 + app/views/activities/_activities.html.erb | 5 ++++- test/functional/activities_controller_test.rb | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 0a7845014..daf1ff770 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1064,6 +1064,7 @@ div#activity h3 { padding: 5px; background-color: var(--oc-gray-1); } +div#activity h3 .day-of-week { font-size: 0.875rem; font-weight: normal; color: var(--color-text-muted); } div#activity dt { padding-block-start: 10px; border-block-start: 1px solid var(--oc-gray-2); diff --git a/app/views/activities/_activities.html.erb b/app/views/activities/_activities.html.erb index f2d8e22bd..7ec79f298 100644 --- a/app/views/activities/_activities.html.erb +++ b/app/views/activities/_activities.html.erb @@ -1,6 +1,9 @@
<% events_by_day.keys.sort.reverse_each do |day| %> -

<%= format_activity_day(day) %>

+

+ <%= format_activity_day(day) %> + <% unless day == User.current.today %>(<%= abbr_day_name(day.cwday) %>)<% end %> +

<% sort_activity_events(events_by_day[day]).each do |e, in_group| -%>
<%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>"> diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb index 85f0767f7..4c3727d52 100644 --- a/test/functional/activities_controller_test.rb +++ b/test/functional/activities_controller_test.rb @@ -61,6 +61,20 @@ class ActivitiesControllerTest < Redmine::ControllerTest assert_select '#sidebar input#with_subprojects', :count => 0 end + def test_index_should_show_day_of_week_except_for_today + Journal.find(1).update_column(:created_on, Time.current) + Journal.find(2).update_column(:created_on, 1.day.ago) + with_locale 'en' do + get(:index, :params => {:id => 1, :with_subprojects => 0}) + end + assert_response :success + + assert_select 'h3', :text => 'Today' do + assert_select 'span.day-of-week', 0 + end + assert_select 'h3 span.day-of-week', :text => "(#{1.day.ago.to_date.strftime('%a')})" + end + def test_project_index_with_invalid_project_id_should_respond_404 get(:index, :params => {:id => 299}) assert_response :not_found -- 2.55.0