decidim-results 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 261211327c81628f79052e961210bac9bea4bcf6
-  data.tar.gz: eac6d159d8e9fc48bd38a17f5ca64c8363f756f1
+  metadata.gz: c066d1ecdece68bae8448750981b11706737c8c4
+  data.tar.gz: e89b37fd8c66171a1389f78cfd5e47e8aa711682
 SHA512:
-  metadata.gz: 9286d8c4a2ecc6fed04858739afd96158f7fff82c57b956d5520d794c0a267313c18c5150f05fd67acc035bf068dc7bd58d675e9dbb310b34a2e3aaf196df5a0
-  data.tar.gz: 1a98a65bd335620cb04a26203d427fd820894e89f4544cdfdb28aa17bbacbf0eb5c5e124aa2a1dab47604318e9611ec27ebb8f8a77c8e9bbb8be83d33c1612dd
+  metadata.gz: 5d1d9ba2bb0e7fe263f15face6169526a8f73d45682102faf72222d316a107429d9207469892dca98c34f2b79f58c043655de036bd0b7c4e1d80b604e1bb4a68
+  data.tar.gz: fa9ed6e4f5e366609e30e93ff97227cf4d2cb888300a2786b23d65ec8ff15f2fafbdcf8d5a6904e61f7aa6ba419e13e4309da288d8d2df6f9778d6ac3b9ac5fc

data/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/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/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/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/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/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/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/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/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/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/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

data/config/locales/en.yml

@@ -1,5 +1,13 @@
 ---
 en:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Category
+        decidim_scope_id: Scope
+        description: Description
+        proposal_ids: Included proposals
+        title: Title
   decidim:
     features:
       results:
@@ -11,9 +19,9 @@ en:
             comments_blocked: Comments blocked
     resource_links:
       included_proposals:
-        proposals: Proposals included in this result
+        result_proposals: Proposals included in this result
       meetings_through_proposals:
-        meetings: Related meetings
+        result_meetings: Related meetings
     results:
       actions:
         confirm_destroy: Are you sure you want to delete this result?
@@ -55,6 +63,11 @@ en:
           category: Category
           scopes: Scopes
           search: Search
+        filters_small_view:
+          close_modal: Close modal
+          filter: Filter
+          filter_by: Filter by
+          unfold: Unfold
         show:
           stats:
             attendees: Attendees

data/config/locales/es.yml

@@ -1,4 +1,12 @@
 es:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Categoría
+        decidim_scope_id: Ámbito
+        description: Descripción
+        proposal_ids: Propuestas incluidas
+        title: Título
   decidim:
     features:
       results:
@@ -10,9 +18,9 @@ es:
             comments_blocked: Comentarios bloqueados
     resource_links:
       included_proposals:
-        proposals: Propuestas incluidas en este resultado
+        result_proposals: Propuestas incluidas en este resultado
       meetings_through_proposals:
-        meetings: Encuentros relacionados
+        result_meetings: Encuentros relacionados
     results:
       actions:
         confirm_destroy: '¿Está seguro de que quiere eliminar este resultado?'
@@ -54,6 +62,11 @@ es:
           category: Categoría
           scopes: Ámbitos
           search: Buscar
+        filters_small_view:
+          close_modal: Cerrar ventana
+          filter: Filtrar
+          filter_by: Filtrar por
+          unfold: Desplegar
         show:
           stats:
             attendees: Asistentes

data/config/locales/eu.yml

@@ -2,4 +2,60 @@ eu:
   decidim:
     features:
       results:
-        name: Emaitzak
+        name: Emaitzak
+    resource_links:
+      included_proposals:
+        result_proposals: Emaitza honetan jasotako proposamenak
+      meetings_through_proposals:
+        result_meetings: Honekin lotutako topaketak
+    results:
+      actions:
+        confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
+        destroy: Garbitu
+        edit: Editatu
+        new: '%{name} berria'
+        title: Ekintzak
+      admin:
+        models:
+          result:
+            name: Emaitza
+        results:
+          create:
+            invalid: Arazo bat izan da emaitza hau sortzean.
+            success: Emaitza zuzen sortu da
+          destroy:
+            success: Emaitza zuzen ezabatu da.
+          edit:
+            title: Editatu emaitza
+            update: Eguneratu emaitza
+          index:
+            title: Emaitzak
+          new:
+            create: Sortu emaitza
+            title: Emaitza berria
+          update:
+            invalid: Arazo bat izan da emaitza hau eguneratzean.
+            success: Emaitza zuzen eguneratu da.
+      models:
+        result:
+          fields:
+            title: Izenburua
+      results:
+        count:
+          results_count:
+            one: Emaitza bat
+            other: "%{count} emaitza"
+        filters:
+          category: Kategoria
+          scopes: Esparruak
+          search: Bilatu
+        filters_small_view:
+          filter_by: 'Iragazi honen arabera:'
+        show:
+          stats:
+            attendees: Bertaratuak
+            comments: Iruzkinak
+            contributions: Ekarpenak
+            meetings: Topaketa-zerrenda
+            proposals: Proposamenak
+            votes: Euskarria

