decidim-meetings 0.10.1 → 0.11.0.pre1

data/app/models/decidim/meetings/abilities/current_user_ability.rb

@@ -26,16 +26,16 @@ module Decidim
         private
 
         def authorized?(action)
-          return unless feature
+          return unless component
 
-          ActionAuthorizer.new(user, feature, action).authorize.ok?
+          ActionAuthorizer.new(user, component, action).authorize.ok?
         end
 
-        def feature
-          feature = context.fetch(:current_feature, nil)
-          return nil unless feature && feature.manifest.name == :meetings
+        def component
+          component = context.fetch(:current_component, nil)
+          return nil unless component && component.manifest.name == :meetings
 
-          feature
+          component
         end
       end
     end

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

@@ -8,9 +8,9 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::HasAttachments
       include Decidim::HasAttachmentCollections
-      include Decidim::HasFeature
+      include Decidim::HasComponent
       include Decidim::HasReference
-      include Decidim::ScopableFeature
+      include Decidim::ScopableComponent
       include Decidim::HasCategory
       include Decidim::Followable
       include Decidim::Comments::Commentable
@@ -19,11 +19,11 @@ module Decidim
 
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
 
-      feature_manifest_name "meetings"
+      component_manifest_name "meetings"
 
       validates :title, presence: true
 
-      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
+      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.component.organization.host } }
 
       scope :past, -> { where(arel_table[:end_time].lteq(Time.current)) }
       scope :upcoming, -> { where(arel_table[:start_time].gt(Time.current)) }
@@ -38,11 +38,11 @@ module Decidim
 
       def has_available_slots?
         return true if available_slots.zero?
-        available_slots > registrations.count
+        (available_slots - reserved_slots) > registrations.count
       end
 
       def remaining_slots
-        available_slots - registrations.count
+        available_slots - reserved_slots - registrations.count
       end
 
       def has_registration_for?(user)
@@ -51,12 +51,12 @@ module Decidim
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
-        feature.settings.comments_enabled?
+        component.settings.comments_enabled?
       end
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-        commentable? && !feature.current_settings.comments_blocked
+        commentable? && !component.current_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
@@ -73,6 +73,12 @@ module Decidim
       def users_to_notify_on_comment_created
         followers
       end
+
+      def can_participate?(user)
+        return true unless participatory_space.try(:private_space?)
+        return true if participatory_space.try(:private_space?) && participatory_space.users.include?(user)
+        return false if participatory_space.try(:private_space?) && participatory_space.try(:is_transparent?)
+      end
     end
   end
 end

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

@@ -33,7 +33,7 @@ module Decidim
 
         def action_string
           case action
-          when "close", "create", "delete", "update"
+          when "close", "create", "delete", "export_registrations", "update"
             "decidim.meetings.admin_log.meeting.#{action}"
           else
             super

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

@@ -3,11 +3,11 @@
 module Decidim
   module Meetings
     # This class handles search and filtering of meetings. Needs a
-    # `current_feature` param with a `Decidim::Feature` in order to
+    # `current_component` param with a `Decidim::Component` in order to
     # find the meetings.
     class MeetingSearch < ResourceSearch
       # Public: Initializes the service.
