decidim-results 0.0.8.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4356f2a615206f1b6dd421749991b3ee2246a0
-  data.tar.gz: 4bca5a90b0eefb2187b6a83094481ea1e33c5dd1
+  metadata.gz: 3505cf64efa10eb56f890d11451823b59f53a2fd
+  data.tar.gz: '09d5d692d1ed94467470f738a590a016a65ce371'
 SHA512:
-  metadata.gz: f1c71e1c04236bc51ef4aa65e9e79349e49414f3a0a738e391f81669c8ef734ffabddb8d5a4b0284ae251889ce877f97215775ec17ef7b98e61529210b8f4499
-  data.tar.gz: 1bbf496bdee38cdfde0d41bc81c3bea55a19fae25416256feedffd602c1a93c080e170bc87d853948f0195062fa900d73cd924c563e431c8693a6b9890311d58
+  metadata.gz: d17f29bb0e37ddc1da9288f1c8998d8ee34696dbe6fa93a17e3e1d454b04a2a65159c4779e3eefb587c02f5a78241e3097b618f10dba3e98d0aa73e114a27eb8
+  data.tar.gz: 8a08b6a197ca024e37454b8168327d296b81d3912e444b1bbc05a0f0157db2c9356ab4c7f36f2133ebca3db48f46d7158d04d610b0e1ba96d8f47a98749d5a69

data/app/controllers/decidim/results/result_widgets_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Decidim
   module Results
     class ResultWidgetsController < Decidim::WidgetsController

data/app/controllers/decidim/results/results_controller.rb

@@ -12,7 +12,7 @@ module Decidim
       private
 
       def results
-        @results ||= search.results.page(params[:page]).per(12)
+        @results ||= search.results.order("title -> '#{I18n.locale}' ASC").page(params[:page]).per(12)
       end
 
       def result

data/app/queries/decidim/results/filtered_results.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Decidim
+  module Results
+    # A class used to find results filtered by features and a date range
+    class FilteredResults < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def self.for(features, start_at = nil, end_at = nil)
+        new(features, start_at, end_at).query
+      end
+
+      # Initializes the class.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def initialize(features, start_at = nil, end_at = nil)
+        @features = features
+        @start_at = start_at
+        @end_at = end_at
+      end
+
+      # Finds the Results scoped to an array of features and filtered
+      # by a range of dates.
+      def query
+        results = Decidim::Results::Result.where(feature: @features)
+        results = results.where("created_at >= ?", @start_at) if @start_at.present?
+        results = results.where("created_at <= ?", @end_at) if @end_at.present?
+        results
+      end
+    end
+  end
+end

data/app/services/decidim/results/result_stats_calculator.rb

@@ -20,7 +20,7 @@ module Decidim
       end
 
       def comments_count
-        Decidim::Comments::Comment.where(commentable: proposals).count
+        Decidim::Comments::Comment.where(root_commentable: proposals).count
       end
 
       def attendees_count

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

@@ -1,10 +1,2 @@
-<div class="column">
-  <article class="card card--result">
-    <div class="card__content">
-      <%= link_to model, class: "card__link" do %>
-        <h5 class="card__title"><%= translated_attribute model.title %></h5>
-      <% end %>
-      <%== translated_attribute model.description %>
-    </div>
-  </article>
-</div>
+<% content_for(:title, translated_attribute(model.title)) %>
+<%== translated_attribute model.description %>

data/config/locales/fr.yml

@@ -2,4 +2,78 @@ fr:
   activemodel:
     attributes:
       result:
-        decidim_category_id: Catégorie
+        decidim_category_id: Catégorie
+        decidim_scope_id: Domaine d'application
+        description: Description
+        proposal_ids: Propositions incluses
+        title: Titre
+  decidim:
+    features:
+      results:
+        name: Résultats
+        settings:
+          global:
+            comments_enabled: Commentaires activés
+          step:
+            comments_blocked: Commentaires bloqués
+    resource_links:
+      included_proposals:
+        result_proposals: Propositions incluses dans ce résultat
+      meetings_through_proposals:
+        result_meetings: Rencontres connexes
+    results:
+      actions:
+        confirm_destroy: Êtes-vous sûr de vouloir supprimer ce résultat?
+        destroy: Supprimer
+        edit: Modifier
+        new: Nouveau
+        preview: Aperçu
+        title: Actions
+      admin:
+        models:
+          result:
+            name: Résultat
+        results:
+          create:
+            invalid: Il y a eu un problème pour créer ce résultat
+            success: Résultat créé avec succès
+          destroy:
+            success: Résultat supprimé avec succès
+          edit:
+            title: Modifier le résultat
+            update: Mettre à jour
+          index:
+            title: Résultats
+          new:
+            create: Créer
+            title: Nouveau résultat
+          update:
+            invalid: Il y a eu un problème pour mettre à jour ce résultat
+            success: Résultat mis à jour avec succès
+      models:
+        result:
+          fields:
+            title: Titre
+      results:
+        count:
+          results_count:
+            one: 1 résultat
+            other: "%{count} résultats"
+        filters:
+          category: Catégorie
+          category_prompt: Sélectionner une catégorie
+          scopes: Domaines d'application
+          search: Rechercher
+        filters_small_view:
+          close_modal: Fermer la fenêtre de dialogue
+          filter: Filtrer
+          filter_by: Filtrer par
+          unfold: Déplier
+        show:
+          stats:
+            attendees: Participants
+            comments: Commentaires
+            contributions: Contributions
+            meetings: Rencontre
+            proposals: Propositions
+            votes: Soutiens

data/lib/decidim/results/feature.rb

@@ -16,6 +16,15 @@ Decidim.register_feature(:results) do |feature|
     resource.template = "decidim/results/results/linked_results"
   end
 
+  feature.register_stat :results_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
+    Decidim::Results::FilteredResults.for(features, start_at, end_at).count
+  end
+
+  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+    results = Decidim::Results::FilteredResults.for(features, start_at, end_at)
+    Decidim::Comments::Comment.where(root_commentable: results).count
+  end
+
   feature.settings(:global) do |settings|
     settings.attribute :comments_enabled, type: :boolean, default: true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-results
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -74,70 +74,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.1
+        version: 0.1.0
 description: ''
 email:
 - josepjaume@gmail.com
@@ -161,6 +161,7 @@ files:
 - app/helpers/decidim/results/application_helper.rb
 - app/models/decidim/results/application_record.rb
 - app/models/decidim/results/result.rb
+- app/queries/decidim/results/filtered_results.rb
 - app/services/decidim/results/result_search.rb
 - app/services/decidim/results/result_stats_calculator.rb
 - app/views/decidim/results/admin/results/_form.html.erb