decidim-meetings 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1998702c63adcee35cf6ba712d2f8ea986f05bd
-  data.tar.gz: bd7b21aa2f323b62e7b195c42eae8238d3e28e15
+  metadata.gz: 8e19fd2bced64fedffeeb7e466c5afcbcad2b814
+  data.tar.gz: 8fadc5f684e7324c085da6f956923b66eb7c1818
 SHA512:
-  metadata.gz: 48441620d5786ab9855fecc90165b6cd87a0b8fbf1ddf7d0b90391f4fa8de14bbbad538bc015990e6c56c05d2149748887b23012cd55cdf2ca864d5552738626
-  data.tar.gz: 289779e9f898af0c999b83ff61ae254b481d721cd3682c3f243f3734fb64beada153d64480bd4b116ce8d696de04ca7879f4602aceea72801a5780cc5d8c5b0c
+  metadata.gz: 7784edad8cef64c16f94fd8c94c175a23b61361beb7dafa50cf4b1ec8fc0aec0c86005578923baf7dce7c4bc2c13a55357375c21263926701a5c226fbe44fc1f
+  data.tar.gz: 17e3efaa9f8d2e42642811a6b0336ae04409344f7e6b0ec19a12a18f3171b5e386432f884017674c8a30625bebce40e4b543c3b331728e6321cf4fc37ddca5dd

data/Rakefile

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "decidim/common_rake"
+require "decidim/dev/common_rake"

