decidim-meetings 0.19.0 → 0.22.0

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

@@ -4,6 +4,7 @@ module Decidim
   module Meetings
     # This helper include some methods for rendering meetings dynamic maps.
     module MapHelper
+      include Decidim::SanitizeHelper
       # Serialize a collection of geocoded meetings to be used by the dynamic map component
       #
       # meetings - A collection of meetings
@@ -18,7 +19,7 @@ module Decidim
                                                                startTime: "#{meeting.start_time.strftime("%H:%M")} - #{meeting.end_time.strftime("%H:%M")}",
                                                                icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
                                                                location: translated_attribute(meeting.location),
-                                                               locationHints: translated_attribute(meeting.location_hints),
+                                                               locationHints: decidim_html_escape(translated_attribute(meeting.location_hints)),
                                                                link: resource_locator(meeting).path)
         end
       end

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

@@ -16,7 +16,7 @@ module Decidim
       # Returns the meeting's description truncated.
       def meeting_description(meeting, max_length = 120)
         link = resource_locator(meeting).path
-        description = present(meeting).description
+        description = CGI.unescapeHTML present(meeting).description
         tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
         CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)
       end

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

@@ -20,6 +20,7 @@ module Decidim
       include Decidim::Hashtaggable
       include Decidim::Forms::HasQuestionnaire
       include Decidim::Paddable
+      include Decidim::ActsAsAuthor
 
       belongs_to :organizer, foreign_key: "organizer_id", class_name: "Decidim::User", optional: true
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
@@ -61,6 +62,12 @@ module Decidim
         registrations.where.not(decidim_user_group_id: nil)
       end
 
+      # Returns the presenter for this author, to be used in the views.
+      # Required by ActsAsAuthor.
+      def presenter
+        Decidim::Meetings::MeetingPresenter.new(self)
+      end
+
       def self.log_presenter_class_for(_log)
         Decidim::Meetings::AdminLog::MeetingPresenter
       end
@@ -166,6 +173,17 @@ module Decidim
         (Time.current - end_time) < 72.hours
       end
 
+      def authored_proposals
+        Decidim::Proposals::Proposal
+          .joins(:coauthorships)
+          .where(
+            decidim_coauthorships: {
+              decidim_author_type: "Decidim::Meetings::Meeting",
+              decidim_author_id: id
+            }
+          )
+      end
+
       private
 
       def can_participate_in_meeting?(user)

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

@@ -18,8 +18,7 @@ module Decidim
         return unless meeting
 
         handle_locales(meeting.title, all_locales) do |content|
-          content = decidim_html_escape(content)
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_html_escape(content))
           renderer.render(links: links).html_safe
         end
       end
@@ -28,7 +27,7 @@ module Decidim
         return unless meeting
 
         handle_locales(meeting.description, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
           renderer.render(links: links).html_safe
         end
       end
@@ -66,6 +65,18 @@ module Decidim
         false
       end
 
+      def proposals
+        return unless meeting
+
+        @proposals ||= meeting.authored_proposals.load
+      end
+
+      def formatted_proposals_titles
+        return unless meeting
+
+        proposals.map.with_index { |proposal, index| "#{index + 1}) #{proposal.title}\n" }
+      end
+
       private
 
       def handle_locales(content, all_locales)

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A class used to find meetings filtered by components and a date range
+    class FilteredMeetings < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # components - An array of Decidim::Component
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def self.for(components, start_at = nil, end_at = nil)
+        new(components, start_at, end_at).query
+      end
+
+      # Initializes the class.
+      #
+      # components - An array of Decidim::Component
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def initialize(components, start_at = nil, end_at = nil)
+        @components = components
+        @start_at = start_at
+        @end_at = end_at
+      end
+
+      # 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 = meetings.where("created_at >= ?", @start_at) if @start_at.present?
+        meetings = meetings.where("created_at <= ?", @end_at) if @end_at.present?
+        meetings
+      end
+    end
+  end
+end

data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -21,10 +18,8 @@ module Decidim
                                                            organization: @organization, decidim_category_id: category_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -35,8 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          @query = Decidim::Meetings::Meeting.where(component: components).joins(:component)
+          @query = Decidim::Meetings::Meeting.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
                                              .left_outer_joins(:category).visible
           @query = @query.where("decidim_meetings_meetings.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.decidim_category_id",

data/app/services/decidim/meetings/calendar/meeting_to_event.rb

@@ -36,10 +36,10 @@ module Decidim
           return @event if @event
 
           @event = Icalendar::Event.new
-          @event.dtstart = Icalendar::Values::DateTime.new(meeting.start_time)
-          @event.dtend = Icalendar::Values::DateTime.new(meeting.end_time)
+          @event.dtstart = Icalendar::Values::DateTime.new(meeting.start_time.utc, "tzid" => "UTC")
+          @event.dtend = Icalendar::Values::DateTime.new(meeting.end_time.utc, "tzid" => "UTC")
           @event.summary = present(meeting).title
-          @event.description = strip_tags(present(meeting).description)
+          @event.description = strip_tags(CGI.unescapeHTML(present(meeting).description))
           @event.location = meeting.address
           @event.geo = [meeting.latitude, meeting.longitude]
           @event.url = url_for(meeting)

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 :organizer, Decidim::Core::AuthorInterface, "If specified, the organizer 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/meetings/_form.html.erb

@@ -13,14 +13,17 @@
 
     <div class="row column">
       <%= form.text_field :address %>
+      <p class="help-text"><%= t(".address_help") %></p>
     </div>
 
     <div class="row column">
       <%= form.translated :text_area, :location %>
+      <p class="help-text"><%= t(".location_help") %></p>
     </div>
 
     <div class="row column">
       <%= form.translated :text_area, :location_hints %>
+      <p class="help-text"><%= t(".location_hints_help") %></p>
     </div>
 
     <div class="row">
@@ -40,7 +43,7 @@
       <% 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>
 

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

@@ -77,7 +77,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 +103,5 @@
     </div>
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/meetings/admin/destroy_meeting_alert" %>