decidim-meetings 0.22.0 → 0.23.3

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    #
+    # A dummy presenter to abstract out the author of an official meeting.
+    #
+    class OfficialAuthorPresenter < Decidim::OfficialAuthorPresenter
+      def name
+        I18n.t("decidim.meetings.models.meeting.fields.official_meeting")
+      end
+    end
+  end
+end

data/app/queries/decidim/meetings/filtered_meetings.rb

@@ -27,7 +27,7 @@ module Decidim
       # Finds the Projects scoped to an array of components and filtered
       # by a range of dates.
       def query
-        meetings = Decidim::Meetings::Meeting.where(component: @components)
+        meetings = Decidim::Meetings::Meeting.not_hidden.where(component: @components)
         meetings = meetings.where("created_at >= ?", @start_at) if @start_at.present?
         meetings = meetings.where("created_at <= ?", @end_at) if @end_at.present?
         meetings

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class DiffRenderer < BaseDiffRenderer
+      def attribute_types
+        {
+          title: :string,
+          description: :html,
+          address: :string,
+          location: :string,
+          location_hints: :string,
+          start_time: :date,
+          end_time: :date,
+          decidim_user_group_id: :user_group,
+          decidim_scope_id: :scope
+        }
+      end
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ module Decidim
     # `current_component` param with a `Decidim::Component` in order to
     # find the meetings.
     class MeetingSearch < ResourceSearch
+      text_search_fields :title, :description
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the meetings from.
       # page        - The page number to paginate the results.
@@ -15,20 +17,9 @@ module Decidim
         super(scope, options)
       end
 
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(localized_search_text_in(:title), text: "%#{search_text}%")
-          .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
-      end
-
       # Handle the date filter
       def search_date
-        if options[:date] == "upcoming"
-          query.where("end_time >= ? ", Time.current).order(start_time: :asc)
-        elsif options[:date] == "past"
-          query.where("end_time <= ? ", Time.current).order(start_time: :desc)
-        end
+        apply_scopes(%w(upcoming past), date)
       end
 
       def search_space
@@ -36,19 +27,6 @@ module Decidim
 
         query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
       end
-
-      private
-
-      # Internal: builds the needed query to search for a text in the organization's
-      # available locales. Note that it is intended to be used as follows:
-      #
-      # Example:
-      #   Resource.where(localized_search_text_for(:title, text: "my_query"))
-      #
-      # The Hash with the `:text` key is required or it won't work.
-      def localized_search_text_in(field)
-        options[:organization].available_locales.map { |l| "#{field} ->> '#{l}' ILIKE :text" }.join(" OR ")
-      end
     end
   end
 end

data/app/types/decidim/meetings/meeting_type.rb

@@ -23,7 +23,7 @@ module Decidim
       field :description, Decidim::Core::TranslatedFieldType, "The description of this meeting."
       field :startTime, !Decidim::Core::DateTimeType, "The time this meeting starts", property: :start_time
       field :endTime, !Decidim::Core::DateTimeType, "The time this meeting ends", property: :end_time