-      # feature     - A Decidim::Feature to get the meetings from.
+      # component     - A Decidim::Component to get the meetings from.
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    MeetingType = GraphQL::ObjectType.define do
+      name "Meeting"
+      description "A meeting"
+
+      interfaces [
+        Decidim::Comments::CommentableInterface,
+        Decidim::Core::CategorizableInterface,
+        Decidim::Core::ScopableInterface,
+        Decidim::Core::AttachableInterface
+      ]
+
+      field :id, !types.ID
+      field :reference, !types.String
+      field :title, !Decidim::Core::TranslatedFieldType, "The title 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 :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 :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 :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this meeting" do
+        resolve ->(meeting, _args, _ctx) {
+          [meeting.latitude, meeting.longitude]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    MeetingsType = GraphQL::ObjectType.define do
+      interfaces [-> { Decidim::Core::ComponentInterface }]
+
+      name "Meetings"
+      description "A meetings component of a participatory space."
+
+      connection :meetings, MeetingType.connection_type do
+        resolve ->(component, _args, _ctx) {
+                  MeetingsTypeHelper.base_scope(component).includes(:component)
+                }
+      end
+
+      field(:meeting, MeetingType) do
+        argument :id, !types.ID
+
+        resolve ->(component, args, _ctx) {
+          MeetingsTypeHelper.base_scope(component).find_by(id: args[:id])
+        }
+      end
+    end
+
+    module MeetingsTypeHelper
+      def self.base_scope(component)
+        Meeting.where(component: component)
+      end
+    end
+  end
+end

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

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

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

@@ -1,17 +1,17 @@
 <h2 class="process-title-summary">
-  <%= t('.new_invite') %>
+  <%= t(".new_invite") %>
 </h2>
 
 <div class="section">
   <div class="callout warning">
-    <p><%= t('.explanation') %></p>
+    <p><%= t(".explanation") %></p>
   </div>
 </div>
 
 <%= decidim_form_for(@form, url: meeting_registrations_invites_path, method: :post, html: { class: "form new_meeting_registration_invite" }) do |f| %>
   <div class="card">
     <div class="card-section">
-      <%= render partial: 'form', object: f %>
+      <%= render partial: "form", object: f %>
     </div>
   </div>
 

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

@@ -5,7 +5,7 @@
 
   <div class="card-section">
     <div class="row column">
-      <%= form.translated :text_area, :closing_report, autofocus: true, rows: 15 %>
+      <%= form.translated :editor, :closing_report, autofocus: true, rows: 15 %>
     </div>
 
     <div class="row column">
@@ -26,8 +26,7 @@
         <%= form.select :proposal_ids,
                         @form.proposals.order(title: :asc).pluck(:title, :id),
                         { include_blank: true },
-                        { multiple: true, class: "chosen-select" }
-        %>
+                        { multiple: true, class: "chosen-select" } %>
       <% end %>
     </div>
   </div>

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

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

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

@@ -0,0 +1,42 @@
+<div class="card" id="meetings">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :description %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :address %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_area, :location %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_area, :location_hints %>
+    </div>
+
+    <div class="row">
+      <div class="columns xlarge-6">
+        <%= form.datetime_field :start_time %>
+      </div>
+
+      <div class="columns xlarge-6">
+        <%= form.datetime_field :end_time %>
+      </div>
+    </div>
+  </div>
+
+</div>
+
+<%= render "decidim/meetings/admin/meetings/services", form: form %>
+
+<%= javascript_include_tag "decidim/meetings/admin/meetings_form" %>

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

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: meeting_copies_path(meeting), method: :post, html: { class: "form copy_meetings" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("meeting_copies.new.title", scope: "decidim.admin"), select: t("meeting_copies.new.select", scope: "decidim.admin")} %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("meeting_copies.new.copy", scope: "decidim.admin") %>
+  </div>
+<% end %>

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

@@ -4,45 +4,49 @@
   </div>
 
   <div class="card-section">
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :text_field, :title, autofocus: true %>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :editor, :description %>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.text_field :address %>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :text_area, :location %>
     </div>
 
-    <div class="row column" >
+    <div class="row column">
       <%= form.translated :text_area, :location_hints %>
     </div>
 
-    <div class="row" >
-      <div class="columns xlarge-6" >
+    <div class="row">
+      <div class="columns xlarge-6">
         <%= form.datetime_field :start_time %>
       </div>
 
-      <div class="columns xlarge-6" >
+      <div class="columns xlarge-6">
         <%= form.datetime_field :end_time %>
       </div>
     </div>
-    <div class="row" >
+    <div class="row">
       <% if current_participatory_space.has_subscopes? %>
-        <div class="columns xlarge-6" >
+        <div class="columns xlarge-6">
           <%= scopes_picker_field form, :decidim_scope_id %>
         </div>
       <% end %>
 
-      <div class="columns xlarge-6" >
+      <div class="columns xlarge-6">
         <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: "", disable_parents: false %>
       </div>
     </div>
   </div>
 </div>
+
+<%= render "services", form: form, id: tabs_id_for_service(blank_service) %>
+
+<%= javascript_include_tag "decidim/meetings/admin/meetings_form" %>

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

@@ -0,0 +1,48 @@
+<% service = form.object %>
+
+<div class="card meeting-service" id="<%= id %>-field">
+  <div class="card-divider service-divider">
+    <h2 class="card-title">
+      <span><%= t(".service") %></span>
+
+      <button class="button small alert hollow move-up-service button--title">
+        <%== "#{icon("arrow-top")} #{t(".up")}" %>
+      </button>
+
+      <button class="button small alert hollow move-down-service button--title">
+        <%== "#{icon("arrow-bottom")} #{t(".down")}" %>
+      </button>
+
+      <button class="button small alert hollow remove-service button--title">
+        <%= t(".remove") %>
+      </button>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%=
+        form.translated(
+          :text_field,
+          :title,
+          tabs_id: id,
+          label: t(".title")
+        )
+      %>
+    </div>
+
+    <div class="row column">
+      <%=
+        form.translated(
+          :text_area,
+          :description,
+          rows: 2,
+          tabs_id: id,
+          label: t(".description")
+        )
+      %>
+    </div>
+  </div>
+
+  <%= form.hidden_field :deleted, value: false %>
+</div>

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

@@ -0,0 +1,25 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".services") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="meeting-services">
+      <template>
+        <%= fields_for "meeting[services][#{blank_service.to_param}]", blank_service do |service_form| %>
+          <%= render "decidim/meetings/admin/meetings/service", form: service_form, id: tabs_id_for_service(blank_service) %>
+        <% end %>
+      </template>
+
+      <div class="meeting-services-list">
+        <% form.object.services.each do |service| %>
+          <%= fields_for "meeting[services][]", service do |service_form| %>
+            <%= render "decidim/meetings/admin/meetings/service", form: service_form, id: tabs_id_for_service(service) %>
+          <% end %>
+        <% end %>
+      </div>
+
+      <button class="button add-service"><%= t(".add_service") %></button>
+    </div>
+  </div>
+</div>

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

@@ -1,8 +1,7 @@
-<%=  decidim_form_for(@form, html: { class: "form edit_meeting" })  do |f| %>
-  <%= render partial: 'form', object: f %>
+<%= decidim_form_for(@form, html: { class: "form edit_meeting" })  do |f| %>
+  <%= render partial: "form", object: f %>
 
     <div class="button--double form-general-submit">
       <%= f.submit t(".update") %>
     </div>
 <% end %>
-