data/app/assets/images/decidim/meetings/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M693.07,543.84a18,18,0,1,1,18-18A18,18,0,0,1,693.07,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,693.07,509.83Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,526.93a4.1,4.1,0,1,1,4.1-4.1A4.1,4.1,0,0,1,693.07,526.93Zm0-6.19a2.1,2.1,0,1,0,2.1,2.1A2.1,2.1,0,0,0,693.07,520.74Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,536.65a1,1,0,0,1-.67-0.26c-0.29-.26-7.11-6.5-7.11-14a7.78,7.78,0,0,1,15.57,0c0,7.46-6.82,13.71-7.11,14A1,1,0,0,1,693.07,536.65Zm0-20a5.79,5.79,0,0,0-5.78,5.78c0,5.29,4.13,10.11,5.78,11.82,1.65-1.72,5.78-6.54,5.78-11.82A5.79,5.79,0,0,0,693.07,516.64Z" transform="translate(-675.07 -507.83)"/></svg>

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -23,6 +23,8 @@ module Decidim
 
         def create_meeting
           Meeting.create!(
+            scope: @form.scope,
+            category: @form.category,
             title: @form.title,
             short_description: @form.short_description,
             description: @form.description,

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -28,6 +28,8 @@ module Decidim
 
         def update_meeting
           @meeting.update_attributes!(
+            scope: @form.scope,
+            category: @form.category,
             title: @form.title,
             short_description: @form.short_description,
             description: @form.description,

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -2,23 +2,47 @@
 
 module Decidim
   module Meetings
-    # This controller is the abstract class from which all other controllers of
-    # this engine inherit.
-    #
-    # Note that it inherits from `Decidim::Features::BaseController`, which
-    # override its layout and provide all kinds of useful methods.
+    # Exposes the meeting resource so users can view them
     class MeetingsController < Decidim::Meetings::ApplicationController
+      include FilterResource
+
       helper_method :meetings, :meeting
 
+      def index; end
+
       private
 
       def meetings
-        @meetings ||= Meeting.where(decidim_feature_id: current_feature.id).order(start_time: :asc)
+        @meetings ||= search.results
       end
 
       def meeting
         @meeting ||= meetings.find(params[:id])
       end
+
+      def search_klass
+        MeetingSearch
+      end
+
+      def default_search_params
+        {
+          page: params[:page],
+          per_page: 12
+        }
+      end
+
+      def default_filter_params
+        {
+          order_start_time: "asc",
+          search_text: "",
+          scope_id: "",
+          category_id: ""
+        }
+      end
+
+      def context_params
+        { feature: current_feature, organization: current_organization }
+      end
     end
   end
 end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -14,6 +14,8 @@ module Decidim
         attribute :address, String
         attribute :start_time, DateTime
         attribute :end_time, DateTime
+        attribute :decidim_scope_id, Integer
+        attribute :decidim_category_id, Integer
 
         validates :title, translatable_presence: true
         validates :short_description, translatable_presence: true
@@ -24,6 +26,18 @@ module Decidim
         validates :end_time, presence: true, date: { after: :start_time }
 
         validates :current_feature, presence: true
+        validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
+        validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
+
+        def scope
+          return unless current_feature
+          @scope ||= current_feature.scopes.where(id: decidim_scope_id).first
+        end
+
+        def category
+          return unless current_feature
+          @category ||= current_feature.categories.where(id: decidim_category_id).first
+        end
       end
     end
   end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    # Custom helpers, scoped to the meetings engine.
+    #
+    module ApplicationHelper
+      include PaginateHelper
+    end
+  end
+end

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

@@ -5,8 +5,25 @@ module Decidim
     # title, description and any other useful information to render a custom meeting.
     class Meeting < Meetings::ApplicationRecord
       belongs_to :feature, foreign_key: "decidim_feature_id", class_name: Decidim::Feature
-
+      belongs_to :scope, foreign_key: "decidim_scope_id", class_name: Decidim::Scope
+      belongs_to :category, foreign_key: "decidim_category_id", class_name: Decidim::Category
+      has_one :organization, through: :feature
       validates :title, presence: true
+
+      validate :scope_belongs_to_organization
+      validate :category_belongs_to_organization
+
+      private
+
+      def scope_belongs_to_organization
+        return unless scope
+        errors.add(:scope, :invalid) unless feature.scopes.where(id: scope.id).exists?
+      end
+
+      def category_belongs_to_organization
+        return unless category
+        errors.add(:category, :invalid) unless feature.categories.where(id: category.id).exists?
+      end
     end
   end
 end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+module Decidim
+  module Meetings
+    # This class handles search and filtering of meetings. Needs a
+    # `current_feature` param with a `Decidim::Feature` in order to
+    # find the meetings.
+    class MeetingSearch < ResourceSearch
+      # Public: Initializes the service.
+      # feature     - A Decidim::Feature 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 = {})
+        super(Meeting.all, 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}%"))
+          .or(query.where(localized_search_text_in(:short_description), text: "%#{search_text}%"))
+      end
+
+      # Handle the order_start_time filter
+      def search_order_start_time
+        query.order(start_time: order_start_time)
+      end
+
+      # Handle the scope_id filter
+      def search_scope_id
+        query.where(decidim_scope_id: scope_id)
+      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/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -11,11 +11,11 @@
 </div>
 
 <div class="field" >
-  <%= form.translated :editor, :location %>
+  <%= form.translated :text_area, :location %>
 </div>
 
 <div class="field" >
-  <%= form.translated :editor, :location_hints %>
+  <%= form.translated :text_area, :location_hints %>
 </div>
 
 <div class="field" >
@@ -30,3 +30,10 @@
   <%= form.datetime_field :end_time %>
 </div>
 
+<div class="field" >
+  <%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
+</div>
+
+<div class="field" >
+  <%= form.categories_select :decidim_category_id, current_participatory_process.categories, prompt: "", disable_parents: false %>
+</div>

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

@@ -0,0 +1,24 @@
+<%= filter_form_for filter do |form| %>
+  <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') %>
+        <div class="input-group-button">
+          <button type="submit" class="button button--muted">
+            <%= icon "magnifying-glass", aria_label: t('.search') %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <%= form.collection_radio_buttons :order_start_time, [["asc", t('.ascendent')], ["desc", t('.descendent')]], :first, :last, legend_title: t('.date') %>
+
+  <% if current_organization.scopes.any? %>
+    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% end %>
+
+  <% if current_feature.categories.any? %>
+    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>  
+  <% end %>
+<% end %>

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

@@ -0,0 +1,30 @@
+<div class="row small-up-1 medium-up-2 card-grid">
+  <% meetings.each do |meeting| %>
+    <div class="column">
+      <article class="card card--meeting">
+        <div class="card__content">
+          <%= link_to meeting, class: "card__link" do %>
+            <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
+          <% end %>
+          <div class="card__datetime">
+            <div class="card__datetime__date">
+              <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B" %></span>
+            </div>
+            <div class="card__datetime__time">
+              <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
+            </div>
+          </div>
+          <%== translated_attribute meeting.short_description %>
+          <%= render partial: "tags", locals: { meeting: meeting } %>
+          <div class="address card__extra">
+            <div class="address__icon">
+              <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
+            </div>
+            <%= render partial: 'address_details', locals: { meeting: meeting } %>
+          </div>
+        </div>
+      </article>
+    </div>
+  <% end %>
+</div>
+<%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>

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

@@ -0,0 +1,10 @@
+<% if meeting.category.present? || meeting.scope.present? %>
+  <ul class="tags tags--meeting" >
+    <% if meeting.category.present? %>
+      <li><%= link_to translated_attribute(meeting.category.name), decidim_meetings.meetings_path(filter: { category_id: meeting.category.id }) %></li>
+    <% end %>
+    <% if meeting.scope.present? %>
+      <li><%= link_to meeting.scope.name, decidim_meetings.meetings_path(filter: { scope_id: [meeting.scope.id] }) %></li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -1,30 +1,12 @@
 <% content_for(:title, t(".title")) %>
 
-<div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-  <% meetings.each do |meeting| %>
-    <div class="column">
-      <article class="card card--meeting">
-        <div class="card__content">
-          <%= link_to meeting, class: "card__link" do %>
-            <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
-          <% end %>
-          <div class="card__datetime">
-            <div class="card__datetime__date">
-              <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B" %></span>
-            </div>
-            <div class="card__datetime__time">
-              <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
-            </div>
-          </div>
-          <%== translated_attribute meeting.description %>
-          <div class="address card__extra">
-            <div class="address__icon">
-              <%= icon "meetings", removeIconClass: true, width: 40, height: 70 %>
-            </div>
-            <%= render partial: 'address_details', locals: { meeting: meeting } %>
-          </div>
-        </div>
-      </article>
+<div class="row">
+  <div class="columns mediumlarge-4 large-3">
+    <div class="card card--secondary show-for-mediumlarge" >
+      <%= render partial: "filters" %>
     </div>
-  <% end %>
+  </div>
+  <div id="meetings" class="columns mediumlarge-8 large-9">
+    <%= render partial: "meetings" %>
+  </div>
 </div>

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

@@ -0,0 +1,2 @@
+var $meetings = $('#meetings');
+$meetings.html('<%= j(render partial: "meetings") %>');

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

@@ -30,6 +30,7 @@
           </div>
         </div>
       </div>
+      <%= render partial: "tags", locals: { meeting: meeting } %>
     </div>
     <div class="section">
       <h3 class="section-heading"><%= t(".meeting_description") %></h3>

data/config/locales/ca.yml

@@ -32,6 +32,13 @@ ca:
           meeting:
             name: Trobada
       meetings:
+        filters:
+          ascendent: Ascendent
+          category: Categoria
+          date: Data
+          descendent: Descendent
+          scopes: Àmbits
+          search: Cerca
         index:
           title: Llistat de trobades
         show:

data/config/locales/en.yml

@@ -33,6 +33,13 @@ en:
           meeting:
             name: Meeting
       meetings:
+        filters:
+          ascendent: Ascendent
+          category: Category
+          date: Date
+          descendent: Descendent
+          scopes: Scopes
+          search: Search
         index:
           title: Meetings
         show:

data/config/locales/es.yml

@@ -32,6 +32,13 @@ es:
           meeting:
             name: Encuentro
       meetings:
+        filters:
+          ascendent: Ascendente
+          category: Categoría
+          date: Fecha
+          descendent: Descendiente
+          scopes: Ámbitos
+          search: Buscar
         index:
           title: Lista de encuentros
         show:

data/db/migrate/20161130121354_create_meetings.rb

@@ -11,6 +11,8 @@ class CreateMeetings < ActiveRecord::Migration[5.0]
       t.jsonb :location_hints
       t.references :decidim_feature, index: true
       t.references :decidim_author, index: true
+      t.references :decidim_scope, index: true
+      t.references :decidim_category, index: true
 
       t.timestamps
     end

data/lib/decidim/meetings/feature.rb

@@ -5,8 +5,9 @@ require_dependency "decidim/features/namer"
 Decidim.register_feature(:meetings) do |feature|
   feature.engine = Decidim::Meetings::ListEngine
   feature.admin_engine = Decidim::Meetings::AdminEngine
+  feature.icon = "decidim/meetings/icon.svg"
 
-  feature.on(:destroy) do |instance|
+  feature.on(:before_destroy) do |instance|
     raise StandardError, "Can't remove this feature" if Decidim::Meetings::Meeting.where(feature: instance).any?
   end
 
@@ -21,8 +22,10 @@ Decidim.register_feature(:meetings) do |feature|
       )
 
       3.times do
-        Decidim::Meetings::Meeting.create!(
+        meeting = Decidim::Meetings::Meeting.create!(
           feature: feature,
+          scope: process.organization.scopes.sample,
+          category: process.categories.sample,
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(3)
@@ -36,6 +39,8 @@ Decidim.register_feature(:meetings) do |feature|
           end_time: 3.weeks.from_now + 4.hours,
           address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}"
         )
+
+        Decidim::Comments::Seed.comments_for(meeting)
       end
     end
   end

data/lib/decidim/meetings/list_engine.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+require "searchlight"
+require "kaminari"
+
 module Decidim
   module Meetings
     # This is the engine that runs on the public interface of `decidim-meetings`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -54,20 +54,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: searchlight
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 description: ''
 email:
 - josepjaume@gmail.com
@@ -79,6 +107,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/images/decidim/meetings/icon.svg
 - app/commands/decidim/meetings/admin/create_meeting.rb
 - app/commands/decidim/meetings/admin/update_meeting.rb
 - app/controllers/decidim/meetings/admin/application_controller.rb
@@ -86,14 +115,20 @@ files:
 - app/controllers/decidim/meetings/application_controller.rb
 - app/controllers/decidim/meetings/meetings_controller.rb
 - app/forms/decidim/meetings/admin/meeting_form.rb
+- app/helpers/decidim/meetings/application_helper.rb
 - app/models/decidim/meetings/application_record.rb
 - app/models/decidim/meetings/meeting.rb
+- app/services/decidim/meetings/meeting_search.rb
 - app/views/decidim/meetings/admin/meetings/_form.html.erb
 - app/views/decidim/meetings/admin/meetings/edit.html.erb
 - app/views/decidim/meetings/admin/meetings/index.html.erb
 - app/views/decidim/meetings/admin/meetings/new.html.erb
 - app/views/decidim/meetings/meetings/_address_details.html.erb
+- app/views/decidim/meetings/meetings/_filters.html.erb
+- app/views/decidim/meetings/meetings/_meetings.html.erb
+- app/views/decidim/meetings/meetings/_tags.html.erb
 - app/views/decidim/meetings/meetings/index.html.erb
+- app/views/decidim/meetings/meetings/index.js.erb
 - app/views/decidim/meetings/meetings/show.html.erb
 - config/i18n-tasks.yml
 - config/locales/ca.yml
@@ -125,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A meetings component for decidim's participatory processes.