decidim 0.0.5 → 0.0.6

data/decidim-proposals/spec/shared/create_proposal_examples.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
-RSpec.shared_examples "create a proposal" do |with_author| 
+RSpec.shared_examples "create a proposal" do |with_author|
   let(:feature) { create(:proposal_feature) }
   let(:organization) { feature.organization }
   let(:form) do
@@ -13,11 +13,16 @@ RSpec.shared_examples "create a proposal" do |with_author|
   end
   let(:author) { create(:user, organization: organization) } if with_author
 
+  let(:address) { nil }
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
+
   describe "call" do
     let(:form_params) do
       {
         title: "A reasonable proposal title",
-        body: "A reasonable proposal body"
+        body: "A reasonable proposal body",
+        address: address
       }
     end
 
@@ -64,6 +69,28 @@ RSpec.shared_examples "create a proposal" do |with_author|
           expect(proposal.author).to eq(author)
         end
       end
+
+      context "when geocoding is enabled" do
+        let(:feature) { create(:proposal_feature, :with_geocoding_enabled) }
+
+        context "when the address is present" do
+          let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+
+          before do
+            Geocoder::Lookup::Test.add_stub(address, [
+              { 'latitude' => latitude, 'longitude' => longitude }
+            ])
+          end
+
+          it "sets the latitude and longitude" do
+            command.call
+            proposal = Decidim::Proposals::Proposal.last
+
+            expect(proposal.latitude).to eq(latitude)
+            expect(proposal.longitude).to eq(longitude)
+          end
+        end
+      end
     end
   end
 end

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -1,6 +1,16 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
 RSpec.shared_examples "manage proposals" do
+  let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
+
+  before do
+    Geocoder::Lookup::Test.add_stub(address, [
+      { 'latitude' => latitude, 'longitude' => longitude }
+    ])
+  end
+
   context "previewing proposals" do
     it "allows the user to preview the proposal" do
       new_window = window_opened_by { click_link proposal.title }
@@ -15,7 +25,8 @@ RSpec.shared_examples "manage proposals" do
   context "creation" do
     context "when official_proposals setting is enabled" do
       before do
-        current_feature.update_attributes(settings: { official_proposals_enabled: true } )
+        current_feature.settings[:official_proposals_enabled] = true
+        current_feature.save
       end
 
       context "when creation is enabled" do
@@ -29,57 +40,115 @@ RSpec.shared_examples "manage proposals" do
           )
         end
 
-        context "when scoped_proposals setting is enabled" do
+        context "when process is not related to any scope" do
           before do
-            current_feature.update_attributes(settings: { scoped_proposals_enabled: true } )
+            participatory_process.update_attributes(scope: nil)
           end
 
-          it "can be filtered by scope" do
+          it "can be related to a scope" do
             find(".actions .new").click
 
             within "form" do
               expect(page).to have_content(/Scope/i)
             end
           end
+
+          it "creates a new proposal" do
+            find(".actions .new").click
+
+            within ".new_proposal" do
+              fill_in :proposal_title, with: "Make decidim great again"
+              fill_in :proposal_body, with: "Decidim is great but it can be better"
+              select category.name["en"], from: :proposal_category_id
+              select scope.name, from: :proposal_scope_id
+
+              find("*[type=submit]").click
+            end
+
+            within ".flash" do
+              expect(page).to have_content("successfully")
+            end
+
+            within "table" do
+              proposal = Decidim::Proposals::Proposal.last
+
+              expect(page).to have_content("Make decidim great again")
+              expect(proposal.body).to eq("Decidim is great but it can be better")
+              expect(proposal.category).to eq(category)
+              expect(proposal.scope).to eq(scope)
+            end
+          end
         end
 
-        context "when scoped_proposals setting is not enabled" do
+        context "when process is related to a scope" do
           before do
-            current_feature.update_attributes(settings: { scoped_proposals_enabled: false } )
+            participatory_process.update_attributes(scope: scope)
           end
 
-          it "cannot be filtered by scope" do
+          it "cannot be related to a scope" do
             find(".actions .new").click
 
             within "form" do
               expect(page).not_to have_content(/Scope/i)
             end
           end
-        end
 
-        it "creates a new proposal" do
-          find(".actions .new").click
+          it "creates a new proposal related to the process scope" do
+            find(".actions .new").click
 
