Add agenda list filters (#2538)

Author: njaeggi

app/controllers/agenda_controller.rb

@@ -9,41 +9,51 @@ class AgendaController < ApplicationController
   skip_before_action :authenticate_person!
   skip_authorization_check
 
-  layout "agenda"
+  before_action :set_default_type_filter, only: :index
+  before_action :set_default_date_range_filter, only: :index, unless: :turbo_frame_request?
+  before_action :preload_filter_select_options, only: :index, unless: :turbo_frame_request?
 
-  helper_method :group, :events, :event
+  layout -> { turbo_frame_request? ? false : "agenda" }
+
+  helper_method :group, :events, :event, :event_filter
 
   def index
-    init_filter_values
+    if turbo_frame_request?
+      render partial: "agenda/list", locals: {events: events}
+    else
+      render :index
+    end
   end
 
   def show
   end
 
   private
 
-  def init_filter_values
-    set_date_range
-    set_event_type
+  def set_default_type_filter
+    params[:filters] ||= {}
+    params[:filters][:type] ||= {types: [Event::Tour.sti_name]}
   end
 
-  def set_date_range
+  def set_default_date_range_filter
     params[:filters] ||= {}
-    params[:filters][:date_range] ||= {
-      since: I18n.l(Time.zone.today.to_date)
-    }
+    params[:filters][:date_range] ||= {since: I18n.l(Time.zone.today.to_date)}
   end
 
-  def set_event_type
-    params[:filters] ||= {}
-    params[:filters][:type] ||= {types: ["Event::Tour"]}
+  def preload_filter_select_options
+    @target_groups = Event::TargetGroup.list.without_deleted
+    @activities = Event::Activity.list.without_deleted
+    @technical_requirements = Event::TechnicalRequirement.list.without_deleted
+    @fitness_requirements = Event::FitnessRequirement.list.without_deleted
   end
 
-  def events = @events ||= event_filter.entries.joins(:dates).order(dates: {start_at: :asc})
+  def event_filter
+    @event_filter ||= Events::Filter::AgendaList.new(nil, params)
+  end
 
-  def event_filter = @event_filter ||= Events::Filter::AgendaList.new(nil, params)
+  def events = @events ||= event_filter.entries.joins(:dates).order(dates: {start_at: :asc})
 
   def group = @group ||= params[:group_id].present? ? Group.find(params[:group_id]) : nil
 
-  def event = @event ||= events.find(params[:event_id])
+  def event = @event ||= event_filter.entries.find(params[:event_id])
 end

app/domain/events/filter/application_open.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2026, Schweizer Alpenclub SAC. This file is part of
+#  hitobito and licensed under the Affero General Public License version 3
+#  or later. See the COPYING file at the top-level directory or at
+#  https://github.com/hitobito/hitobito_sac_cas.
+
+module Events::Filter
+  class ApplicationOpen < Base
+    self.permitted_args = [:value]
+
+    def apply(scope)
+      scope.application_period_open
+    end
+
+    def blank?
+      args[:value].to_i != 1
+    end
+  end
+end

app/helpers/agenda_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2026, Schweizer Alpen-Club. This file is part of
+#  hitobito_sac_cas and licensed under the Affero General Public License version 3
+#  or later. See the COPYING file at the top-level directory or at
+#  https://github.com/hitobito/hitobito_sac_cas.
+
+module AgendaHelper
+  def show_places_available_filter?(group)
+    group.events.future.where(
+      state: %w[published ready closed canceled],
+      type: Event::Tour.sti_name,
+      display_booking_info: true
+    ).exists?
+  end
+end

app/javascript/controllers/agenda_filters_controller.js

@@ -0,0 +1,31 @@
+// Copyright (c) 2026, Hitobito AG. This file is part of
+// hitobito and licensed under the Affero General Public License version 3
+// or later. See the COPYING file at the top-level directory or at
+// https://github.com/hitobito/hitobito_sac_cas.
+
+import { Controller } from "@hotwired/stimulus";
+
+/*
+  Resets every filter field in the form to its true blank state (not the
+  server-rendered value the page loaded with) and re-submits, so the results
+  turbo frame refreshes with an unfiltered list. A field can opt out of
+  blanking via data-reset-value, e.g. the since date field resets to today
+  rather than to empty (see agenda/_date_filters).
+
+    data-controller="agenda-filters"
+    data-action="click->agenda-filters#reset"
+*/
+export default class extends Controller {
+  reset() {
+    this.element.querySelectorAll('input[type="text"]').forEach((input) => {
+      input.value = input.dataset.resetValue || "";
+    });
+    this.element.querySelectorAll('input[type="radio"]').forEach((radio) => {
+      radio.checked = radio.value === "0";
+    });
+    this.element.querySelectorAll("select[data-controller~='tom-select']").forEach((select) => {
+      if (select.tomselect) select.tomselect.clear();
+    });
+    this.element.requestSubmit();
+  }
+}

app/javascript/packs/agenda.js

@@ -2,5 +2,3 @@
 // hitobito and licensed under the Affero General Public License version 3
 // or later. See the COPYING file at the top-level directory or at
 // https://github.com/hitobito/hitobito.
-
-import '../stylesheets/agenda';

app/javascript/packs/agenda.scss.erb

@@ -0,0 +1,20 @@
+//  Copyright (c) 2026, Hitobito AG. This file is part of
+//  hitobito and licensed under the Affero General Public License version 3
+//  or later. See the COPYING file at the top-level directory or at
+//  https://github.com/hitobito/hitobito_sac_cas.
+
+// Bootstrap
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";
+@import "bootstrap/scss/maps";
+@import "bootstrap/scss/utilities";
+@import "bootstrap/scss/bootstrap";
+
+
+// Dependencies
+@import "~@fortawesome/fontawesome-free/css/all";
+@import "~tom-select/dist/css/tom-select.bootstrap5.css";
+
+// Custom Stylesheets
+@import "../stylesheets/agenda";
+@import "../../../../hitobito/app/javascript/stylesheets/hitobito/modules/ui-datepicker";

app/views/agenda/_application_filters.html.haml

@@ -0,0 +1,27 @@
+-# Copyright (c) 2026, Hitobito AG. This file is part of
+-# hitobito and licensed under the Affero General Public License version 3
+-# or later. See the COPYING file at the top-level directory or at
+-# https://github.com/hitobito/hitobito.
+
+.d-flex.flex-column
+  = f.fields_for(:application_open) do |ff|
+    %span.form-label= t(".application_open")
+    .d-flex.gap-3
+      %label.form-check-label
+        = ff.radio_button(:value, 1, checked: event_filter.chain.dig(:application_open, :value) == "1", class: "form-check-input")
+        = t("global.yes")
+      %label.form-check-label
+        = ff.radio_button(:value, 0, checked: event_filter.chain.dig(:application_open, :value) != "1", class: "form-check-input")
+        = t("global.no")
+
+- if show_places_available_filter?(group)
+  .d-flex.flex-column
+    = f.fields_for(:places_available) do |ff|
+      %span.form-label= t(".places_available")
+      .d-flex.gap-3
+        %label.form-check-label
+          = ff.radio_button(:value, 1, checked: event_filter.chain.dig(:places_available, :value) == "1", class: "form-check-input")
+          = t("global.yes")
+        %label.form-check-label
+          = ff.radio_button(:value, 0, checked: event_filter.chain.dig(:places_available, :value) != "1", class: "form-check-input")
+          = t("global.no")

app/views/agenda/_date_filters.html.haml

@@ -0,0 +1,16 @@
+-# Copyright (c) 2026, Hitobito AG. This file is part of
+-# hitobito and licensed under the Affero General Public License version 3
+-# or later. See the COPYING file at the top-level directory or at
+-# https://github.com/hitobito/hitobito.
+
+.d-flex.flex-column
+  = f.fields_for(:date_range) do |ff|
+    = ff.label(:since, t(".since"), class: "form-label")
+    = ff.text_field(:since, value: event_filter.chain.dig(:date_range, :since),
+      class: "date form-control form-control-sm",
+      data: {reset_value: I18n.l(Time.zone.today.to_date)})
+
+.d-flex.flex-column
+  = f.fields_for(:date_range) do |ff|
+    = ff.label(:until, t(".until"), class: "form-label")
+    = ff.text_field(:until, value: event_filter.chain.dig(:date_range, :until), class: "date form-control form-control-sm")

app/views/agenda/_event_card.html.haml

@@ -0,0 +1,27 @@
+-# Copyright (c) 2026, Hitobito AG. This file is part of
+-# hitobito and licensed under the Affero General Public License version 3
+-# or later. See the COPYING file at the top-level directory or at
+-# https://github.com/hitobito/hitobito.
+
+= turbo_frame_tag(:agenda_events_list, target: :_top) do
+  .alert.alert-info= t(".tours_found", count: events.count)
+
+  - events.each do |event|
+    %div
+      %div= event.id
+      %div= event.name
+      %div= I18n.l(event.start_at)
+      %div= event.total_duration_days
+
+      - if event.display_booking_info?
+        %div= "#{event.participant_count}/#{event.maximum_participants}"
+
+      %div= event.contact
+      %div= link_to t(".show_details"), agenda_show_path(group, event)
+
+      - if event.is_a?(Event::Tour)
+        %div= event.activities.join(", ")
+        %div= event.technical_requirements.join(", ")
+        %div= event.fitness_requirement
+        %div= event.target_groups.join(", ")
+        %div= "#{event.ascent} / #{event.descent} / #{event.duration_in_hours}"