decidim-meetings 0.24.3 → 0.25.0.rc4

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

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This command is executed when the user changes a Questionnaire from the admin
+      # panel.
+      class UpdateQuestionnaire < Rectify::Command
+        # Initializes a UpdateQuestionnaire Command.
+        #
+        # form - The form from which to get the data.
+        # questionnaire - The current instance of the questionnaire to be updated.
+        def initialize(form, questionnaire)
+          @form = form
+          @questionnaire = questionnaire
+        end
+
+        # Updates the questionnaire if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if @form.invalid?
+
+          Decidim::Meetings::Questionnaire.transaction do
+            create_questionnaire_for
+            create_questionaire
+            if @questionnaire.questions_editable?
+              update_questionnaire_questions
+              delete_answers
+            end
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        def create_questionnaire_for
+          @questionnaire.questionnaire_for.save! if @questionnaire.questionnaire_for.new_record?
+        end
+
+        def create_questionaire
+          @questionnaire.save! if @questionnaire.new_record?
+        end
+
+        def update_questionnaire_questions
+          @form.questions.each do |form_question|
+            update_questionnaire_question(form_question)
+          end
+        end
+
+        def update_questionnaire_question(form_question)
+          question_attributes = {
+            body: form_question.body,
+            position: form_question.position,
+            question_type: form_question.question_type,
+            max_choices: form_question.max_choices
+          }
+
+          update_nested_model(form_question, question_attributes, @questionnaire.questions) do |question|
+            form_question.answer_options.each do |form_answer_option|
+              answer_option_attributes = {
+                body: form_answer_option.body
+              }
+
+              update_nested_model(form_answer_option, answer_option_attributes, question.answer_options)
+            end
+          end
+        end
+
+        def update_nested_model(form, attributes, parent_association)
+          record = parent_association.find_by(id: form.id) || parent_association.build(attributes)
+
+          yield record if block_given?
+
+          if record.persisted?
+            if form.deleted?
+              record.destroy!
+            else
+              record.update!(attributes)
+            end
+          else
+            record.save!
+          end
+        end
+
+        def delete_answers
+          @questionnaire.answers.destroy_all
+        end
+      end
+    end
+  end
+end

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

@@ -41,7 +41,9 @@ module Decidim
           form.current_user
         ) do
           meeting.update!(
+            attendees_count: form.attendees_count,
             closed_at: form.closed_at,
+            closing_visible: true,
             closing_report: { I18n.locale => parsed_closing_report }
           )
         end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when the user creates an Answer in a meeting poll.
+    class CreateAnswer < Rectify::Command
+      def initialize(form, current_user, questionnaire)
+        @form = form
+        @current_user = current_user
+        @questionnaire = questionnaire
+      end
+
+      # Creates the answer if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          answer_question
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :form, :answer
+
+      def invalid?
+        form.invalid?
+      end
+
+      def answer_question
+        answer = Answer.new(
+          user: @current_user,
+          questionnaire: @questionnaire,
+          question: form.question
+        )
+
+        form.selected_choices.each do |choice|
+          answer.choices.build(
+            body: choice.body,
+            decidim_answer_option_id: choice.answer_option_id
+          )
+        end
+
+        answer.save!
+      end
+    end
+  end
+end

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

@@ -52,7 +52,9 @@ module Decidim
           registration_terms: { I18n.locale => form.registration_terms },
           registrations_enabled: form.registrations_enabled,
           type_of_meeting: form.clean_type_of_meeting,
-          component: form.current_component
+          component: form.current_component,
+          published_at: Time.current,
+          show_embedded_iframe: form.show_embedded_iframe
         }
 
         @meeting = Decidim.traceability.create!(

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

@@ -55,7 +55,8 @@ module Decidim
         @registration = Decidim::Meetings::Registration.create!(
           meeting: meeting,
           user: user,
-          user_group: user_group
+          user_group: user_group,
+          public_participation: registration_form.public_participation
         )
       end
 

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

@@ -62,7 +62,8 @@ module Decidim
             registration_terms: { I18n.locale => form.registration_terms },
             registrations_enabled: form.registrations_enabled,
             type_of_meeting: form.clean_type_of_meeting,
-            online_meeting_url: form.online_meeting_url
+            online_meeting_url: form.online_meeting_url,
+            show_embedded_iframe: form.show_embedded_iframe
           },
           visibility: "public-only"
         )