data/config/locales/fi.yml

@@ -0,0 +1,77 @@
+fi:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Kategoria
+        decidim_scope_id: Konteksti
+        description: Kuvaus
+        proposal_ids: Sisällytetyt ehdotukset
+        title: Otsikko
+  decidim:
+    features:
+      results:
+        name: Tulokset
+        settings:
+          global:
+            comments_enabled: Kommentointi sallittu
+          step:
+            comments_blocked: Kommentointi estetty
+    resource_links:
+      included_proposals:
+        result_proposals: Projektit, jotka sisältyvät tähän tulokseen
+      meetings_through_proposals:
+        result_meetings: Liittyvät tapaamiset
+    results:
+      actions:
+        confirm_destroy: Oletko varma, että haluat poistaa tämän tuloksen?
+        destroy: Poista
+        edit: Muokkaa
+        new: Uusi %{name}
+        title: Toiminnot
+      admin:
+        models:
+          result:
+            name: Tulos
+        results:
+          create:
+            invalid: Tuloksen luonnissa tapahtui virhe
+            success: Tulos luotu onnistuneesti
+          destroy:
+            success: Tulos poistettu onnistuneesti
+          edit:
+            title: Muokkaa tulosta
+            update: Päivitä tulos
+          index:
+            title: Tulokset
+          new:
+            create: Luo tulos
+            title: Uusi tulos
+          update:
+            invalid: Tuloksen päivityksessä tapahtui virhe
+            success: Tulos päivitetty onnistuneesti
+      models:
+        result:
+          fields:
+            title: Otsikko
+      results:
+        count:
+          results_count:
+            one: 1 tulos
+            other: "%{count} tulosta"
+        filters:
+          category: Kategoria
+          scopes: Konteksti
+          search: Haku
+        filters_small_view:
+          close_modal: Sulje ikkuna
+          filter: Suodata
+          filter_by: Suodata
+          unfold: Avaa
+        show:
+          stats:
+            attendees: Osallistujat
+            comments: Kommentit
+            contributions: Kontribuutiot
+            meetings: Tapaamiset
+            proposals: Ehdotukset
+            votes: Kannatukset

data/db/migrate/20170215132624_add_reference_to_results.rb

@@ -0,0 +1,7 @@
+class AddReferenceToResults < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_results_results, :reference, :string
+    Decidim::Results::Result.find_each(&:save)
+    change_column_null :decidim_results_results, :reference, false
+  end
+end

data/lib/decidim/results/test/factories.rb

@@ -3,6 +3,12 @@ require "decidim/faker/localized"
 require "decidim/dev"
 
 FactoryGirl.define do
+  factory :result_feature, parent: :feature do
+    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :results).i18n_name }
+    manifest_name :results
+    participatory_process { create(:participatory_process, :with_steps) }
+  end
+
   factory :result, class: Decidim::Results::Result do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-results
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 description: ''
 email:
 - josepjaume@gmail.com
@@ -168,6 +168,7 @@ files:
 - app/views/decidim/results/admin/results/new.html.erb
 - app/views/decidim/results/results/_count.html.erb
 - app/views/decidim/results/results/_filters.html.erb
+- app/views/decidim/results/results/_filters_small_view.html.erb
 - app/views/decidim/results/results/_linked_results.html.erb
 - app/views/decidim/results/results/_results.html.erb
 - app/views/decidim/results/results/_tags.html.erb
@@ -179,8 +180,10 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/eu.yml
+- config/locales/fi.yml
 - db/migrate/20170116104125_create_results.rb
 - db/migrate/20170129164553_remove_short_description_from_results.rb
+- db/migrate/20170215132624_add_reference_to_results.rb
 - lib/decidim/results.rb
 - lib/decidim/results/admin.rb
 - lib/decidim/results/admin_engine.rb