decidim-meetings 0.20.1 → 0.23.1

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    AgendaItemType = GraphQL::ObjectType.define do
+      name "MeetingAgendaItem"
+      description "A meeting agenda item"
+
+      field :id, !types.ID, "The ID for this agenda item"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this agenda item"
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this agenda item"
+      field :items, !types[AgendaItemType], "Sub-items (children) of this agenda item", property: :agenda_item_children
+      field :parent, AgendaItemType, "Parent agenda item, if available"
+      field :agenda, AgendaType, "Belonging agenda"
+      field :duration, !types.Int, "Duration in number of minutes for this item in this agenda"
+      field :position, !types.Int, "Order position for this agenda item"
+
+      field :createdAt, Decidim::Core::DateTimeType do
+        description "The date and time this agenda item was created"
+        property :created_at
+      end
+      field :updatedAt, Decidim::Core::DateTimeType do
+        description "The date and time this agenda item was updated"
+        property :updated_at
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    AgendaType = GraphQL::ObjectType.define do
+      name "MeetingAgenda"
+      description "A meeting agenda"
+
+      field :id, !types.ID, "The ID for the agenda"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for the agenda"
+      field :items, !types[AgendaItemType], "Items and sub-items of the agenda", property: :agenda_items
+      # probably useful in the future, when handling user permissions
+      # field :visible, !types.Boolean, "Whether this minutes is public or not", property: :visible
+
+      field :createdAt, Decidim::Core::DateTimeType do
+        description "The date and time this agenda was created"
+        property :created_at
+      end
+      field :updatedAt, Decidim::Core::DateTimeType do
+        description "The date and time this agenda was updated"
+        property :updated_at
+      end
+    end
+  end
+end

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

@@ -10,24 +10,51 @@ module Decidim
         -> { Decidim::Comments::CommentableInterface },
         -> { Decidim::Core::CategorizableInterface },
         -> { Decidim::Core::ScopableInterface },
-        -> { Decidim::Core::AttachableInterface }
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Core::TimestampsInterface },
+        -> { Decidim::Meetings::ServicesInterface },
+        -> { Decidim::Meetings::LinkedResourcesInterface },
+        -> { Decidim::Forms::QuestionnaireEntityInterface }
       ]
 
-      field :id, !types.ID
-      field :reference, !types.String
+      field :id, !types.ID, "ID of this meeting"
+      field :reference, !types.String, "Reference for this meeting"
       field :title, !Decidim::Core::TranslatedFieldType, "The title of this meeting."
+      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 :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?
+        }
+      end
 
       field :closed, !types.Boolean, "Whether this meeting is closed or not.", property: :closed?
       field :closingReport, Decidim::Core::TranslatedFieldType, "The closing report of this meeting.", property: :closing_report
-
-      field :registrationsEnabled, !types.Boolean, "Whether the registrations are enabled or not", property: :registrations_enabled
-      field :remainingSlots, types.Int, "Amount of slots available for this meeting", property: :remaining_slots
+      field :attendingOrganizations, types.String, "list of attending organizations", property: :attending_organizations
       field :attendeeCount, types.Int, "Amount of attendees to this meeting", property: :attendees_count
       field :contributionCount, types.Int, "Amount of contributions to this meeting", property: :contributions_count