-          within ".new_proposal" do
-            fill_in :proposal_title, with: "Make decidim great again"
-            fill_in :proposal_body, with: "Decidim is great but it can be better"
-            select category.name["en"], from: :proposal_category_id
-            select scope.name, from: :proposal_scope_id
+            within ".new_proposal" do
+              fill_in :proposal_title, with: "Make decidim great again"
+              fill_in :proposal_body, with: "Decidim is great but it can be better"
+              select category.name["en"], from: :proposal_category_id
+              find("*[type=submit]").click
+            end
 
-            find("*[type=submit]").click
-          end
+            within ".flash" do
+              expect(page).to have_content("successfully")
+            end
+
+            within "table" do
+              proposal = Decidim::Proposals::Proposal.last
 
-          within ".flash" do
-            expect(page).to have_content("successfully")
+              expect(page).to have_content("Make decidim great again")
+              expect(proposal.body).to eq("Decidim is great but it can be better")
+              expect(proposal.category).to eq(category)
+              expect(proposal.scope).to eq(scope)
+            end
           end
 
-          within "table" do
-            proposal = Decidim::Proposals::Proposal.last
+          context "when geocoding is enabled" do
+            let!(:current_feature) do
+              create(:proposal_feature,
+                    :with_geocoding_enabled,
+                    manifest: manifest,
+                    participatory_process: participatory_process)
+            end
 
-            expect(page).to have_content("Make decidim great again")
-            expect(proposal.body).to eq("Decidim is great but it can be better")
-            expect(proposal.category).to eq(category)
-            expect(proposal.scope).to eq(scope)
+            it "creates a new proposal related to the process scope" do
+              find(".actions .new").click
+
+              within ".new_proposal" do
+                fill_in :proposal_title, with: "Make decidim great again"
+                fill_in :proposal_body, with: "Decidim is great but it can be better"
+                fill_in :proposal_address, with: address
+                select category.name["en"], from: :proposal_category_id
+                find("*[type=submit]").click
+              end
+
+              within ".flash" do
+                expect(page).to have_content("successfully")
+              end
+
+              within "table" do
+                proposal = Decidim::Proposals::Proposal.last
+
+                expect(page).to have_content("Make decidim great again")
+                expect(proposal.body).to eq("Decidim is great but it can be better")
+                expect(proposal.category).to eq(category)
+                expect(proposal.scope).to eq(scope)
+              end
+            end
           end
         end
       end
@@ -119,7 +188,7 @@ RSpec.shared_examples "manage proposals" do
         end
 
         within ".edit_proposal_answer" do
