diff --git a/app/helpers/pair_works_helper.rb b/app/helpers/pair_works_helper.rb index 783b07fab4e..a153af56ec2 100644 --- a/app/helpers/pair_works_helper.rb +++ b/app/helpers/pair_works_helper.rb @@ -45,4 +45,9 @@ def meta_label_by_status(upcoming_pair_work) today = upcoming_pair_work.reserved_at.to_date == Time.current.to_date today ? 'a-meta__label is-important' : 'a-meta__label' end + + def meta_value_by_status(upcoming_pair_work) + today = upcoming_pair_work.reserved_at.to_date == Time.current.to_date + today ? 'a-meta__value is-important' : 'a-meta__value' + end end diff --git a/app/views/home/_adviser_dashboard.html.slim b/app/views/home/_adviser_dashboard.html.slim index f2cd7a2f3a8..e17a0a4a11b 100644 --- a/app/views/home/_adviser_dashboard.html.slim +++ b/app/views/home/_adviser_dashboard.html.slim @@ -9,6 +9,8 @@ .dashboard-category__body .a-panels .a-panels__items + - if @upcoming_pair_works.present? + = render 'upcoming_pair_works', upcoming_pair_works: @upcoming_pair_works - if @upcoming_events_groups.present? = render 'upcoming_events_groups', upcoming_events_groups: @upcoming_events_groups .a-panels__item diff --git a/app/views/home/_mentor_dashboard.html.slim b/app/views/home/_mentor_dashboard.html.slim index 45abef7ddad..17efc67edb1 100644 --- a/app/views/home/_mentor_dashboard.html.slim +++ b/app/views/home/_mentor_dashboard.html.slim @@ -3,6 +3,10 @@ .dashboard-contents__cols .dashboard-contents__col.is-sub.is-only-mentor .dashboard-contents__categories + - if @upcoming_pair_works.present? + .dashboard-category + = render 'upcoming_pair_works', upcoming_pair_works: @upcoming_pair_works + .dashboard-category - unchecked_report_count = Cache.unchecked_report_count - if unchecked_report_count > 100 diff --git a/app/views/home/_upcoming_pair_work.html.slim b/app/views/home/_upcoming_pair_work.html.slim index 34f77dc44cc..ab6a29bf237 100644 --- a/app/views/home/_upcoming_pair_work.html.slim +++ b/app/views/home/_upcoming_pair_work.html.slim @@ -16,6 +16,6 @@ .a-meta span class=meta_label_by_status(upcoming_pair_work) | 開催日時 - span class=meta_label_by_status(upcoming_pair_work) + span class=meta_value_by_status(upcoming_pair_work) time datetime=upcoming_pair_work.reserved_at.iso8601 = l upcoming_pair_work.reserved_at diff --git a/db/fixtures/pair_works.yml b/db/fixtures/pair_works.yml index 32741e3d1d9..9b5e58e155e 100644 --- a/db/fixtures/pair_works.yml +++ b/db/fixtures/pair_works.yml @@ -26,7 +26,7 @@ pair_work3: reserved_at: <%= Time.current.beginning_of_day + 23.hours %> user: kimura practice: null - buddy: sotugyou + buddy: advijirou published_at: <%= Time.current %> created_at: <%= Time.current %> wip: false diff --git a/test/helpers/pair_works_helper_test.rb b/test/helpers/pair_works_helper_test.rb index 8579dfe36b0..2cb4e160bfa 100644 --- a/test/helpers/pair_works_helper_test.rb +++ b/test/helpers/pair_works_helper_test.rb @@ -89,4 +89,19 @@ def current_user assert_not_equal normal_meta_label, meta_label_by_status(pair_work) end end + + test 'meta_value_by_status' do + pair_work = pair_works(:pair_work2) + normal_meta_value = 'a-meta__value' + important_meta_value = 'a-meta__value is-important' + + assert_equal normal_meta_value, meta_value_by_status(pair_work) + assert_not_equal important_meta_value, meta_value_by_status(pair_work) + + reserved_on = Time.zone.local(2025, 1, 2) + travel_to reserved_on do + assert_equal important_meta_value, meta_value_by_status(pair_work) + assert_not_equal normal_meta_value, meta_value_by_status(pair_work) + end + end end