decidim-meetings 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b44daa20d879fb3407ca22edb47463ee033f78d64eae5e58c8b269378844b9ac
-  data.tar.gz: 5657bacbd1860d53aeb47f1de52856d199c02ddca552c1cfbd98d9ce4f706cc6
+  metadata.gz: 0141ff66e04ed850c0ee2064f0c92becffee8f3347fcf6e7af0afb942a58590a
+  data.tar.gz: e88e8dfc58316a371b9a0c682660c6e9183dc268dc64f8ac9b63ad8c9ef9d4c2
 SHA512:
-  metadata.gz: 99794f0b0d024392a292e79b66f077942ae5e4c3e1d70c4c4f1137ba40b5e991e2733704d0a1685ef8618f8a3526c7bbac660476e2af180991259a53a42ac66a
-  data.tar.gz: '079896e8fe682cbd49ef7866a6107764a10d62a040d394a07ab7bad8705e6c269a958edaf6c328c1541ddc584da9af6bbf4d4441b00c6d2b420fa4490c796b60'
+  metadata.gz: 1157967e5342d9184c9896affdba244cb8e131f4b26f8aa1ade346c9e48f8d6b637dfa98347166f246e9b60b051933a4e781e93f1bd57789e8158c2a0921e5a9
+  data.tar.gz: f64250e3bdf35fe0cbc72a83c1712f25ad1696effc9f8ced8c7f4c73bf1048ae32814923ce5b7797208f8e42b8f5547e097ad7322253e8c10c372d7bbf51e31e

data/app/cells/decidim/meetings/highlighted_meetings/show.erb

@@ -0,0 +1,3 @@
+<% published_components.each do |component| %>
+  <%= cell "decidim/meetings/highlighted_meetings_for_component", component %>
+<% end %>

data/app/cells/decidim/meetings/highlighted_meetings_cell.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Meetings
+    # This cell renders the highlighted meetings for a given participatory
+    # space. It is intended to be used in the `participatory_space_highlighted_elements`
+    # view hook.
+    class HighlightedMeetingsCell < Decidim::ViewModel
+      include MeetingCellsHelper
+
+      private
+
+      def published_components
+        Decidim::Component
+          .where(
+            participatory_space: model,
+            manifest_name: :meetings
+          )
+          .published
+      end
+    end
+  end
+end

data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb

@@ -0,0 +1,33 @@
+<% if upcoming_meetings.any? %>
+  <div class="section row collapse upcoming_meetings">
+    <h4 class="section-heading">
+      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.upcoming_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count) %></a>
+    </h4>
+    <div class="card card--list">
+      <% upcoming_meetings.each do |meeting| %>
+        <%= card_for meeting, size: :list_item %>
+      <% end %>
+    </div>
+    <%= link_to(
+      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count),
+      main_component_path(model),
+      class: "button button--sc light secondary button--right"
+    ) %>
+  </div>
+<% elsif past_meetings.any? %>
+  <div class="section row collapse past_meetings">
+    <h4 class="section-heading">
+      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.past_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count) %></a>
+    </h4>
+    <div class="card card--list">
+      <% past_meetings.each do |meeting| %>
+        <%= card_for meeting, size: :list_item %>
+      <% end %>
+    </div>
+    <%= link_to(
+      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count),
+      main_component_path(model),
+      class: "button button--sc light secondary button--right"
+    ) %>
+  </div>
+<% end %>

data/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Meetings
+    # This cell renders the highlighted meetings for a given component.
+    # It is intended to be used in the `participatory_space_highlighted_elements`
+    # view hook.
+    class HighlightedMeetingsForComponentCell < Decidim::ViewModel
+      include Decidim::ComponentPathHelper
+      include Decidim::CardHelper
+
+      def show
+        render unless meetings_count.zero?
+      end
+
+      private
+
+      def meetings
+        @meetings ||= Decidim::Meetings::Meeting.where(component: model)
+      end
+
+      def past_meetings
+        @past_meetings ||= meetings.past.order(end_time: :desc, start_time: :desc).limit(3)
+      end
+
+      def upcoming_meetings
+        @upcoming_meetings ||= meetings.upcoming.order(:start_time, :end_time).limit(3)
+      end
+
+      def meetings_count
+        @meetings_count ||= meetings.count
+      end
+    end
+  end
+end

data/app/cells/decidim/meetings/join_meeting_button/show.erb

@@ -12,16 +12,25 @@
       <%= t("going", scope: "decidim.meetings.meetings.show") %>
     <% end %>
   <% else %>
