decidim 0.0.1 → 0.0.2

data/decidim-meetings/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/decidim-meetings/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/decidim-meetings/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/decidim-meetings/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/decidim-meetings/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/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb

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

data/decidim-meetings/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/decidim-meetings/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/decidim-meetings/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/decidim-meetings/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/decidim-meetings/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/decidim-meetings/decidim-meetings.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "rectify", "~> 0.8"
   s.add_dependency "date_validator", "~> 0.9"
+  s.add_dependency "searchlight", "~> 4.1.0"
+  s.add_dependency "kaminari", "~> 1.0.1"
 
   s.add_development_dependency "decidim-dev", Decidim.version
 end

data/decidim-meetings/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/decidim-meetings/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`.

data/decidim-meetings/spec/commands/create_meeting_spec.rb

@@ -4,6 +4,8 @@ describe Decidim::Meetings::Admin::CreateMeeting do
   let(:organization) { create :organization, available_locales: [:en] }
   let(:participatory_process) { create :participatory_process, organization: organization }
   let(:current_feature) { create :feature, participatory_process: participatory_process }
+  let(:scope) { create :scope, organization: organization }
+  let(:category) { create :category, participatory_process: participatory_process }
   let(:form) do
     double(
       :invalid? => invalid,
@@ -15,6 +17,8 @@ describe Decidim::Meetings::Admin::CreateMeeting do
       start_time: 1.day.from_now,
       end_time: 1.day.from_now + 1.hour,
       address: "address",
+      scope: scope,
+      category: category,
       current_feature: current_feature
     )
   end
@@ -31,8 +35,25 @@ describe Decidim::Meetings::Admin::CreateMeeting do
   end
 
   context "when everything is ok" do
+    let(:meeting) { Decidim::Meetings::Meeting.last }
+
     it "creates the meeting" do
       expect { subject.call }.to change { Decidim::Meetings::Meeting.count }.by(1)
     end
+
+    it "sets the scope" do
+      subject.call
+      expect(meeting.scope).to eq scope
+    end
+
+    it "sets the category" do
+      subject.call
+      expect(meeting.category).to eq category
+    end
+
+    it "sets the feature" do
+      subject.call
+      expect(meeting.feature).to eq current_feature
+    end
   end
 end

data/decidim-meetings/spec/commands/update_meeting_spec.rb

@@ -3,6 +3,8 @@ require "spec_helper"
 describe Decidim::Meetings::Admin::UpdateMeeting do
   let(:meeting) { create :meeting}
   let(:organization) { meeting.feature.organization }
+  let(:scope) { create :scope, organization: organization }
+  let(:category) { create :category, participatory_process: meeting.feature.participatory_process }
   let(:form) do
     double(
       :invalid? => invalid,
@@ -13,6 +15,8 @@ describe Decidim::Meetings::Admin::UpdateMeeting do
       location_hints: {en: "location_hints"},
       start_time: 1.day.from_now,
       end_time: 1.day.from_now + 1.hour,
+      scope: scope,
+      category: category,
       address: "address"
     )
   end
@@ -29,8 +33,19 @@ describe Decidim::Meetings::Admin::UpdateMeeting do
   end
 
   context "when everything is ok" do
-    it "creates the meeting" do
-      expect { subject.call }.to change { Decidim::Meetings::Meeting.count }.by(1)
+    it "updates the meeting" do
+      subject.call
+      expect(translated(meeting.title)).to eq "title"
+    end
+
+    it "sets the scope" do
+      subject.call
+      expect(meeting.scope).to eq scope
+    end
+
+    it "sets the category" do
+      subject.call
+      expect(meeting.category).to eq category
     end
   end
 end

data/decidim-meetings/spec/factories.rb

@@ -1,5 +1,5 @@
-require_relative "../../decidim-core/spec/factories"
-require_relative "../../decidim-admin/spec/factories"
+require "decidim/core/test/factories"
+require "decidim/admin/test/factories"
 
 FactoryGirl.define do
   factory :meeting, class: Decidim::Meetings::Meeting do
@@ -10,7 +10,7 @@ FactoryGirl.define do
     location_hints { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     address { Faker::Lorem.sentence(3) }
     start_time { 1.day.from_now }
-    end_time { 1.day.from_now + 2.hours }
+    end_time { start_time.advance(hours: 2) }
     feature
   end
 end

data/decidim-meetings/spec/features/explore_meetings_spec.rb

@@ -34,6 +34,7 @@ describe "Explore meetings", type: :feature do
 
   context "show" do
     let(:path) { decidim_meetings.meeting_path(id: meeting.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id) }
+    let(:meetings_count) { 1 }
     let(:meeting) { meetings.first }
 
     it "shows all meeting info" do
@@ -50,5 +51,57 @@ describe "Explore meetings", type: :feature do
         expect(page).to have_content("14:15 - 16:17")
       end
     end
+
+    context "without category or scope" do
+      it "does not show any tag" do
+        expect(page).not_to have_selector("ul.tags.tags--meeting")
+      end
+    end
+
+    context "with a category" do
+      let(:meeting) do
+        meeting = meetings.first
+        meeting.category = create :category, participatory_process: participatory_process
+        meeting.save
+        meeting
+      end
+
+      it "shows tags for category" do
+        expect(page).to have_selector("ul.tags.tags--meeting")
+        within "ul.tags.tags--meeting" do
+          expect(page).to have_content(translated(meeting.category.name))
+        end
+      end
+
+      it "links to the filter for this category" do
+        within "ul.tags.tags--meeting" do
+          click_link translated(meeting.category.name)
+        end
+        expect(page).to have_select("filter_category_id", selected: translated(meeting.category.name))
+      end
+    end
+
+    context "with a scope" do
+      let(:meeting) do
+        meeting = meetings.first
+        meeting.scope = create :scope, organization: organization
+        meeting.save
+        meeting
+      end
+
+      it "shows tags for scope" do
+        expect(page).to have_selector("ul.tags.tags--meeting")
+        within "ul.tags.tags--meeting" do
+          expect(page).to have_content(meeting.scope.name)
+        end
+      end
+
+      it "links to the filter for this scope" do
+        within "ul.tags.tags--meeting" do
+          click_link meeting.scope.name
+        end
+        expect(page).to have_checked_field(meeting.scope.name)
+      end
+    end
   end
 end

data/decidim-meetings/spec/forms/meeting_form_spec.rb

@@ -30,8 +30,14 @@ describe Decidim::Meetings::Admin::MeetingForm do
   let(:address) { Faker::Lorem.sentence(3) }
   let(:start_time) { 2.days.from_now }
   let(:end_time) { 2.days.from_now + 4.hours }
+  let(:scope) { create :scope, organization: organization }
+  let(:scope_id) { scope.id }
+  let(:category) { create :category, participatory_process: participatory_process }
+  let(:category_id) { category.id }
   let(:attributes) do
     {
+      decidim_scope_id: scope_id,
+      decidim_category_id: category_id,
       title_en: title[:en],
       description_en: description[:en],
       short_description_en: short_description[:en],
@@ -43,7 +49,7 @@ describe Decidim::Meetings::Admin::MeetingForm do
     }
   end
 
-  subject { described_class.from_params(attributes, context).with_context(current_feature: current_feature) }
+  subject { described_class.from_params(attributes).with_context(context) }
 
   it { is_expected.to be_valid }
 
@@ -112,4 +118,16 @@ describe Decidim::Meetings::Admin::MeetingForm do
 
     it { is_expected.not_to be_valid }
   end
+
+  describe "when the scope does not exist" do
+    let(:scope_id) { scope.id + 10 }
+
+    it { is_expected.not_to be_valid }
+  end
+
+  describe "when the category does not exist" do
+    let(:category_id) { category.id + 10 }
+
+    it { is_expected.not_to be_valid }
+  end
 end