decidim-budgets 0.0.8.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba9c814f7efc8a92f1c2fb64ba5c393390f0b777
-  data.tar.gz: ded2fb3280e5343134a844e6a8c341932e6c5828
+  metadata.gz: d0f033511d1ba6f2eb85e4b074b5af9ee81bcd74
+  data.tar.gz: 84ed6e3719e5ff1364499207cbb2c28d56b98dc5
 SHA512:
-  metadata.gz: af258106d5f711d229d17117b9055b88861b02c2c78006db129cb11460bcfcb7c72481cd080cd3df7eb711c3af20b3137abd59c779a711f56e646f99a8b11bc6
-  data.tar.gz: 5c0b8976274c33c898de334f1ef001395499f1a2b6b3e7731617db932b5665b8cff70fbe2d158c0c6bfe63610a50b2e7469a3612694fd316400a6bedc6df2896
+  metadata.gz: 898d3323eb23ce2430028cb625fd2614fcb71108781eed2be8aa3fd6a1ac8c55cb21a8669531cf404f61b31dc0887e0bf20c3ed4b983f4a4e8069f65dbe4966d
+  data.tar.gz: 447f8697dbc481639f222a25648a7c66737dde8ca55ca8902c6aa23f93888cb0d03a9ad7d1b21dbdd049efb78c8da15e0b8ab6f3a567605b070ea010ba0c07f3

data/app/queries/decidim/budgets/filtered_projects.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Decidim
+  module Budgets
+    # A class used to find projects filtered by features and a date range
+    class FilteredProjects < 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 Projects scoped to an array of features and filtered
+      # by a range of dates.
+      def query
+        projects = Decidim::Budgets::Project.where(feature: @features)
+        projects = projects.where("created_at >= ?", @start_at) if @start_at.present?
+        projects = projects.where("created_at <= ?", @end_at) if @end_at.present?
+        projects
+      end
+    end
+  end
+end

data/config/locales/ca.yml

@@ -112,6 +112,7 @@ ca:
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
           step:
             comments_blocked: Comentaris bloquejats
+            show_votes: Mostra vots
             votes_enabled: Suports habilitats
     orders:
       checkout:

data/config/locales/en.yml

@@ -119,6 +119,7 @@ en:
             vote_threshold_percent: Vote threshold percent
           step:
             comments_blocked: Comments blocked
+            show_votes: Show votes
             votes_enabled: Votes enabled
     orders:
       checkout:

data/config/locales/es.yml

@@ -112,6 +112,7 @@ es:
             vote_threshold_percent: Porcentaje mínimo del presupuesto
           step:
             comments_blocked: Comentarios bloqueados
+            show_votes: Mostrar votos
             votes_enabled: Votos habilitados
     orders:
       checkout:

data/config/locales/fr.yml

@@ -4,7 +4,7 @@ fr:
       project:
         budget: Budget
         decidim_category_id: Catégorie
-        decidim_scope_id: Champ d'application
+        decidim_scope_id: Domaine d'application
         description: Description
         proposal_ids: Propositions liées
         title: Titre
@@ -15,6 +15,7 @@ fr:
         confirm_destroy: Êtes-vous certain de vouloir supprimer ce projet?
         destroy: Supprimer
         edit: Modifier
+        new: Nouveau
         preview: Aperçu
         title: Actions
       admin:
@@ -29,11 +30,13 @@ fr:
             success: Projet supprimé avec succès
           edit:
             title: Éditer un projet
+            update: Mettre à jour
           index:
             finished_orders: Commandes terminées
             pending_orders: Commandes en attente
             title: Projets
           new:
+            create: Créer
             title: Nouveau résultat
           update:
             invalid: Il y a eu un problème de mise à jour de ce projet
@@ -70,7 +73,7 @@ fr:
         filters:
           category: Catégorie
           category_prompt: Sélectionner une catégorie
-          scopes: Étendues
+          scopes: Domaines d'application
           search: Rechercher
         filters_small_view:
           close_modal: Fermer la vue
@@ -90,8 +93,37 @@ fr:
           count:
             one: 1 soutien
             other: "%{count} soutiens"
+          remove: Supprimer
+        project_budget_button:
+          add: Ajouter
+          added: Ajouté
+        show:
+          budget: Budget
+          view_all_projects: Voir tous les projets
     features:
       budgets:
+        actions:
+          vote: Voter
+        name: Budgets
         settings:
           global:
-            vote_threshold_percent: Pourcentage de seuil de vote
+            comments_enabled: Commentaires activés
+            total_budget: Budget total
+            vote_threshold_percent: Pourcentage de seuil de vote
+          step:
+            comments_blocked: Commentaires bloqués
+            show_votes: Afficher les votes
+            votes_enabled: Votes activés
+    orders:
+      checkout:
+        error: Une erreur s'est produite lors du traitement de votre vote
+        success: Votre vote a été enregistré avec succès
+      destroy:
+        error: Une erreur s'est produite lors de l'annulation de votre vote
+        success: Votre vote a été annulé avec succès
+    resource_links:
+      included_proposals:
+        project_proposals: 'Propositions incluses dans ce projet:'
+  index:
+    confirmed_orders_count: Nombre de votes comptés
+  total_budget: Budget total

data/lib/decidim/budgets/feature.rb

@@ -19,6 +19,15 @@ Decidim.register_feature(:budgets) do |feature|
     resource.template = "decidim/budgets/projects/linked_projects"
   end
 
+  feature.register_stat :projects_count, primary: true do |features, start_at, end_at|
+    Decidim::Budgets::FilteredProjects.for(features, start_at, end_at).count
+  end
+
+  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+    projects = Decidim::Budgets::FilteredProjects.for(features, start_at, end_at)
+    Decidim::Comments::Comment.where(root_commentable: projects).count
+  end
+
   feature.settings(:global) do |settings|
     settings.attribute :total_budget, type: :integer, default: 100_000_000
     settings.attribute :vote_threshold_percent, type: :integer, default: 70

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 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,56 +74,56 @@ 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-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
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   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
@@ -164,6 +164,7 @@ files:
 - app/models/decidim/budgets/line_item.rb
 - app/models/decidim/budgets/order.rb
 - app/models/decidim/budgets/project.rb
+- app/queries/decidim/budgets/filtered_projects.rb
 - app/services/decidim/budgets/project_search.rb
 - app/views/decidim/budgets/admin/projects/_form.html.erb
 - app/views/decidim/budgets/admin/projects/edit.html.erb