-    <%= render :registration_confirm %>
-    <%= action_authorized_button_to(
-      :join,
-      i18n_join_text,
-      "",
-      resource: model,
-      class: button_classes,
-      disabled: !model.has_available_slots?,
-      data: { open: current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" }
-    ) %>
+    <% if model.registration_form_enabled? %>
+      <%= action_authorized_link_to(
+        :join,
+        i18n_join_text,
+        join_meeting_registration_path(model),
+        class: button_classes,
+        disabled: !model.has_available_slots?,
+      ) %>
+    <% else %>
+      <%= render :registration_confirm %>
+      <%= action_authorized_button_to(
+        :join,
+        i18n_join_text,
+        "",
+        class: button_classes,
+        disabled: !model.has_available_slots?,
+        data: { open: current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" }
+      ) %>
+    <% end %>
   <% end %>
   <% if shows_remaining_slots? %>
     <span><%= t("remaining_slots", scope: "decidim.meetings.meetings.show", count: model.remaining_slots) %></span>

data/app/commands/decidim/meetings/admin/close_meeting.rb

@@ -52,7 +52,8 @@ module Decidim
             event: "decidim.events.meetings.meeting_closed",
             event_class: Decidim::Meetings::CloseMeetingEvent,
             resource: meeting,
-            recipient_ids: meeting.followers.pluck(:id)
+            affected_users: [meeting.organizer],
+            followers: meeting.followers - [meeting.organizer]
           )
         end
 

data/app/commands/decidim/meetings/admin/copy_meeting.rb

@@ -76,7 +76,7 @@ module Decidim
             event: "decidim.events.meetings.meeting_created",
             event_class: Decidim::Meetings::CreateMeetingEvent,
             resource: @copied_meeting,
-            recipient_ids: @copied_meeting.participatory_space.followers.pluck(:id)
+            followers: @copied_meeting.participatory_space.followers
           )
         end
       end

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -47,7 +47,8 @@ module Decidim
             transparent: @form.transparent,
             organizer: @form.organizer,
             registration_terms: @form.current_component.settings.default_registration_terms,
-            component: @form.current_component
+            component: @form.current_component,
+            questionnaire: Decidim::Forms::Questionnaire.new
           }
 
           @meeting = Decidim.traceability.create!(
@@ -71,7 +72,7 @@ module Decidim
             event: "decidim.events.meetings.meeting_created",
             event_class: Decidim::Meetings::CreateMeetingEvent,
             resource: @meeting,
-            recipient_ids: @meeting.participatory_space.followers.pluck(:id)
+            followers: @meeting.participatory_space.followers
           )
         end
       end

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -64,7 +64,7 @@ module Decidim
             event: "decidim.events.meetings.meeting_updated",
             event_class: Decidim::Meetings::UpdateMeetingEvent,
             resource: meeting,
-            recipient_ids: meeting.followers.pluck(:id)
+            followers: meeting.followers
           )
         end
 

data/app/commands/decidim/meetings/admin/update_registrations.rb

@@ -33,6 +33,7 @@ module Decidim
 
         def update_meeting_registrations
           meeting.registrations_enabled = form.registrations_enabled
+          meeting.registration_form_enabled = form.registration_form_enabled
 
           if form.registrations_enabled
             meeting.available_slots = form.available_slots
@@ -48,7 +49,7 @@ module Decidim
             event: "decidim.events.meetings.registrations_enabled",
             event_class: Decidim::Meetings::MeetingRegistrationsEnabledEvent,
             resource: meeting,
-            recipient_ids: meeting.followers.pluck(:id)
+            followers: meeting.followers
           )
         end
 

data/app/commands/decidim/meetings/admin/validate_registration_code.rb

@@ -39,7 +39,7 @@ module Decidim
             event: "decidim.events.meetings.registration_code_validated",
             event_class: Decidim::Meetings::RegistrationCodeValidatedEvent,
             resource: meeting,
-            recipient_ids: [form.registration.user.id],
+            affected_users: [form.registration.user],
             extra: {
               registration: form.registration
             }

data/app/commands/decidim/meetings/join_meeting.rb

@@ -8,9 +8,11 @@ module Decidim
       #
       # meeting - The current instance of the meeting to be joined.
       # user - The user joining the meeting.
-      def initialize(meeting, user)
+      # registration_form - The questionnaire filled by the attendee
+      def initialize(meeting, user, registration_form = nil)
         @meeting = meeting
         @user = user
+        @registration_form = registration_form
       end
 
       # Creates a meeting registration if the meeting has registrations enabled
@@ -20,10 +22,17 @@ module Decidim
       def call
         meeting.with_lock do
           return broadcast(:invalid) unless can_join_meeting?
+
+          if registration_form
+            return broadcast(:invalid_form) unless registration_form.valid?
+            save_registration_form
+          end
+
           create_registration
           accept_invitation
           send_email_confirmation
-          send_notification
+          send_notification_confirmation
+          notify_admin_over_percentage
           increment_score
         end
         broadcast(:ok)
@@ -31,12 +40,16 @@ module Decidim
 
       private
 
-      attr_reader :meeting, :user, :registration
+      attr_reader :meeting, :user, :registration, :registration_form
 
       def accept_invitation
         meeting.invites.find_by(user: user)&.accept!
       end
 
+      def save_registration_form
+        Decidim::Forms::AnswerQuestionnaire.call(registration_form, user, meeting.questionnaire)
+      end
+
       def create_registration
         @registration = Decidim::Meetings::Registration.create!(meeting: meeting, user: user)
       end
@@ -46,14 +59,30 @@ module Decidim
       end
 
       def send_email_confirmation
