From 828191d68331cba9762f3fcb3e3bc9e45d543177 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 13 Oct 2025 15:16:41 -0500 Subject: [PATCH] VRFS-5690 - tag jamtrack and jammers separetly on admin report - fix jammers view --- admin/app/admin/jammers_subscription_cohorts.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/app/admin/jammers_subscription_cohorts.rb b/admin/app/admin/jammers_subscription_cohorts.rb index d836bcf26..00a9223b5 100644 --- a/admin/app/admin/jammers_subscription_cohorts.rb +++ b/admin/app/admin/jammers_subscription_cohorts.rb @@ -52,8 +52,10 @@ ActiveAdmin.register_page "Jammers Subscription Cohorts" do ORDER BY j.created_at LIMIT 1 -- Select only that single row - ) j ON (j.created_at - users.created_at) >= INTERVAL '2 hours' }) - .group("date_trunc('month', users.created_at)").order("date_trunc('month', users.created_at) DESC") do |row| + ) j ON TRUE }) + .group("date_trunc('month', users.created_at)") + .where("j.created_at IS NULL OR (j.created_at - users.created_at) >= INTERVAL '2 hours'") + .order("date_trunc('month', users.created_at) DESC") do |row| column "Month", Proc.new { |user| user.month.strftime('%B %Y') } column "Total", :total column "Subscribed", Proc.new { |user| raw(Spacer.spacer(user.subscribed, user)) }