-
-      field :address, types.String, "The physical address of this meeting"
+      field :minutes, MinutesType, "Minutes for this meeting, if available" do
+        resolve ->(meeting, _args, _ctx) {
+          meeting.minutes if meeting.minutes&.visible?
+        }
+      end
+      field :privateMeeting, !types.Boolean, "Whether the meeting is private or not (it can only be true if transparent)", property: :private_meeting
+      field :transparent, !types.Boolean, "For private meetings, information is public if transparent", property: :transparent
+      field :registrationsEnabled, !types.Boolean, "Whether the registrations are enabled or not", property: :registrations_enabled
+      field :registrationTerms, Decidim::Core::TranslatedFieldType, "The registration terms", property: :registration_terms
+      field :remainingSlots, types.Int, "Amount of slots available for this meeting", property: :remaining_slots
+      field :registrationFormEnabled, !types.Boolean, "Whether the registrations have a form or not", property: :registration_form_enabled
+      field :registrationForm, Decidim::Forms::QuestionnaireType do
+        description "If registration requires to fill a form, this is the questionnaire"
+        resolve ->(meeting, _args, _ctx) {
+          meeting.questionnaire if meeting.registration_form_enabled?
+        }
+      end
+      field :location, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)"
+      field :locationHints, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)", property: :location_hints
+      field :address, types.String, "The physical address of this meeting (used for geolocation)"
       field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this meeting" do
         resolve ->(meeting, _args, _ctx) {
           [meeting.latitude, meeting.longitude]

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

@@ -25,7 +25,7 @@ module Decidim
 
     module MeetingsTypeHelper
       def self.base_scope(component)
-        Meeting.where(component: component)
+        Meeting.visible.where(component: component)
       end
     end
   end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    MinutesType = GraphQL::ObjectType.define do
+      name "MeetingMinutes"
+      description "A meeting minutes"
+
+      field :id, !types.ID, "The ID for the minutes"
+      field :description, Decidim::Core::TranslatedFieldType, "The description for the minutes"
+      field :videoUrl, types.String, "URL for the video of the session, if any", property: :video_url
+      field :audioUrl, types.String, "URL for the audio of the session, if any", property: :audio_url
+      # probably useful in the future, when handling user permissions
+      # field :visible, !types.Boolean, "Whether this minutes is public or not", property: :visible
+
+      field :createdAt, Decidim::Core::DateTimeType do
+        description "The date and time this minutes was created"
+        property :created_at
+      end
+      field :updatedAt, Decidim::Core::DateTimeType do
+        description "The date and time this minutes was updated"
+        property :updated_at
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    ServiceType = GraphQL::ObjectType.define do
+      name "MeetingService"
+      description "A meeting service"
+
+      field :title, Decidim::Core::TranslatedFieldType, "The title for the service"
+      field :description, Decidim::Core::TranslatedFieldType, "The description for the service"
+    end
+  end
+end

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

@@ -1,13 +1,13 @@
-<button class="button button--title secondary light share-link text-center calendar" data-open="calendarShare">
+<button class="button button--title share-link text-center calendar" data-open="calendarShare">
   <%= t(".export_calendar") %>
-  <%= icon "share", class: "icon--after" %>
+  <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
 </button>
 <div class="reveal" id="calendarShare" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".calendar_url") %>:</h3>
+    <h2 class="reveal__title"><%= t(".calendar_url") %>:</h2>
     <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <input type="text" value="<%= "#{path}" %>" readonly>
+  <input type="text" value="<%= "#{path}" %>" readonly title="<%= t(".calendar_url") %>">
 </div>

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

@@ -45,8 +45,8 @@
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

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

@@ -22,12 +22,7 @@
       </div>
     </div>
     <div class="row column">
-      <% if @form.proposals %>
-        <%= form.select :proposal_ids,
-                      @form.proposals.order(title: :asc).map{|proposal| [decidim_html_escape(present(proposal).title), proposal.id]},
-                      { include_blank: true },
-                      { multiple: true, class: "chosen-select" } %>
-      <% end %>
+      <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/admin/meeting_closes/proposals_picker.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/proposals/proposals_picker", current_component %>

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,24 +36,17 @@
       </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 %>
 
       <div class="columns xlarge-6">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: "", disable_parents: false %>
+        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
       </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 %>
 
@@ -77,7 +79,22 @@
                 <%= resource_permissions_link(meeting) %>
 
                 <% if allowed_to? :destroy, :meeting, meeting: meeting %>
-                  <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
+                  <% if present(meeting).authored_proposals.empty? %>
+                    <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
+                  <% else %>
+                    <%=
+                      content_tag(:button,
+                                  class: ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
+                                  "data-invalid-destroy-message" => t("actions.invalid_destroy.proposals_count", count: present(meeting).authored_proposals.size, scope: "decidim.meetings"),
+                                  "data-proposal-titles" => present(meeting).formatted_proposals_titles) do
+                        content_tag(:span,
+                                    data: { tooltip: true, disable_hover: false, click_open: false },
+                                    title: t("actions.destroy", scope: "decidim.meetings")) do
+                          icon("circle-x")
+                        end
+                      end
+                    %>
+                  <% end %>
                 <% end %>
               </td>
             </tr>
@@ -88,3 +105,5 @@
     </div>
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/meetings/admin/destroy_meeting_alert" %>

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

@@ -18,6 +18,10 @@
   </div>
 
   <div class="card-section">
+    <div class="callout alert">
+      <%= t(".recommendation_message") %>
+    </div>
+
     <div class="row column">
       <%= form.check_box :registrations_enabled %>
     </div>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".meetings")) %>
+
 <div class="wrapper">
   <div class="row">
     <h1 class="section-heading"><%= t(".meetings") %></h1>
@@ -10,10 +12,10 @@
           <div class="filters__section">
             <div class="filters__search">
               <div class="input-group">
-                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search") %>
                 <div class="input-group-button">
-                  <button type="submit" class="button button--muted">
-                    <%= icon "magnifying-glass", aria_label: t(".search") %>
+                  <button type="submit" class="button">
+                    <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
                   </button>
                 </div>
               </div>