decidim-meetings 0.24.3 → 0.25.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a92e6db66392bb715213783701f79426439c8d04ee7477bf0cbf53678a7ba37
-  data.tar.gz: c11f7df32e7fdbe012b1b4f5a7c2887c8734a3fc94d5196b5fbb2045c0117cb7
+  metadata.gz: ab6b8251a715062c189020553bfb57757740cbd1ffa121296885058b0fb8d9f6
+  data.tar.gz: 68cb83595a3308d8746bba38e1044d0e0bbc2c86ad1d55b0ffb65537d510b501
 SHA512:
-  metadata.gz: e2558bf62dd477e601613e9ff3aaad145ed78327b120202bac2f8137f4f4006673ce33989341134654d72371c6928a690784ed0aafceee618344ce33383030b0
-  data.tar.gz: f44814296cf29aed73b671399258d78ad233eca14ed6fbce2635a04c5e2fb3b89f652ef70f0412f1cc5fe433168e8a01c1ae8b8cf25f9e2456fa0fab1dd770c7
+  metadata.gz: 8df219dc002060c59f897970bf4cfdba38189f1f8864385c733f700630fe6ba1d58165471fefed2657830c713180ce57b64b341d733828ac3c81e06f4b10d129
+  data.tar.gz: d26e7f6d6f2009970427a955d4b1b659b4aa13267cb8f8c6a67aeb46eaaf4e898e379333490a94386f6a1b89fced225aa93a5881f0f68b2cb3f1e4e6470b3427

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

@@ -6,6 +6,12 @@
       </div>
     </div>
 
+    <div class="row">
+      <div class="columns medium-10 medium-offset-1">
+        <%= cell("decidim/public_participation", form) %>
+      </div>
+    </div>
+
     <div class="row">
       <div class="columns medium-10 medium-offset-1 help-text">
         <%= registration_terms_text %>

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

@@ -1,16 +1,18 @@
 <% if model.can_be_joined_by?(current_user) %>
   <% if model.has_registration_for? current_user %>
