decidim-meetings 0.24.1 → 0.25.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d87cad07224d2357902227cc100d0c1d1e8e060f4e173c9b99a3bfb59b1a6e66
-  data.tar.gz: 9124c8220b42457098cc5e5634f72a72e3cf126f6e3a290151af8ddba8628458
+  metadata.gz: ac1a613a93b00b2da554476793d23b6563e773d39e963a56b825e36756b6658d
+  data.tar.gz: 49ba72f4f57ca75e54c05565cb7db802c712c0ab60568c9ee3f0be49cd08607f
 SHA512:
-  metadata.gz: da002f16be4533d70847df0fa254191873389c62ef0a1403b8992dc5a4afd90fd6acbda5ccfa73768f8b2af0f6caad8ec3df1cbc86f409a76ecabee272189bca
-  data.tar.gz: 9bca28e4968899094616e567af7cbbdb54084c9e4856be177e993d658cf4582c963bf2ab5b10a89476ade92038f6cf36d28e683183419706263ee3556a746228
+  metadata.gz: c61bf5ed08406df42a644a35f79e90a09832277346311b357fe55995c1cbfe5b6e043a78f2c0f083980d960095e6eedc68f876e79004b6e49a1646b4d9857bc7
+  data.tar.gz: a4e7dbcb203eecba85d7245a090b47ba11f94404b928f081de8afff154f8bb7f43fc0f5c76d057351a19ce4445d1f7bda1c1f0468e0d1ead50d72915260f2add

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/meetings_map_cell.rb

@@ -15,7 +15,7 @@ module Decidim
       end
 
       def geocoded_meetings
-        @geocoded_meetings ||= meetings.select(&:geocoded?)
+        @geocoded_meetings ||= meetings.select(&:geocoded_and_valid?)
       end
 
       def meetings

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