decidim-meetings 0.23.1 → 0.24.0.rc2

data/app/helpers/decidim/meetings/map_helper.rb

@@ -12,7 +12,7 @@ module Decidim
         geocoded_meetings = meetings.select(&:geocoded?)
         geocoded_meetings.map do |meeting|
           meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
-                                                               description: translated_attribute(meeting.description),
+                                                               description: html_truncate(translated_attribute(meeting.description), length: 200),
                                                                startTimeDay: l(meeting.start_time, format: "%d"),
                                                                startTimeMonth: l(meeting.start_time, format: "%B"),
                                                                startTimeYear: l(meeting.start_time, format: "%Y"),

data/app/models/decidim/meetings/agenda_item.rb

@@ -14,7 +14,7 @@ module Decidim
       belongs_to :agenda, -> { order(:position) }, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
 
       has_many :agenda_item_children, foreign_key: "parent_id", class_name: "Decidim::Meetings::AgendaItem", inverse_of: :parent, dependent: :destroy
-      belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Meetings::AgendaItem", inverse_of: :agenda_item_children, optional: true
+      belongs_to :parent, class_name: "Decidim::Meetings::AgendaItem", inverse_of: :agenda_item_children, optional: true
 
       default_scope { order(:position) }
 

data/app/models/decidim/meetings/meeting.rb

@@ -24,6 +24,9 @@ module Decidim
       include Decidim::Authorable
       include Decidim::TranslatableResource
 