data/app/controllers/concerns/decidim/meetings/admin/filterable.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Meetings
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          helper Decidim::Meetings::Admin::FilterableHelper
+
+          private
+
+          def base_query
+            Meeting.not_hidden.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
+          end
+
+          def filters
+            [
+              :type_eq,
+              :is_upcoming_true,
+              :scope_id_eq,
+              :category_id_eq,
+              :origin_eq,
+              :closed_at_present
+            ]
+          end
+
+          def filters_with_values
+            {
+              type_eq: meeting_types,
+              scope_id_eq: scope_ids_hash(scopes.top_level),
+              category_id_eq: category_ids_hash(categories.first_class),
+              closed_at_present: %w(true false),
+              is_upcoming_true: %w(true false),
+              origin_eq: %w(citizen official user_group)
+            }
+          end
+
+          def search_field_predicate
+            :id_string_or_title_cont
+          end
+
+          def meeting_types
+            Meeting::TYPE_OF_MEETING
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/meetings/polls_resources.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This module, when injected into a controller, loads all the resources
+    # to display and interact with meeting polls.
+    module PollsResources
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :meeting, :poll, :questionnaire
+      end
+
+      private
+
+      def meeting
+        @meeting ||= Meeting.not_hidden.where(component: current_component).find(params[:meeting_id])
+      end
+
+      def poll
+        @poll ||= meeting&.poll
+      end
+
+      def questionnaire
+        @questionnaire ||= Decidim::Meetings::Questionnaire.find_by(questionnaire_for: poll) if poll
+      end
+    end
+  end
+end

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

@@ -10,15 +10,19 @@ module Decidim
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Components::BaseController
         helper Decidim::ApplicationHelper
-        helper_method :meetings, :meeting
+        helper_method :meetings, :meeting, :maps_enabled?
 
         def meetings
-          @meetings ||= Meeting.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
+          @meetings ||= Meeting.not_hidden.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
         end
 
         def meeting
           @meeting ||= meetings.find(params[:id]) if params[:id]
         end
+
+        def maps_enabled?
+          @maps_enabled ||= current_component.settings.maps_enabled?
+        end
       end
     end
   end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Meetings
     module Admin

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This controller allows an admin to manage meetings from a Participatory Process
       class MeetingClosesController < Admin::ApplicationController
-        include Decidim::Proposals::Admin::Picker
+        include Decidim::Proposals::Admin::Picker if Decidim::Meetings.enable_proposal_linking
 
         helper_method :meeting
 

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # This controller allows an admin to manage meetings from a Participatory Process
       class MeetingsController < Admin::ApplicationController
+        include Decidim::Meetings::Admin::Filterable
+
         helper_method :blank_service
 
         def new