-      field :organizer, Decidim::Core::AuthorInterface, "If specified, the organizer of this meeting"
+      field :author, Decidim::Core::AuthorInterface, "If specified, the author of this meeting"
       field :agenda, AgendaType, "Agenda for this meeting, if available" do
         resolve ->(meeting, _args, _ctx) {
           meeting.agenda if meeting.agenda&.visible?

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

@@ -4,7 +4,7 @@
   </div>
 
   <div class="card-section">
-    <div class="row column  hashtags__container">
+    <div class="row column hashtags__container">
       <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, value: @meeting.present? ? present(@meeting).title(all_locales: true) : @form.title.with_indifferent_access %>
     </div>
 
@@ -13,7 +13,7 @@
     </div>
 
     <div class="row column">
-      <%= form.text_field :address %>
+      <%= form.geocoding_field :address %>
     </div>
 
     <div class="row column">
@@ -34,13 +34,6 @@
       </div>
     </div>
 
-    <div class="row column">
-      <% prompt_options = { url: decidim_admin.users_organization_url, text: t(".select_organizer") } %>
-      <%= form.autocomplete_select(:organizer_id, form.object.organizer.presence, { multiple: false }, prompt_options) do |user|
-        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-      end %>
-    </div>
-
     <div class="row column" id="private_meeting">
       <%= form.check_box :private_meeting %>
     </div>

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

@@ -3,7 +3,7 @@
     <h2 class="card-title"><%= title %></h2>
   </div>
   <div class="card-section">
-    <div class="row column  hashtags__container">
+    <div class="row column hashtags__container">
       <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
     </div>
 
@@ -12,7 +12,7 @@
     </div>
 
     <div class="row column">
-      <%= form.text_field :address %>
+      <%= form.geocoding_field :address %>
       <p class="help-text"><%= t(".address_help") %></p>
     </div>
 
@@ -36,9 +36,9 @@
       </div>
     </div>
     <div class="row">
-      <% if current_participatory_space.has_subscopes? %>
+      <% if current_component.has_subscopes? %>
         <div class="columns xlarge-6">
-          <%= scopes_picker_field form, :decidim_scope_id %>
+          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
         </div>
       <% end %>
 
@@ -47,13 +47,6 @@
       </div>
     </div>
 
-    <div class="row column">
-      <% prompt_options = { url: decidim_admin.users_organization_url, text: t(".select_organizer") } %>
-      <%= form.autocomplete_select(:organizer_id, form.object.organizer.presence, { multiple: false }, prompt_options) do |user|
-        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-      end %>
-    </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,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form edit_meeting" })  do |f| %>
+<%= decidim_form_for(@form, url: { action: "update" }, html: { class: "form edit_meeting" })  do |f| %>
   <%= render partial: "form", object: f %>
 
     <div class="button--double form-general-submit">

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

@@ -18,9 +18,10 @@
             <th><%= t("models.meeting.fields.start_time", scope: "decidim.meetings") %></th>
             <th><%= t("models.meeting.fields.end_time", scope: "decidim.meetings") %></th>
             <th><%= t("models.meeting.fields.closed", scope: "decidim.meetings") %></th>
-            <% if Decidim.geocoder.present? %>
+            <% if Decidim::Map.available?(:static, :geocoding) %>
               <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
             <% end %>
+            <%= th_resource_scope_label %>
             <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
           </tr>
         </thead>
@@ -43,11 +44,12 @@
               <td>
                 <%= humanize_boolean meeting.closed? %>
               </td>
-              <% if Decidim.geocoder.present? %>
+              <% if Decidim::Map.available?(:static, :geocoding) %>
                 <td>
                   <%= static_map_link(meeting) %>
                 </td>
               <% end %>
+              <%= td_resource_scope_for(meeting.scope) %>
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
 

data/app/views/decidim/meetings/directory/meetings/index.js.erb

@@ -5,7 +5,14 @@ $meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-window.Decidim.currentMap = window.Decidim.loadMap(
-  'map',
-  JSON.parse('<%= escape_javascript meetings_data_for_map(search.results).to_json.html_safe %>')
-);
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results).to_json.html_safe %>');
+
+var $map = $("#map");
+var controller = $map.data("map-controller");
+if (controller) {
+  controller.clearMarkers();
+  controller.addMarkers(markerData);
+} else {
+  // @deprecated Legacy support
+  window.Decidim.currentMap = window.Decidim.loadMap('map', markerData);
+}

data/app/views/decidim/meetings/meetings/_count.html.erb

@@ -0,0 +1 @@
+<%= t(".meetings_count", count: search.results.count) %>

data/app/views/decidim/meetings/meetings/_filters.html.erb

@@ -15,20 +15,18 @@
   </div>
 
   <% unless @forced_past_meetings %>
-    <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
+    <%= form.check_boxes_tree :date, filter_date_values, legend_title: t(".date") %>
   <% end %>
 
-  <% if current_participatory_space.has_subscopes? %>
-    <%= scopes_picker_filter form, :scope_id %>
+  <% if current_component.has_subscopes? %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id,
-                               current_component.categories,
-                               legend_title: t(".category"),
-                               disable_parents: false,
-                               label: "",
-                               prompt: t(".category_prompt"),
-                               aria_label: t(".category") %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category") %>
+  <% end %>
+
+  <% if component_settings.creation_enabled_for_participants? %>
+    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin") %>
   <% end %>
 <% end %>

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

@@ -0,0 +1,51 @@
+<div class="field hashtags__container">
+  <%= form.text_field :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
+</div>
+
+<div class="field hashtags__container">
+  <%= text_editor_for(form, :description, hashtaggable: true) %>
+</div>
+
+<div class="field">
+  <%= form.geocoding_field :address %>
+  <p class="help-text"><%= t(".address_help") %></p>
+</div>
+
+<div class="field">
+  <%= form.text_area :location %>
+  <p class="help-text"><%= t(".location_help") %></p>
+</div>
+
+<div class="field">
+  <%= form.text_area :location_hints %>
+  <p class="help-text"><%= t(".location_hints_help") %></p>
+</div>
+
+<div class="field">
+  <%= form.datetime_field :start_time %>
+</div>
+
+<div class="field">
+  <%= form.datetime_field :end_time %>
+</div>
+
+<% if current_participatory_space.has_subscopes? %>
+  <div class="field">
+    <%= scopes_picker_field form, :decidim_scope_id %>
+  </div>
+<% end %>
+
+<div class="field">
+  <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: t(".select_a_category"), disable_parents: false %>
+</div>
+
+<div class="field">
+  <%= form.select(
+    :user_group_id,
+    Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map{|g| [g.name, g.id]},
+    prompt: current_user.name,
+    label: t(".create_as")
+  ) %>
+</div>
+
+<%= javascript_include_tag "decidim/meetings/meetings_form" %>

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