+      TYPE_OF_MEETING = %w(in_person online hybrid).freeze
+      REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze
+
       translatable_fields :title, :description, :location, :location_hints, :closing_report, :registration_terms
 
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
@@ -42,14 +45,47 @@ module Decidim
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
 
       scope :visible_meeting_for, lambda { |user|
-                                    joins("LEFT JOIN decidim_meetings_registrations ON
-                                    decidim_meetings_registrations.decidim_meeting_id = #{table_name}.id")
-                                      .where("(private_meeting = ? and decidim_meetings_registrations.decidim_user_id = ?)
-                                    or private_meeting = ? or (private_meeting = ? and transparent = ?)", true, user, false, true, true).distinct
-                                  }
+        (all.distinct if user&.admin?) ||
+          if user.present?
+            spaces = %w(assembly participatory_process)
+            spaces << "conference" if defined?(Decidim::Conference)
+            user_role_queries = spaces.map do |participatory_space_name|
+              "SELECT decidim_components.id FROM decidim_components
+              WHERE CONCAT(decidim_components.participatory_space_id, '-', decidim_components.participatory_space_type)
+              IN
+              (SELECT CONCAT(decidim_#{participatory_space_name}_user_roles.decidim_#{participatory_space_name}_id, '-Decidim::#{participatory_space_name.classify}')
+              FROM decidim_#{participatory_space_name}_user_roles WHERE decidim_#{participatory_space_name}_user_roles.decidim_user_id = ?)
+              "
+            end
+
+            where("decidim_meetings_meetings.private_meeting = ?
+            OR decidim_meetings_meetings.transparent = ?
+            OR decidim_meetings_meetings.id IN
+              (SELECT decidim_meetings_registrations.decidim_meeting_id FROM decidim_meetings_registrations WHERE decidim_meetings_registrations.decidim_user_id = ?)
+            OR decidim_meetings_meetings.decidim_component_id IN
+              (SELECT decidim_components.id FROM decidim_components
+                WHERE CONCAT(decidim_components.participatory_space_id, '-', decidim_components.participatory_space_type)
+                IN
+                  (SELECT CONCAT(decidim_participatory_space_private_users.privatable_to_id, '-', decidim_participatory_space_private_users.privatable_to_type)
+                  FROM decidim_participatory_space_private_users WHERE decidim_participatory_space_private_users.decidim_user_id = ?)
+              )
+            OR decidim_meetings_meetings.decidim_component_id IN
+              (
+                #{user_role_queries.compact.join(" UNION ")}
+              )
+            ", false, true, user.id, user.id, *user_role_queries.compact.map { user.id })
+              .distinct
+          else
+            visible
+          end
+      }
 
       scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
 
+      TYPE_OF_MEETING.each do |type|
+        scope type.to_sym, -> { where(type_of_meeting: type.to_sym) }
+      end
+
       searchable_fields({
                           scope_id: :decidim_scope_id,
                           participatory_space: { component: :participatory_space },
@@ -60,6 +96,9 @@ module Decidim
                         index_on_create: ->(meeting) { meeting.visible? },
                         index_on_update: ->(meeting) { meeting.visible? })
 
+      # we create a salt for the meeting only on new meetings to prevent changing old IDs for existing (Ether)PADs
+      before_create :set_default_salt
+
       # Return registrations of a particular meeting made by users representing a group
       def user_group_registrations
         registrations.where.not(decidim_user_group_id: nil)
@@ -88,6 +127,10 @@ module Decidim
         closed_at.present?
       end
 
+      def past?
+        end_time < Time.current
+      end
+
       def has_available_slots?
         return true if available_slots.zero?
 
@@ -141,9 +184,8 @@ module Decidim
         can_participate_in_space?(user) && can_participate_in_meeting?(user)
       end
 
-      def current_user_can_visit_meeting?(current_user)
-        (private_meeting? && registrations.exists?(decidim_user_id: current_user.try(:id))) ||
-          !private_meeting? || (private_meeting? && transparent?)
+      def current_user_can_visit_meeting?(user)
+        Decidim::Meetings::Meeting.visible_meeting_for(user).exists?(id: id)
       end
 
       # Return the duration of the meeting in minutes
@@ -152,6 +194,8 @@ module Decidim
       end
 
       def resource_visible?
+        return false if hidden?
+
         !private_meeting? || transparent?
       end
 
@@ -187,6 +231,44 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Public: Overrides the `reported_attributes` Reportable concern method.
+      def reported_attributes
+        [:description]
+      end
+
+      # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
+      def reported_searchable_content_extras
+        [normalized_author.name]
+      end
+
+      def hybrid_meeting?
+        type_of_meeting == "hybrid"
+      end
+
+      def online_meeting?
+        type_of_meeting == "online"
+      end
+
+      def registration_disabled?
+        registration_type == "registration_disabled"
+      end
+
+      def on_this_platform?
+        registration_type == "on_this_platform"
+      end
+
+      def on_different_platform?
+        registration_type == "on_different_platform"
+      end
+
+      def has_contributions?
+        !!contributions_count && contributions_count.positive?
+      end
+
+      def has_attendees?
+        !!attendees_count && attendees_count.positive?
+      end
+
       private
 
       def can_participate_in_meeting?(user)
@@ -202,6 +284,11 @@ module Decidim
 
         invites.exists?(decidim_user_id: user.id)
       end
+
+      # salt is used to generate secure hash in pads
+      def set_default_salt
+        self.salt ||= Tokenizer.random_salt
+      end
     end
   end
 end

data/app/permissions/decidim/meetings/permissions.rb

@@ -23,6 +23,8 @@ module Decidim
           toggle_allow(can_create_meetings?)
         when :update
           toggle_allow(can_update_meeting?)
+        when :close
+          toggle_allow(can_close_meeting?)
         when :register
           toggle_allow(can_register_invitation_meeting?)
         end
@@ -47,7 +49,7 @@ module Decidim
 
       def can_decline_invitation?
         meeting.registrations_enabled? &&
-          meeting.invites.where(user: user).exists?
+          meeting.invites.exists?(user: user)
       end
 
       def can_create_meetings?
@@ -56,7 +58,15 @@ module Decidim
 
       def can_update_meeting?
         component_settings&.creation_enabled_for_participants? &&
-          meeting.authored_by?(user)
+          meeting.authored_by?(user) &&
+          !meeting.closed?
+      end
+
+      def can_close_meeting?
+        component_settings&.creation_enabled_for_participants? &&
+          meeting.authored_by?(user) &&
+          !meeting.closed? &&
+          meeting.past?
       end
 
       def can_register_invitation_meeting?

data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb

@@ -50,8 +50,8 @@ module Decidim
           "activemodel.attributes.meeting"
         end
 
-        def has_diff?
-          action == "close" || super
+        def diff_actions
+          super + %w(close)
         end
       end
     end

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -32,6 +32,39 @@ module Decidim
         end
       end
 
+      def location(all_locales: false)
+        return unless meeting
+
+        handle_locales(meeting.location, all_locales) do |content|
+          content
+        end
+      end
+
+      def location_hints(all_locales: false)
+        return unless meeting
+
+        handle_locales(meeting.location_hints, all_locales) do |content|
+          content
+        end
+      end
+
+      def registration_terms(all_locales: false)
+        return unless meeting
+
+        handle_locales(meeting.registration_terms, all_locales) do |content|
+          content
+        end
+      end
+
+      def closing_report(links: false, all_locales: false)
+        return unless meeting
+
+        handle_locales(meeting.closing_report, all_locales) do |content|
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
+          renderer.render(links: links).html_safe
+        end
+      end
+
       # Next methods are used for present a Meeting As Proposal Author
       def name
         title

data/app/services/decidim/meetings/meeting_search.rb

@@ -27,6 +27,26 @@ module Decidim
 
         query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
       end
+
+      def search_type
+        fields = Decidim::Meetings::Meeting::TYPE_OF_MEETING
+        filtered = []
+        options[:type].each do |inquiry|
+          filtered.push(inquiry) if fields.include?(inquiry)
+        end
+        filtered.size.positive? ? query.where(decidim_meetings_meetings: { type_of_meeting: filtered }) : query
+      end
+
+      # Handle the activity filter
+      def search_activity
+        case activity
+        when "my_meetings"
+          query
+            .where(decidim_author_id: user.id)
+        else
+          query
+        end
+      end
     end
   end
 end

data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb

@@ -4,5 +4,5 @@
   <%= t ".invited_you_to_join_a_meeting", invited_by: @invited_by.name, application: @user.organization.name %>
 </p>
 
-<p><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_path(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
+<p><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
 <p><%= link_to t(".join", meeting_title: present(@meeting).title),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>

data/app/views/decidim/meetings/admin/invites/index.html.erb

@@ -57,7 +57,7 @@
 
 <div class="card" id="meeting-invites">
   <div class="card-divider">
-    <h2 class="card-title"><%= title %> - <%= t(".invites") %></h2>
+    <h2 class="card-title"><%= t(".invites") %></h2>
   </div>
 
   <div class="card-section">

data/app/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -12,11 +12,18 @@
     </div>
 
     <div class="row column">
+      <%= form.select :type_of_meeting,
+        @form.type_of_meeting_select,
+        { include_blank: t(".select_a_meeting_type") },
+        { multiple: false } %>
+    </div>
+
+    <div class="field" data-meeting-type="in_person">
       <%= form.geocoding_field :address %>
       <p class="help-text"><%= t(".address_help") %></p>
     </div>
 
-    <div class="row column">
+    <div class="field" data-meeting-type="in_person">
       <%= form.translated :text_area, :location %>
       <p class="help-text"><%= t(".location_help") %></p>
     </div>
@@ -26,6 +33,11 @@
       <p class="help-text"><%= t(".location_hints_help") %></p>
     </div>
 
+    <div class="field" data-meeting-type="online">
+      <%= form.text_field :online_meeting_url %>
+      <p class="help-text"><%= t(".online_meeting_url_help") %></p>
+    </div>
+
     <div class="row">
       <div class="columns xlarge-6">
         <%= form.datetime_field :start_time %>
@@ -47,6 +59,24 @@
       </div>
     </div>
 
+    <div class="row column">
+      <%= form.select :registration_type,
+        @form.registration_type_select,
+        { include_blank: t(".select_a_registration_type") },
+        { multiple: false } %>
+    </div>
+
+    <div class="row column" id="meeting_available_slots">
+      <%= form.number_field :available_slots %>
+      <p class="help-text"><%= t(".available_slots_help") %></p>
+    </div>
+
+    <div class="field" id="meeting_registration_url">
+      <%= form.text_field :registration_url %>
+      <p class="help-text"><%= t(".registration_url_help") %></p>
+      <label><%= t(".disclaimer", organization: current_component.organization.name) %></label><br>
+    </div>
+
     <div class="row column" id="private_meeting">
       <%= form.check_box :private_meeting %>
     </div>

data/app/views/decidim/meetings/admin/meetings/edit.html.erb

@@ -1,5 +1,5 @@
-<%= decidim_form_for(@form, url: { action: "update" }, html: { class: "form edit_meeting" })  do |f| %>
-  <%= render partial: "form", object: f %>
+<%= decidim_form_for(@form, url: { action: "update" }, html: { class: "form meetings_form edit_meeting" })  do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
     <div class="button--double form-general-submit">
       <%= f.submit t(".update") %>

data/app/views/decidim/meetings/admin/meetings/index.html.erb

@@ -55,25 +55,45 @@
 
                 <% if allowed_to? :copy, :meeting, meeting: meeting %>
                   <%= icon_link_to "clipboard", new_meeting_copy_path(meeting), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+                <% else %>
+                  <span class="action-space icon"></span>
+                <% end %>
+
+                <% if allowed_to? :update, :meeting, meeting: meeting %>
+                  <% if meeting.registration_disabled? %>
+                    <%= icon "people", class: "action-icon action-icon--disabled", role: "img" %>
+                  <% else %>
+                    <%= icon_link_to "people", meeting.on_this_platform? ? edit_meeting_registrations_path(meeting) : meeting.registration_url, t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
+                  <% end %>
                 <% end %>
 
                 <% if allowed_to? :update, :meeting, meeting: meeting %>
                   <%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
-                  <%= icon_link_to "people", edit_meeting_registrations_path(meeting), t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
                   <%= icon_link_to "clock", meeting.minutes.present? ? edit_meeting_minute_path(meeting, meeting.minutes) : new_meeting_minute_path(meeting), t("actions.minutes", scope: "decidim.meetings"), class: "action-icon--minutes" %>
                   <%= icon_link_to "calendar", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
+                <% else %>
+                  <span class="action-space icon"></span>
+                  <span class="action-space icon"></span>
+                  <span class="action-space icon"></span>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :close, :meeting, meeting: meeting %>
                   <%= icon_link_to "lock-locked", edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
+                <% else %>
+                    <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :update, :meeting, meeting: meeting %>
                     <%= icon_link_to "folder", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
+                <% else %>
+                    <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :update, :meeting, meeting: meeting %>
                   <%= icon_link_to "paperclip", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <%= resource_permissions_link(meeting) %>
@@ -95,6 +115,8 @@
                       end
                     %>
                   <% end %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/meetings/admin/meetings/new.html.erb

@@ -1,7 +1,7 @@
-<%= decidim_form_for(@form, html: { class: "form new_meeting" }) do |f| %>
+<%= decidim_form_for(@form, html: { class: "form meetings_form new_meeting" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
-      <%= f.submit t(".create") %>
+    <%= f.submit t(".create") %>
   </div>
 <% end %>

data/app/views/decidim/meetings/admin/minutes/edit.html.erb

@@ -1,5 +1,5 @@
 <%= decidim_form_for(@form, url: meeting_minute_path(@current_meeting, @minutes), html: { class: "form edit_minutes" })  do |f| %>
-  <%= render partial: "form", object: f %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
     <div class="button--double form-general-submit">
       <%= f.submit t(".update") %>