-          fill_in_i18n(
+          fill_in_i18n_editor(
             :proposal_answer_answer,
             "#answer-tabs",
             en: "The proposal doesn't make any sense",

data/decidim-proposals/spec/shared/proposal_form_examples.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
 RSpec.shared_examples "a proposal form" do
-  let(:feature) { create(:feature)}
+  let(:feature) { create(:proposal_feature) }
   let(:title) { "Oriol for president!" }
   let(:body) { "Everything would be better" }
   let(:author) { create(:user, organization: feature.organization) }
@@ -9,6 +9,9 @@ RSpec.shared_examples "a proposal form" do
   let(:scope) { create(:scope, organization: feature.organization) }
   let(:category_id) { category.try(:id)}
   let(:scope_id) { scope.try(:id)}
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
+  let(:address) { nil }
   let(:params) do
     {
       title: title,
@@ -16,6 +19,7 @@ RSpec.shared_examples "a proposal form" do
       author: author,
       category_id: category_id,
       scope_id: scope_id,
+      address: address
     }
   end
 
@@ -62,6 +66,30 @@ RSpec.shared_examples "a proposal form" do
     it { is_expected.to be_invalid}
   end
 
+  context "when geocoding is enabled" do
+    let(:feature) { create(:proposal_feature, :with_geocoding_enabled) }
+
+    context "when the address is not present" do
+      it { is_expected.to be_invalid}
+    end
+
+    context "when the address is present" do
+      let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+
+      before do
+        Geocoder::Lookup::Test.add_stub(address, [
+          { 'latitude' => latitude, 'longitude' => longitude }
+        ])
+      end
+
+      it "validates the address and store its coordinates" do
+        expect(subject).to be_valid
+        expect(subject.latitude).to eq(latitude)
+        expect(subject.longitude).to eq(longitude)
+      end
+    end
+  end
+
   describe "category" do
     subject { form.category }
 

data/decidim-results/app/forms/decidim/results/admin/result_form.rb

@@ -27,8 +27,16 @@ module Decidim
           @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, context.current_feature)&.order(title: :asc)&.pluck(:title, :id)
         end
 
+        def organization_scopes
+          current_organization.scopes
+        end
+
+        def process_scope
+          current_feature.participatory_process.scope
+        end
+
         def scope
-          @scope ||= context.current_feature.scopes.where(id: decidim_scope_id).first
+          @scope ||= process_scope || organization_scopes.where(id: decidim_scope_id).first
         end
 
         def category

data/decidim-results/app/models/decidim/results/result.rb

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::HasFeature
       include Decidim::HasScope
       include Decidim::HasCategory
+      include Decidim::HasReference
       include Decidim::Comments::Commentable
 
       feature_manifest_name "results"
@@ -19,7 +20,7 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-         commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.active_step_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.

data/decidim-results/app/services/decidim/results/result_search.rb

@@ -20,11 +20,6 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       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

data/decidim-results/app/views/decidim/results/admin/results/_form.html.erb

@@ -6,9 +6,11 @@
   <%= form.translated :editor, :description %>
 </div>
 
-<div class="field" >
-  <%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
-</div>
+<% if !@form.process_scope %>
+  <div class="field" >
+    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+  </div>
+<% end %>
 
 <div class="field" >
   <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>

data/decidim-results/app/views/decidim/results/results/_filters.html.erb

@@ -12,8 +12,8 @@
     </div>
   </div>
 
-  <% 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') %>
+  <% if current_organization.scopes.any? && !current_participatory_process.scope %>
+    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/decidim-results/app/views/decidim/results/results/_filters_small_view.html.erb

@@ -0,0 +1,18 @@
+<div class="filters-controls hide-for-mediumlarge">
+  <button data-open="filter-box" class="filters-controls__trigger">
+    <%= t ".filter" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
+  </button>
+</div>
+
+<div class="reveal" id="filter-box" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="filters">
+    <%= render partial: "filters" %>
+  </div>
+</div>

data/decidim-results/app/views/decidim/results/results/_tags.html.erb

@@ -3,7 +3,7 @@
     <% if result.category.present? %>
       <li><%= link_to translated_attribute(result.category.name), decidim_results.results_path(filter: { category_id: result.category.id }) %></li>
     <% end %>
-    <% if result.scope.present? %>
+    <% if !current_participatory_process.scope && result.scope.present? %>
       <li><%= link_to result.scope.name, decidim_results.results_path(filter: { scope_id: [result.scope.id] }) %></li>
     <% end %>
   </ul>

data/decidim-results/app/views/decidim/results/results/index.html.erb

@@ -8,6 +8,7 @@
 
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
+    <%= render partial: "filters_small_view"%>
     <div class="card card--secondary show-for-mediumlarge" >
       <%= render partial: "filters" %>
     </div>

data/decidim-results/app/views/decidim/results/results/show.html.erb

@@ -38,6 +38,7 @@
         </div>
       </div>
     </div>
+    <%= feature_reference(result) %>
     <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">

data/decidim-results/config/i18n-tasks.yml

@@ -4,3 +4,5 @@ ignore_unused:
 - "decidim.features.results.name"
 - "decidim.features.results.settings.*"
 - "decidim.resource_links.*"
+- activerecord.attributes.*
+- activemodel.attributes.*

data/decidim-results/config/locales/ca.yml

@@ -1,4 +1,12 @@
 ca:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Categoria
+        decidim_scope_id: Àmbit
+        description: Descripció
+        proposal_ids: Propostes incloses
+        title: Títol
   decidim:
     features:
       results:
@@ -10,9 +18,9 @@ ca:
             comments_blocked: Comentaris bloquejats
     resource_links:
       included_proposals:
-        proposals: Propostes incloses en aquest resultat
+        result_proposals: Propostes incloses en aquest resultat
       meetings_through_proposals:
-        meetings: Trobades relacionades
+        result_meetings: Trobades relacionades
     results:
       actions:
         confirm_destroy: Esteu segur que voleu suprimir aquest resultat?
@@ -54,6 +62,11 @@ ca:
           category: Categoria
           scopes: Àmbits
           search: Cerca
+        filters_small_view:
+          close_modal: Tancar finestra
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Desplega
         show:
           stats:
             attendees: Assistents