diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css index 0f842f783..68c61d5a7 100644 --- a/app/assets/stylesheets/events.css +++ b/app/assets/stylesheets/events.css @@ -77,6 +77,7 @@ background-color: var(--color-canvas); grid-row-start: 2; inset-block-start: calc(var(--events-gap) * -2); + margin-block-end: var(--events-gap); padding-block: calc(var(--events-gap) * 3) var(--events-gap); position: sticky; z-index: var(--z-events-column-header); diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 820d94f6e..f19209a07 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -1,6 +1,5 @@ module EventsHelper - - def event_column_info(event_type, day_timeline) + def event_columns(event_type, day_timeline) case event_type when "added" events = day_timeline.events.where(action: "card_published") @@ -20,17 +19,11 @@ module EventsHelper { title: "Updated", index: 2, - events: day_timeline.events.where.not(action: ["card_published", "card_closed"]) + events: day_timeline.events.where.not(action: [ "card_published", "card_closed" ]) } end end - - - - - - def event_column(event) case event.action when "card_closed" @@ -54,27 +47,6 @@ module EventsHelper end end - def render_event_grid_cells(columns: 4, rows: 24) - safe_join((2..rows + 1).map do |row| - (1..columns).map do |col| - tag.div class: class_names("event__grid-item"), style: "grid-area: #{row}/#{col};" - end - end.flatten) - end - - def render_column_headers(day_timeline) - headers = { - "Added" => day_timeline.events.where(action: "card_published").count, - "Updated" => nil, - "Closed" => day_timeline.events.where(action: "card_closed").count - } - - headers.map do |header, count| - title = count&.positive? ? "#{header} (#{count})" : header - content_tag(:h3, title, class: "event__grid-column-title position-sticky") - end.join.html_safe - end - def event_action_sentence(event) if event.action.comment_created? comment_event_action_sentence(event) diff --git a/app/views/events/_day_timeline_column.html.erb b/app/views/events/_day_timeline_column.html.erb index e52079dd1..e93699848 100644 --- a/app/views/events/_day_timeline_column.html.erb +++ b/app/views/events/_day_timeline_column.html.erb @@ -1,4 +1,4 @@ -<% column = event_column_info(event_type, day_timeline) %> +<% column = event_columns(event_type, day_timeline) %>