@@ -0,0 +1,25 @@
+<div class="row">
+  <div class="columns large-3">
+    <%= link_to :back do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+
+  <div class="columns large-6">
+    <h2 class="section-heading"><%= t(".title") %></h2>
+    <div class="card">
+      <div class="card__content">
+        <%= decidim_form_for(@form) do |f| %>
+          <%= render partial: "form", object: f %>
+
+          <div class="actions">
+            <%= f.submit t(".update"), class: "button expanded", data: { disable: true } %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="columns large-3"></div>
+</div>

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

@@ -2,6 +2,21 @@
 
 <%= cell "decidim/meetings/meetings_map", search.results %>
 
+<div class="row columns">
+  <div class="title-action">
+    <h3 id="meetings-count" class="title-action__title section-heading">
+      <%= render partial: "count" %>
+    </h3>
+
+    <% if allowed_to?(:create, :meeting) %>
+      <%= action_authorized_link_to :create, new_meeting_path, class: "title-action__action button small", data: { "redirect_url" => new_meeting_path } do %>
+        <%= t("new_meeting", scope: "decidim.meetings.meetings.index") %>
+        <%= icon "plus", role: "img" %>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
     <%= render partial: "filters_small_view" %>

data/app/views/decidim/meetings/meetings/index.js.erb

@@ -1,11 +1,20 @@
 var $meetings = $('#meetings');
+var $meetingsCount = $('#meetings-count');
 
 $meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
+$meetingsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-window.Decidim.currentMap = window.Decidim.loadMap(
-  'map',
-  JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded?)).to_json.html_safe %>')
-);
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded?)).to_json.html_safe %>');
+
+var $map = $("#map");
+var controller = $map.data("map-controller");
+if (controller) {
+  controller.clearMarkers();
+  controller.addMarkers(markerData);
+} else {
+  // @deprecated Legacy support
+  window.Decidim.currentMap = window.Decidim.loadMap('map', markerData);
+}

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

@@ -0,0 +1,25 @@
+<div class="row">
+  <div class="columns large-3">
+    <%= link_to :back do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+
+  <div class="columns large-6">
+    <h2 class="section-heading"><%= t(".title") %></h2>
+    <div class="card">
+      <div class="card__content">
+        <%= decidim_form_for(@form) do |f| %>
+          <%= render partial: "form", object: f %>
+
+          <div class="actions">
+            <%= f.submit t(".create"), class: "button expanded", data: { disable: true } %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="columns large-3"></div>
+</div>

data/app/views/decidim/meetings/meetings/show.html.erb

@@ -16,20 +16,26 @@ edit_link(
 %>
 
 <div class="row column view-header">
-
-  <%= link_to :meetings, class: "small hollow" do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
+  <div class="m-bottom">
+    <%= link_to meetings_path(filter_link_params), class: "small hollow" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
 
   <h2 class="heading2"><%= present(meeting).title(links: true) %></h2>
-  <% if meeting.organizer.present? %>
-    <%= cell "decidim/author", present(meeting.organizer) %>
-  <% end %>
+
+  <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), has_actions: true, from: meeting, context: { extra_classes: ["author-data--small"] } %>
+
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8
               large-3 large-push-9">
+
+    <% if allowed_to?(:update, :meeting, meeting: meeting) %>
+      <%= link_to t(".edit_meeting"), edit_meeting_path(meeting), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
+    <% end %>
+
     <div class="card extra">
       <div class="card__content">
         <div class="extra__date">
@@ -98,8 +104,9 @@ edit_link(
     <% end %>
 
     <%= resource_reference(meeting) %>
+    <%= resource_version(meeting, versions_path: meeting_versions_path(meeting)) %>
     <%= render partial: "decidim/shared/share_modal" %>
-    <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>
+    <%= embed_modal_for meeting_widget_url(meeting, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -155,3 +162,11 @@ edit_link(
 <%= attachments_for meeting %>
 <%= comments_for meeting %>
 <%= pad_iframe_for meeting %>
+
+<%=
+  render partial: "decidim/shared/flag_modal", locals: {
+    reportable: meeting,
+    form: @report_form,
+    url: decidim.report_path(sgid: meeting.to_sgid.to_s)
+  }
+%>