Show the end date's year on meetings when year is different

andreslucena · andreslucena · commit ca728200c26b · 2026-03-12T11:43:09.000+01:00
diff --git a/decidim-meetings/app/cells/decidim/meetings/dates_and_map/show.erb b/decidim-meetings/app/cells/decidim/meetings/dates_and_map/show.erb
@@ -16,6 +16,10 @@
     </div>
     <div class="meeting__calendar-year">
       <span><%= year %></span>
+      <% unless same_year? %>
+        <span class="meeting__calendar-separator">-</span>
+        <span><%= end_year %></span>
+      <% end %>
     </div>
   </div>
 
diff --git a/decidim-meetings/app/cells/decidim/meetings/dates_and_map_cell.rb b/decidim-meetings/app/cells/decidim/meetings/dates_and_map_cell.rb
@@ -21,6 +21,10 @@ def year
         l model.start_time, format: "%Y"
       end
 
+      def end_year
+        l model.end_time, format: "%Y"
+      end
+
       private
 
       def same_month?
@@ -31,6 +35,10 @@ def same_day?
         start_time.day == end_time.day
       end
 
+      def same_year?
+        start_time.year == end_time.year
+      end
+
       def display_map?
         maps_enabled? && !online? && model.address.present?
       end
diff --git a/decidim-meetings/app/cells/decidim/meetings/meeting_l/image.erb b/decidim-meetings/app/cells/decidim/meetings/meeting_l/image.erb
@@ -15,5 +15,9 @@
   </span>
   <span class="card__calendar-year">
     <span><%= l(meeting.start_time, format: "%Y") %></span>
+    <% unless same_year? %>
+      <span class="card__calendar-separator">-</span>
+      <span><%= l(meeting.end_time, format: "%Y") %></span>
+    <% end %>
   </span>
 </time>
diff --git a/decidim-meetings/app/cells/decidim/meetings/meeting_l_cell.rb b/decidim-meetings/app/cells/decidim/meetings/meeting_l_cell.rb
@@ -48,6 +48,12 @@ def same_day?
         meeting.start_time.to_date == meeting.end_time.to_date
       end
 
+      def same_year?
+        return true if meeting.end_time.blank?
+
+        meeting.start_time.year == meeting.end_time.year
+      end
+
       def metadata_cell
         "decidim/meetings/meeting_card_metadata"
       end
diff --git a/decidim-meetings/spec/cells/decidim/meetings/dates_and_map_cell_spec.rb b/decidim-meetings/spec/cells/decidim/meetings/dates_and_map_cell_spec.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Meetings
+  describe DatesAndMapCell, type: :cell do
+    controller Decidim::Meetings::MeetingsController
+
+    subject { my_cell.call }
+
+    let!(:meeting) { create(:meeting, :published, start_time: Time.new(2020, 10, 15, 10, 4, 5, 0), end_time: Time.new(2020, 10, 15, 12, 0, 0, 0)) }
+    let(:my_cell) { cell("decidim/meetings/dates_and_map", meeting) }
+
+    context "when rendering" do
+      it "renders the calendar container" do
+        expect(subject).to have_css(".meeting__calendar-container")
+      end
+
+      it "shows the start time's month" do
+        expect(subject).to have_css(".meeting__calendar-month", text: "October")
+      end
+
+      it "shows the start time's day" do
+        expect(subject).to have_css(".meeting__calendar-day", text: "15")
+      end
+
+      it "shows the start time's year" do
+        expect(subject).to have_css(".meeting__calendar-year", text: "2020")
+      end
+
+      it "does not show separator" do
+        expect(subject).to have_no_css(".meeting__calendar-separator")
+      end
+    end
+
+    context "when meeting spans multiple days in the same month" do
+      let!(:meeting) { create(:meeting, :published, start_time: Time.new(2020, 10, 15, 10, 0, 0, 0), end_time: Time.new(2020, 10, 17, 12, 0, 0, 0)) }
+
+      it "shows the start day" do
+        expect(subject).to have_css(".meeting__calendar-day", text: "15")
+      end
+
+      it "shows the end day" do
+        expect(subject).to have_css(".meeting__calendar-day", text: "17")
+      end
+
+      it "shows the separator" do
+        expect(subject).to have_css(".meeting__calendar-separator")
+      end
+    end
+
+    context "when meeting spans multiple months" do
+      let!(:meeting) { create(:meeting, :published, start_time: Time.new(2020, 10, 15, 10, 0, 0, 0), end_time: Time.new(2020, 11, 17, 12, 0, 0, 0)) }
+
+      it "shows the start month" do
+        expect(subject).to have_css(".meeting__calendar-month", text: "Oct")
+      end
+
+      it "shows the end month" do
+        expect(subject).to have_css(".meeting__calendar-month", text: "Nov")
+      end
+
+      it "shows the start day" do
+        expect(subject).to have_css(".meeting__calendar-day", text: "15")
+      end
+
+      it "shows the end day" do
+        expect(subject).to have_css(".meeting__calendar-day", text: "17")
+      end
+
+      it "shows month separator" do
+        expect(subject).to have_css(".meeting__calendar-separator")
+      end
+    end
+
+    context "when meeting spans multiple years" do
+      let!(:meeting) { create(:meeting, :published, start_time: Time.new(2020, 12, 15, 10, 0, 0, 0), end_time: Time.new(2021, 1, 17, 12, 0, 0, 0)) }
+
+      it "shows the start year" do
+        expect(subject).to have_css(".meeting__calendar-year", text: "2020")
+      end
+
+      it "shows the end year" do
+        expect(subject).to have_css(".meeting__calendar-year", text: "2021")
+      end
+
+      it "shows the separator" do
+        expect(subject).to have_css(".meeting__calendar-separator")
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/cells/decidim/meetings/meeting_l_cell_spec.rb b/decidim-meetings/spec/cells/decidim/meetings/meeting_l_cell_spec.rb
@@ -94,6 +94,22 @@ module Decidim::Meetings
       end
     end
 
+    context "when meeting spans multiple years" do
+      let!(:meeting) { create(:meeting, :published, start_time: Time.new(2020, 12, 15, 10, 0, 0, 0), end_time: Time.new(2021, 1, 17, 12, 0, 0, 0)) }
+
+      it "shows the start year" do
+        expect(subject).to have_css(".card__calendar-year", text: "2020")
+      end
+
+      it "shows the end year" do
+        expect(subject).to have_css(".card__calendar-year", text: "2021")
+      end
+
+      it "shows the separator" do
+        expect(subject).to have_css(".card__calendar-separator")
+      end
+    end
+
     context "when title contains special html entities" do
       let!(:original_title) { meeting.title["en"] }
 