@@ -61,7 +63,6 @@ module Decidim
           Decidim::Meetings::Admin::DestroyMeeting.call(meeting, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("meetings.destroy.success", scope: "decidim.meetings.admin")
-
               redirect_to meetings_path
             end
 
@@ -77,8 +78,52 @@ module Decidim
           end
         end
 
+        def publish
+          enforce_permission_to :update, :meeting, meeting: meeting
+
+          Decidim::Meetings::Admin::PublishMeeting.call(meeting, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("meetings.publish.success", scope: "decidim.meetings.admin")
+              redirect_to meetings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("meetings.publish.invalid", scope: "decidim.meetings.admin")
+              render action: "index"
+            end
+          end
+        end
+
+        def unpublish
+          enforce_permission_to :update, :meeting, meeting: meeting
+
+          Decidim::Meetings::Admin::UnpublishMeeting.call(meeting, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("meetings.unpublish.success", scope: "decidim.meetings.admin")
+              redirect_to meetings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("meetings.unpublish.invalid", scope: "decidim.meetings.admin")
+              render action: "index"
+            end
+          end
+        end
+
         private
 
+        def meetings
+          @meetings ||= filtered_collection
+        end
+
+        def meeting
+          @meeting ||= meetings.find(params[:id])
+        end
+
+        def collection
+          @collection ||= Meeting.where(component: current_component).published.not_hidden
+        end
+
         def meeting_form
           form(Decidim::Meetings::Admin::MeetingForm)
         end

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

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      class MeetingsPollController < Admin::ApplicationController
+        include Decidim::TranslatableAttributes
+
+        helper_method :questionnaire_for, :questionnaire, :blank_question, :blank_answer_option,
+                      :question_types, :update_url, :answer_options_url, :edit_questionnaire_title,
+                      :meeting, :poll
+
+        helper Decidim::Forms::Admin::ApplicationHelper
+
+        def edit
+          enforce_permission_to :update, :poll, meeting: meeting, poll: poll
+
+          @form = form(Admin::QuestionnaireForm).from_model(questionnaire)
+
+          render template: "decidim/meetings/admin/poll/edit"
+        end
+
+        def update
+          enforce_permission_to :update, :poll, meeting: meeting, poll: poll
+
+          @form = form(Admin::QuestionnaireForm).from_params(params)
+
+          Admin::UpdateQuestionnaire.call(@form, questionnaire) do
+            on(:ok) do
+              # i18n-tasks-use t("decidim.forms.admin.questionnaires.update.success")
+              flash[:notice] = I18n.t("update.success", scope: "decidim.meetings.admin.meetings_poll")
+              redirect_to after_update_url
+            end
+
+            on(:invalid) do
+              # i18n-tasks-use t("decidim.forms.admin.questionnaires.update.invalid")
+              flash.now[:alert] = I18n.t("update.invalid", scope: "decidim.meetings.admin.meetings_poll")
+              render template: "decidim/meetings/admin/poll/edit"
+            end
+          end
+        end
+
+        def answer_options
+          respond_to do |format|
+            format.json do
+              question_id = params["id"]
+              question = Decidim::Meetings::Question.find_by(id: question_id)
+              render json: question.answer_options.map { |answer_option| AnswerOptionPresenter.new(answer_option).as_json } if question.present?
+            end
+          end
+        end
+
+        def questionnaire_for
+          poll
+        end
+
+        # Returns the url to get the answer options json (for the display conditions form)
+        # for the question with id = params[:id]
+        def answer_options_url(params)
+          url_for([questionnaire.questionnaire_for, { action: :answer_options, format: :json, **params }])
+        end
+
+        # Implement this method in your controller to set the title
+        # of the edit form.
+        def edit_questionnaire_title
+          t(:title, scope: "decidim.meetings.admin.meetings_poll.form", questionnaire_for: translated_attribute(meeting.try(:title)))
+        end
+
+        private
+
+        def questionnaire
+          @questionnaire ||= Decidim::Meetings::Questionnaire.find_or_initialize_by(questionnaire_for: questionnaire_for)
+        end
+
+        def blank_question
+          @blank_question ||= Decidim::Meetings::Admin::QuestionForm.new
+        end
+
+        def blank_answer_option
+          @blank_answer_option ||= Decidim::Meetings::Admin::AnswerOptionForm.new
+        end
+
+        def question_types
+          @question_types ||= Decidim::Meetings::Poll::QUESTION_TYPES.map do |question_type|
+            [question_type, I18n.t("decidim.forms.question_types.#{question_type}")]
+          end
+        end
+
+        def update_url
+          meeting_poll_path(meeting_id: meeting.id)
+        end
+
+        def after_update_url
+          edit_meeting_poll_path(meeting_id: meeting.id)
+        end
+
+        def meeting
+          @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
+        end
+
+        def poll
+          @poll ||= Poll.find_or_initialize_by(meeting: meeting)
+        end
+      end
+    end
+  end
+end

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

@@ -14,8 +14,16 @@ module Decidim
         render plain: CalendarRenderer.for(current_component), content_type: "type/calendar"
       end
 
+      def meeting_calendar
+        send_data CalendarRenderer.for(meeting), content_type: "type/calendar", filename: "#{meeting.reference}.ics"
+      end
+
       private
 
+      def meeting
+        @meeting ||= Decidim::Meetings::Meeting.where(component: current_component).find(params[:id])
+      end
+
       def set_default_request_format
         request.format = :text
       end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # Exposes the live event of the meeting
+    class LiveEventsController < Decidim::Meetings::ApplicationController
+      layout "decidim/meetings/layouts/live_event"
+
+      include Decidim::Meetings::PollsResources
+
+      helper_method :live_meeting_embed_code
+
+      def show
+        raise ActionController::RoutingError, "Not Found" unless meeting
+
+        return if meeting.current_user_can_visit_meeting?(current_user)
+
+        flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
+        redirect_to(ResourceLocatorPresenter.new(meeting).index)
+      end
+
+      private
+
+      def live_meeting_embed_code
+        MeetingIframeEmbedder.new(meeting.online_meeting_url).embed_code(request.host)
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This controller allows a participant to update the closing_report and the linked proposals of a closed meeting
     class MeetingClosesController < Decidim::Meetings::ApplicationController
-      include Decidim::Proposals::Admin::Picker
+      include Decidim::Proposals::Admin::Picker if Decidim::Meetings.enable_proposal_linking
       include FormFactory
 
       helper_method :meeting

data/app/controllers/decidim/meetings/polls/answers_controller.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Polls
+      class AnswersController < Decidim::Meetings::ApplicationController
+        include Decidim::Meetings::PollsResources
+        include FormFactory
+
+        helper_method :question
+
+        def create
+          enforce_permission_to :create, :answer, question: question
+          @form = form(AnswerForm).from_params(params, question: question, current_user: current_user)
+
+          CreateAnswer.call(@form, current_user, questionnaire) do
+            # Both :ok and :invalid render the same template, because
+            # validation errors are displayed in the template
+            respond_to do |format|
+              format.js
+            end
+          end
+        end
+
+        private
+
+        def question
+          @question ||= questionnaire.questions.find(answer_params[:question_id]) if questionnaire
+        end
+
+        def answer_params
+          params.require(:answer).permit(:question_id, choices: [:body, :answer_option_id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/polls/questions_controller.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Polls
+      class QuestionsController < Decidim::Meetings::ApplicationController
+        include Decidim::Meetings::PollsResources
+
+        def index
+          respond_to do |format|
+            format.js do
+              render template: pick_index_template, locals: { open_question: nil }
+            end
+          end
+        end
+
+        def update
+          enforce_permission_to :update, :question, question: question
+
+          Decidim::Meetings::Admin::UpdateQuestionStatus.call(question, current_user) do
+            respond_to do |format|
+              format.js do
+                render template: admin_index_template, locals: { open_question: question.id }
+              end
+            end
+          end
+        end
+
+        private
+
+        def question
+          @question ||= questionnaire.questions.find(params[:id]) if questionnaire
+        end
+
+        def admin_index_template
+          "decidim/meetings/polls/questions/index_admin"
+        end
+
+        def pick_index_template
+          params[:admin] ? admin_index_template : "decidim/meetings/polls/questions/index"
+        end
+      end
+    end
+  end
+end

data/app/events/decidim/meetings/create_meeting_event.rb

@@ -3,9 +3,25 @@
 module Decidim
   module Meetings
     class CreateMeetingEvent < Decidim::Events::SimpleEvent
+      delegate :organization, to: :user, prefix: false
+
       def resource_text
         translated_attribute(resource.description)
       end
+
+      def button_text
+        I18n.t("meeting_created.button_text", scope: "decidim.events.meetings") if resource.can_be_joined_by?(user)
+      end
+
+      def button_url
+        if resource.can_be_joined_by?(user)
+          if resource.registration_form_enabled?
+            Decidim::EngineRouter.main_proxy(component).join_meeting_registration_url(meeting_id: resource.id, host: organization.host)
+          else
+            Decidim::EngineRouter.main_proxy(component).meeting_url(id: resource.id, host: organization.host)
+          end
+        end
+      end
     end
   end
 end

data/app/forms/decidim/meetings/admin/answer_option_form.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to update answer options
+      class AnswerOptionForm < Decidim::Form
+        include TranslatableAttributes
+
+        attribute :deleted, Boolean, default: false
+
+        translatable_attribute :body, String
+
+        validates :body, translatable_presence: true, unless: :deleted
+
+        def to_param
+          return id if id.present?
+
+          "questionnaire-question-answer-option-id"
+        end
+      end
+    end
+  end
+end