+    <span>
+      <%= icon("check", class: "icon--small") %>
+      <%= t("going", scope: "decidim.meetings.meetings.show") %>
+    </span>
     <%= action_authorized_button_to(
       :join,
+      t("leave", scope: "decidim.meetings.meetings.show"),
       meeting_registration_path(model),
       resource: model,
       method: :delete,
-      class: "#{button_classes} active",
-      data: { disable: true }
-    ) do %>
-      <%= icon("check", class: "icon--small") %>
-      <%= t("going", scope: "decidim.meetings.meetings.show") %>
-    <% end %>
+      class: button_classes,
+      data: { disable: true, confirm: t("leave_confirmation", scope: "decidim.meetings.meetings.show") }
+    ) %>
   <% else %>
     <% if model.registration_form_enabled? %>
       <%= action_authorized_link_to(

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

@@ -64,6 +64,10 @@ module Decidim
       def show_footer_actions?
         options[:show_footer_actions]
       end
+
+      def statuses
+        [:follow, :comments_count]
+      end
     end
   end
 end

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

@@ -6,8 +6,13 @@
     <li class="card-data__item">
       <div class="text-left">
         <div class="card__icondata--address">
-          <span><%= link_to(model.online_meeting_url, model.online_meeting_url, target: "_blank") %></span><br>
-          <span><%= translated_attribute model.location_hints %></span>
+          <% if future? %>
+            <span><%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %></span>
+          <% elsif live? %>
+            <span><%= link_to(t("join", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank") %></span><br>
+          <% else %>
+            <span><%= link_to(t("visit_finished", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank") %></span><br>
+          <% end %>
         </div>
       </div>
     </li>

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

@@ -3,14 +3,26 @@
 module Decidim
   module Meetings
     # This cell renders the URL address of an online meeting.
-    class MeetingUrlCell < Decidim::ViewModel
+    class MeetingUrlCell < Decidim::Meetings::OnlineMeetingCell
       include Cell::ViewModel::Partial
       include LayoutHelper
 
       private
 
       def resource_icon
-        icon "video", class: "icon--big", role: "img", "aria-hidden": true
+        icon icon_name, class: "icon--big", role: "img", "aria-hidden": true
+      end
+
+      def icon_name
+        if has_meeting_url?
+          "video"
+        else
+          "timer"
+        end
+      end
+
+      def has_meeting_url?
+        @has_meeting_url ||= model.online_meeting_url.present?
       end
     end
   end

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

@@ -4,7 +4,7 @@
       <h3>${title}</h3>
       <div id="bodyContent">
         <p>{{html description}}</p>
-        <div class="map__date-adress">
+        <div class="map__date-address">
           <div class="card__datetime">
             <div class="card__datetime__date">
               ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell defines methods required for other cells to render
+    # online meeting urls
+    class OnlineMeetingCell < Decidim::ViewModel
+      protected
+
+      def embedder
+        @embedder ||= MeetingIframeEmbedder.new(model.online_meeting_url)
+      end
+
+      delegate :embeddable?, to: :embedder
+
+      def live_event_url
+        if embeddable?
+          Decidim::EngineRouter.main_proxy(model.component).meeting_live_event_path(meeting_id: model.id)
+        else
+          model.online_meeting_url
+        end
+      end
+
+      def live?
+        model.start_time &&
+          model.end_time &&
+          Time.current >= (model.start_time - 10.minutes) &&
+          Time.current <= model.end_time
+      end
+
+      def future?
+        Time.current <= model.start_time && !live?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+<% if online_meeting_url? %>
+  <% if show_embed? || live? || future? %>
+    <div class="card card--secondary">
+      <div class="card__content text-center">
+        <% if live? %>
+          <div class="heading1 text-primary">
+            <%= icon "audio", class: "heading4" %>
+          </div>
+          <div>
+            <strong class="heading5"><%= t("live_event", scope: "decidim.meetings.meetings.show") %></strong>
+            <% unless show_embed? %>
+              <p><small><%= t("micro_camera_permissions_warning", scope: "decidim.meetings.meetings.show") %></small></p>
+            <% end %>
+          </div>
+        <% end %>
+
+        <% if show_embed? %>
+          <div class="<%= "margin-top-3" if live? %> absolutes aspect-ratio-16-9">
+            <%== embed_code(request.host) %>
+          </div>
+        <% elsif live? || future? %>
+          <div class="absolutes">
+            <% if live? %>
+              <%= link_to t("join", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank", class: "button button--sc" %>
+            <% elsif future? %>
+              <span><%= t("link_closed", scope: "decidim.meetings.meetings.show") %></span>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  <div class="card card--secondary">
+    <div class="card__content address">
+      <div class="address__info">
+        <%= icon "timer", role: "img", "aria-hidden": true, remove_icon_class: true, width: 40, height: 70 %>
+        <div class="address__details">
+          <span><%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %></span>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the online meeting link section
+    # of a online or both type of meeting.
+    class OnlineMeetingLinkCell < Decidim::Meetings::OnlineMeetingCell
+      include Decidim::LayoutHelper
+
+      def show
+        render
+      end
+
+      def online_meeting_url?
+        model.online_meeting_url.present?
+      end
+
+      delegate :embed_code, to: :embedder
+
+      private
+
+      def show_embed?
+        model.show_embedded_iframe? && embedder.embeddable?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+<div id="list-of-public-participants" class="section">
+  <div class="row">
+    <div class="columns large-12">
+      <h4 class="section-heading"><%= t("attending_participants", scope: "decidim.meetings.public_participants_list") %></h4>
+    </div>
+    <div class="columns large-12">
+      <%= cell(
+        "decidim/collapsible_list",
+        public_participants,
+        cell_name: "decidim/author",
+        cell_options: { extra_classes: ["author-data--small"] },
+        hidden_elements_count_i18n_key: "decidim.meetings.public_participants_list.hidden_participants_count"
+      ) %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Meetings
+    # This cell renders the list of public participants of a meeting.
+    #
+    # Example:
+    #
+    #    cell("decidim/public_participants_list", meeting)
+    class PublicParticipantsListCell < Decidim::ViewModel
+      include ApplicationHelper
+
+      def show
+        return if public_participants.blank?
+
+        render
+      end
+
+      private
+
+      # Finds the public participants (as users) of meeting
+      #
+      # Returns an Array of presented Users
+      def public_participants
+        @public_participants ||= model.public_participants.map { |user| present(user) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+<% answer_options_with_percentages.each do |(answer_option_body, answer_percentage)| %>
+  <label><%= translated_attribute(answer_option_body) %></label>
+  <div class="meeting-polls__answer">
+    <div class="meeting-polls__answer--value"><%= answer_percentage %></div>
+    <div class="meeting-polls__answer--bar"><div style="width: <%= answer_percentage %>"></div></div>
+  </div>
+<% end %>

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the percentage of responses which chose
+    # the given answer option in a meeting poll question
+    class QuestionResponsesCell < Decidim::ViewModel
+      include ActionView::Helpers::NumberHelper
+
+      def show
+        render
+      end
+
+      private
+
+      # Returns an array of arrays, where the internal array contains
+      #   - the body of the answer option
+      #   - the percentage of answers for that option
+      #
+      def answer_options_with_percentages
+        # This query joins answer options with answer choices and answers
+        # and returns for each answer option the count of times it has been answered
+        # grouping by answer options and answers.
+        #
+        # This calculation is a bit complex because of multiple option answers
+        question_answers_choices = Decidim::Meetings::AnswerOption.where(decidim_question_id: model.id)
+                                                                  .joins([choices: :answer])
+                                                                  .group("#{answers_table_name}.id, #{answer_options_table_name}.id")
+                                                                  .select(<<~SELECT
+                                                                    #{answer_options_table_name}.id AS id,
+                                                                    #{answer_options_table_name}.body,
+                                                                    #{answers_table_name}.id AS answer_id,
+                                                                    COUNT(decidim_answer_option_id) AS count
+                                                                  SELECT
+                                                                         )
+
+        # Extract the number of uniq answers by the answer_id attribute
+        total_answers = question_answers_choices.map(&:answer_id).compact.uniq.size
+
+        # A second grouping is necessary to count the number of answers for each answer_option id
+        # and calculate the percentages
+        options_with_percentages = []
+        question_answers_choices.group_by(&:id).each do |_id, values|
+          answers_count = values.sum(&:count)
+          options_with_percentages << [values.first.body, calculate_and_format_percentage(answers_count, total_answers)]
+        end
+
+        options_with_percentages
+      end
+
+      def format_percentage(raw_percentage)
+        "#{number_with_precision(raw_percentage, precision: 2, significant: true)}%"
+      end
+
+      def calculate_percentage(part, total)
+        total.zero? ? 0 : ((part.to_f / total) * 100).round(2)
+      end
+
+      def calculate_and_format_percentage(part, total)
+        format_percentage(calculate_percentage(part, total))
+      end
+
+      def answer_options_table_name
+        @answer_options_table_name ||= Decidim::Meetings::AnswerOption.table_name
+      end
+
+      def answers_table_name
+        @answers_table_name ||= Decidim::Meetings::Answer.table_name
+      end
+    end
+  end
+end

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

@@ -41,6 +41,9 @@ module Decidim
           ) do
             meeting.update!(
               closing_report: form.closing_report,
+              video_url: form.video_url,
+              audio_url: form.audio_url,
+              closing_visible: form.closing_visible,
               attendees_count: form.attendees_count,
               contributions_count: form.contributions_count,
               attending_organizations: form.attending_organizations,

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

@@ -27,7 +27,6 @@ module Decidim
           transaction do
             copy_meeting!
             copy_services!
-            schedule_upcoming_meeting_notification
             send_notification
           end
 
@@ -77,14 +76,6 @@ module Decidim
           end
         end
 
-        def schedule_upcoming_meeting_notification
-          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(copied_meeting)
-
-          Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: copied_meeting.start_time - 2.days)
-            .perform_later(copied_meeting.id, checksum)
-        end
-
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_created",

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

@@ -19,8 +19,6 @@ module Decidim
           transaction do
             create_meeting!
             create_services!
-            schedule_upcoming_meeting_notification
-            send_notification
           end
 
           broadcast(:ok, meeting)
@@ -55,7 +53,10 @@ module Decidim
             author: form.current_organization,
             registration_terms: form.current_component.settings.default_registration_terms,
             component: form.current_component,
-            questionnaire: Decidim::Forms::Questionnaire.new
+            questionnaire: Decidim::Forms::Questionnaire.new,
+            customize_registration_email: form.customize_registration_email,
+            registration_email_custom_content: form.registration_email_custom_content,
+            show_embedded_iframe: form.show_embedded_iframe
           }
 
           @meeting = Decidim.traceability.create!(
@@ -75,23 +76,6 @@ module Decidim
             )
           end
         end
-
-        def schedule_upcoming_meeting_notification
-          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
-
-          Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: meeting.start_time - 2.days)
-            .perform_later(meeting.id, checksum)
-        end
-
-        def send_notification
-          Decidim::EventsManager.publish(
-            event: "decidim.events.meetings.meeting_created",
-            event_class: Decidim::Meetings::CreateMeetingEvent,
-            resource: meeting,
-            followers: meeting.participatory_space.followers
-          )
-        end
       end
     end
   end

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

@@ -40,6 +40,8 @@ module Decidim
         end
 
         def proposals
+          return [] unless Decidim::Meetings.enable_proposal_linking
+
           @proposals ||= meeting.authored_proposals.load
         end
       end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A command with all the business logic that publishes an
+      # existing meeting.
+      class PublishMeeting < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # meeting - Decidim::Meetings::Meeting
+        # current_user - the user performing the action
+        def initialize(meeting, current_user)
+          @meeting = meeting
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if meeting.published?
+
+          transaction do
+            publish_meeting
+            send_notification
+            schedule_upcoming_meeting_notification
+          end
+
+          broadcast(:ok, meeting)
+        end
+
+        private
+
+        attr_reader :meeting, :current_user
+
+        def publish_meeting
+          @meeting = Decidim.traceability.perform_action!(
+            :publish,
+            meeting,
+            current_user,
+            visibility: "all"
+          ) do
+            meeting.publish!
+            meeting
+          end
+        end
+
+        def send_notification
+          Decidim::EventsManager.publish(
+            event: "decidim.events.meetings.meeting_created",
+            event_class: Decidim::Meetings::CreateMeetingEvent,
+            resource: meeting,
+            followers: meeting.participatory_space.followers,
+            force_send: true
+          )
+        end
+
+        def schedule_upcoming_meeting_notification
+          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
+
+          Decidim::Meetings::UpcomingMeetingNotificationJob
+            .set(wait_until: meeting.start_time - 2.days)
+            .perform_later(meeting.id, checksum)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A command with all the business logic that unpublishes an
+      # existing meeting.
+      class UnpublishMeeting < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # meeting - Decidim::Meetings::Meeting
+        # current_user - the user performing the action
+        def initialize(meeting, current_user)
+          @meeting = meeting
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless meeting.published?
+
+          @meeting = Decidim.traceability.perform_action!(
+            :unpublish,
+            meeting,
+            current_user,
+            visibility: "all"
+          ) do
+            meeting.unpublish!
+            meeting
+          end
+          broadcast(:ok, meeting)
+        end
+
+        private
+
+        attr_reader :meeting, :current_user
+      end
+    end
+  end
+end

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

@@ -24,7 +24,7 @@ module Decidim
           transaction do
             update_meeting!
             send_notification if should_notify_followers?
-            schedule_upcoming_meeting_notification if start_time_changed?
+            schedule_upcoming_meeting_notification if meeting.published? && start_time_changed?
             update_services!
           end
 
@@ -59,7 +59,10 @@ module Decidim
             location: form.location,
             location_hints: form.location_hints,
             private_meeting: form.private_meeting,
-            transparent: form.transparent
+            transparent: form.transparent,
+            customize_registration_email: form.customize_registration_email,
+            registration_email_custom_content: form.registration_email_custom_content,
+            show_embedded_iframe: form.show_embedded_iframe
           )
         end
 
@@ -80,7 +83,7 @@ module Decidim
         end
 
         def should_notify_followers?
-          important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
+          meeting.published? && important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
         end
 
         def important_attributes

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

@@ -0,0 +1,57 @@
+# 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 UpdateQuestionStatus < Rectify::Command
+        class InvalidStatus < StandardError; end
+
+        # 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(question, current_user)
+          @question = question
+          @current_user = current_user
+        end
+
+        # Updates the questionnaire if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          Decidim::Meetings::Question.transaction do
+            update_question
+          end
+
+          broadcast(:ok)
+        rescue InvalidStatus
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :question, :current_user
+
+        def update_question
+          Decidim.traceability.update!(
+            question,
+            current_user,
+            status: new_status(question)
+          )
+        end
+
+        def new_status(question)
+          if question.unpublished?
+            Decidim::Meetings::Question.statuses[:published]
+          elsif question.published?
+            Decidim::Meetings::Question.statuses[:closed]
+          else
+            raise InvalidStatus
+          end
+        end
+      end
+    end
+  end
+end