-        Decidim::Meetings::RegistrationMailer.confirmation(user, meeting, registration).deliver_later
+        Decidim::Meetings::RegistrationMailer.confirmation(
+          @user,
+          @meeting,
+          @registration
+        ).deliver_now
+      end
+
+      def send_notification_confirmation
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_registration_confirmed",
+          event_class: Decidim::Meetings::MeetingRegistrationNotificationEvent,
+          resource: @meeting,
+          affected_users: [@user],
+          extra: {
+            registration_code: @registration.code
+          }
+        )
       end
 
       def participatory_space_admins
         @meeting.component.participatory_space.admins
       end
 
-      def send_notification
+      def notify_admin_over_percentage
         return send_notification_over(0.5) if occupied_slots_over?(0.5)
         return send_notification_over(0.8) if occupied_slots_over?(0.8)
         send_notification_over(1.0) if occupied_slots_over?(1.0)
@@ -64,7 +93,7 @@ module Decidim
           event: "decidim.events.meetings.meeting_registrations_over_percentage",
           event_class: Decidim::Meetings::MeetingRegistrationsOverPercentageEvent,
           resource: @meeting,
-          recipient_ids: participatory_space_admins.pluck(:id),
+          affected_users: participatory_space_admins,
           extra: {
             percentage: percentage
           }

data/app/commands/decidim/meetings/leave_meeting.rb

@@ -21,6 +21,7 @@ module Decidim
         @meeting.with_lock do
           return broadcast(:invalid) unless registration
           destroy_registration
+          destroy_questionnaire_answers
           decrement_score
         end
         broadcast(:ok)
@@ -36,6 +37,15 @@ module Decidim
         registration.destroy!
       end
 
+      def questionnaire_answers
+        questionnaire = Decidim::Forms::Questionnaire.find_by(questionnaire_for_id: @meeting)
+        questionnaire.answers.where(user: @user)
+      end
+
+      def destroy_questionnaire_answers
+        questionnaire_answers.destroy_all
+      end
+
       def decrement_score
         Decidim::Gamification.decrement_score(@user, :attended_meetings)
       end

data/app/controllers/decidim/meetings/admin/registration_form_controller.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This controller allows an admin to manage the form to be filled when an user joins the meeting
+      class RegistrationFormController < Admin::ApplicationController
+        include Decidim::Forms::Admin::Concerns::HasQuestionnaire
+
+        def questionnaire_for
+          meeting
+        end
+
+        def update_url
+          meeting_registrations_form_path(meeting_id: meeting.id)
+        end
+
+        def after_update_url
+          edit_meeting_registrations_path(meeting_id: meeting.id)
+        end
+
+        private
+
+        def meeting
+          @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/calendars_controller.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # Exposes the meeting resources as an .ics file so users can import them
+    # to their favorite calendar app
+    class CalendarsController < Decidim::Meetings::ApplicationController
+      layout false
+      helper_method :meetings
+      before_action :set_default_request_format
+
+      def show
+        render plain: CalendarRenderer.for(current_component), content_type: "type/calendar"
+      end
+
+      private
+
+      def set_default_request_format
+        request.format = :text
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/directory/meetings_controller.rb

@@ -28,6 +28,10 @@ module Decidim
           @meeting_spaces = @meeting_spaces.prepend(["all", t(".all")])
         end
 
+        def calendar
+          render plain: CalendarRenderer.for(current_organization), content_type: "type/calendar"
+        end
+
         private
 
         def meetings

data/app/controllers/decidim/meetings/registrations_controller.rb

@@ -4,6 +4,31 @@ module Decidim
   module Meetings
     # Exposes the registration resource so users can join and leave meetings.
     class RegistrationsController < Decidim::Meetings::ApplicationController
+      include Decidim::Forms::Concerns::HasQuestionnaire
+
+      def answer
+        enforce_permission_to :join, :meeting, meeting: meeting
+
+        @form = form(Decidim::Forms::QuestionnaireForm).from_params(params)
+
+        JoinMeeting.call(meeting, current_user, @form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("registrations.create.success", scope: "decidim.meetings")
+            redirect_to after_answer_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("registrations.create.invalid", scope: "decidim.meetings")
+            render template: "decidim/forms/questionnaires/show"
+          end
+
+          on(:invalid_form) do
+            flash.now[:alert] = I18n.t("answer.invalid", scope: i18n_flashes_scope)
+            render template: "decidim/forms/questionnaires/show"
+          end
+        end
+      end
+
       def create
         enforce_permission_to :join, :meeting, meeting: meeting
 
@@ -52,6 +77,24 @@ module Decidim
         end
       end
 
+      def allow_answers?
+        meeting.registrations_enabled? && meeting.registration_form_enabled? && meeting.has_available_slots?
+      end
+
+      def after_answer_path
+        meeting_path(meeting)
+      end
+
+      # You can implement this method in your controller to change the URL
+      # where the questionnaire will be submitted.
+      def update_url
+        answer_meeting_registration_path(meeting_id: meeting.id)
+      end
+
+      def questionnaire_for
+        meeting
+      end
+
       private
 
       def meeting