From d5b13a80309ca5fa080aec1a154f5f6000f799db Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 10 Feb 2025 12:08:09 -0600 Subject: [PATCH] Display counts for Added and Popped columns --- app/helpers/events_helper.rb | 17 ++++++++++++++--- app/views/events/_day.html.erb | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 3f4f2ca0e..82db8dc4a 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -43,9 +43,20 @@ module EventsHelper end.flatten) end - def render_column_headers - [ "Touched", "Discussed", "Added", "Popped" ].map do |header| - content_tag(:h3, header, class: "event__grid-column-title margin-block-end-half position-sticky") + def render_column_headers(day = Date.current) + start_time = day.beginning_of_day + end_time = day.end_of_day + + headers = { + "Touched" => nil, + "Discussed" => nil, + "Added" => Event.where(action: "published", created_at: start_time..end_time).count, + "Popped" => Event.where(action: "popped", created_at: start_time..end_time).count + } + + headers.map do |header, count| + title = count&.positive? ? "#{header} (#{count})" : header + content_tag(:h3, title, class: "event__grid-column-title margin-block-end-half position-sticky") end.join.html_safe end diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb index 4fad45f30..f87b2babf 100644 --- a/app/views/events/_day.html.erb +++ b/app/views/events/_day.html.erb @@ -4,7 +4,7 @@

<%= event_day_title(activity_day) %>

- <%= render_column_headers %> + <%= render_column_headers(activity_day) %> <%= render_event_grid_cells(activity_day) %> <% events.each do | hour_column, cluster| %>