decidim-budgets 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9ce6f985c07de9ead8fe7abd959d3942245bdacf65a7fdd657c209be76c1c1
-  data.tar.gz: 9cdbba896b3130d27226c34a7939bea4b4ee6edb4576623b28e44e609b35cede
+  metadata.gz: 74e9586e7151e64001736d0bff69a2faf0a9c323defe134d4088c66800c41702
+  data.tar.gz: fe6dec03b3312ee9ab2052f115a7c39bbd0ad9a1552756b7fccf2b0469c844da
 SHA512:
-  metadata.gz: dd11bcea8e6b62bbf93e632b573bfb4de4225fc6e0395b101d8794af6bdd0284e58e1a539b74bd1c61b3fba11e0f4dc120f0571185f5c1f7ced50507d949b229
-  data.tar.gz: 96af9c618b53fd5d58110dd5af0a0738cb43d382fb51eaef54d961f7c9b8da5bdf3ab62b1c9ba1463211d9813af01a9a45f8b3e02b853e0a72c152059cb446e6
+  metadata.gz: 4e2cab9e2fb0ee2494ecce9488257ef242846886d86809b220e3ed6bf3c2858ad30b9db06e60371b8cf38cb1a51ca79d81132b91d8c2b0d89f551ef132c5f06c
+  data.tar.gz: b47182fb5d57b24c193fe9b70a83d5fdb57232cf10ef38ed78195499255a8a70d9bb7ed05be7a6f3c6275a057b6e2e922d03c7d68c29630672c120d1aee5e387

data/app/controllers/decidim/budgets/projects_controller.rb

@@ -27,11 +27,27 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          scope_id: "",
-          category_id: ""
+          scope_id: default_filter_scope_params,
+          category_id: default_filter_category_params
         }
       end
 
+      def default_filter_category_params
+        return "all" unless current_component.participatory_space.categories.any?
+
+        ["all"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
+      end
+
+      def default_filter_scope_params
+        return "all" unless current_component.participatory_space.scopes.any?
+
+        if current_component.participatory_space.scope
+          ["all", current_component.participatory_space.scope.id] + current_component.participatory_space.scope.children.map { |scope| scope.id.to_s }
+        else
+          %w(all global) + current_component.participatory_space.scopes.map { |scope| scope.id.to_s }
+        end
+      end
+
       def context_params
         { component: current_component, organization: current_organization }
       end

data/app/helpers/decidim/budgets/application_helper.rb

@@ -8,6 +8,7 @@ module Decidim
       include PaginateHelper
       include Decidim::Comments::CommentsHelper
       include ProjectsHelper
+      include Decidim::CheckBoxesTreeHelper
     end
   end
 end

data/app/services/decidim/budgets/project_search.rb

@@ -19,6 +19,14 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       end
 
+      def search_category_id
+        super
+      end
+
+      def search_scope_id
+        super
+      end
+
       # Returns the random projects for the current page.
       def results
         Project.where(id: super.pluck(:id))

data/app/types/decidim/budgets/budgets_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    BudgetsType = GraphQL::ObjectType.define do
+      interfaces [-> { Decidim::Core::ComponentInterface }]
+
+      name "Budgets"
+      description "A budget component of a participatory space."
+
+      connection :projects, ProjectType.connection_type do
+        resolve ->(component, _args, _ctx) {
+                  ProjectTypeHelper.base_scope(component).includes(:component)
+                }
+      end
+
+      field(:project, ProjectType) do
+        argument :id, !types.ID
+
+        resolve ->(component, args, _ctx) {
+          ProjectTypeHelper.base_scope(component).find_by(id: args[:id])
+        }
+      end
+    end
+
+    module ProjectTypeHelper
+      def self.base_scope(component)
+        Project.where(component: component)
+      end
+    end
+  end
+end

data/app/types/decidim/budgets/project_type.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    ProjectType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Comments::CommentableInterface },
+        -> { Decidim::Core::CategorizableInterface }
+      ]
+
+      name "Project"
+      description "A project"
+
+      field :id, !types.ID, "The internal ID for this project"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this project"
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this project"
+      field :budget, types.Int, "The budget for this project"
+      field :createdAt, Decidim::Core::DateTimeType, "When this project was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "When this project was updated", property: :updated_at
+      field :reference, types.String, "The reference for this project"
+    end
+  end
+end

data/app/views/decidim/budgets/projects/_filters.html.erb

@@ -13,10 +13,10 @@
   </div>
 
   <% if current_participatory_space.has_subscopes? %>
-    <%= scopes_picker_filter form, :scope_id %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category") %>
   <% end %>
 <% end %>

data/config/locales/ar.yml

@@ -100,7 +100,7 @@ ar:
             other: "%{count} مشاريع"
         filters:
           category: الفئة
-          category_prompt: اختر تصنيف
+          scope: نطاق
           search: بحث
         filters_small_view:
           close_modal: إغلاق مشروط

data/config/locales/ca.yml

@@ -92,7 +92,7 @@ ca:
             other: "%{count} projectes"
         filters:
           category: Categoria
-          category_prompt: Selecciona una categoria
+          scope: Àmbit
           search: Cerca
         filters_small_view:
           close_modal: Tancar finestra

data/config/locales/cs.yml

@@ -96,7 +96,7 @@ cs:
             other: "%{count} projektů"
         filters:
           category: Kategorie
-          category_prompt: Vyberte kategorii
+          scope: Rozsah
           search: Vyhledávání
         filters_small_view:
           close_modal: Zavřít modální

data/config/locales/de.yml

@@ -92,7 +92,7 @@ de:
             other: "%{count} Projekte"
         filters:
           category: Kategorie
-          category_prompt: Wählen Sie eine Kategorie
+          scope: Umfang
           search: Suche
         filters_small_view:
           close_modal: Modal schließen

data/config/locales/el.yml

@@ -0,0 +1 @@
+el:

data/config/locales/en.yml

@@ -93,7 +93,7 @@ en:
             other: "%{count} projects"
         filters:
           category: Category
-          category_prompt: Select a category
+          scope: Scope
           search: Search
         filters_small_view:
           close_modal: Close modal

data/config/locales/es-MX.yml

@@ -92,7 +92,7 @@ es-MX:
             other: "%{count} proyectos"
         filters:
           category: Categoría
-          category_prompt: Selecciona una categoría
+          scope: Ámbito
           search: Buscar
         filters_small_view:
           close_modal: Cerrar ventana

data/config/locales/es-PY.yml

@@ -92,7 +92,7 @@ es-PY:
             other: "%{count} proyectos"
         filters:
           category: Categoría
-          category_prompt: Selecciona una categoría
+          scope: Ámbito
           search: Buscar
         filters_small_view:
           close_modal: Cerrar ventana

data/config/locales/es.yml

@@ -92,7 +92,7 @@ es:
             other: "%{count} proyectos"
         filters:
           category: Categoría
-          category_prompt: Selecciona una categoría
+          scope: Ámbito
           search: Buscar
         filters_small_view:
           close_modal: Cerrar ventana

data/config/locales/eu.yml

@@ -92,7 +92,7 @@ eu:
             other: "%{count} proiektu"
         filters:
           category: Kategoria
-          category_prompt: Aukeratu kategoria bat
+          scope: Esparrua
           search: Bilatu
         filters_small_view:
           close_modal: Itxi leihoa

data/config/locales/fi-plain.yml

@@ -92,7 +92,7 @@ fi-pl:
             other: "%{count} suunnitelmaa"
         filters:
           category: Aihepiiri
-          category_prompt: Valitse aihepiiri
+          scope: Teema
           search: Haku
         filters_small_view:
           close_modal: Sulje ikkuna

data/config/locales/fi.yml

@@ -92,7 +92,7 @@ fi:
             other: "%{count} suunnitelmaa"
         filters:
           category: Aihepiiri
-          category_prompt: Valitse aihepiiri
+          scope: Teema
           search: Haku
         filters_small_view:
           close_modal: Sulje ikkuna

data/config/locales/fr.yml

@@ -92,7 +92,7 @@ fr:
             other: "%{count} projets"
         filters:
           category: Catégorie
-          category_prompt: Sélectionner une catégorie
+          scope: Périmètre d'application
           search: Rechercher
         filters_small_view:
           close_modal: Fermez la fenêtre

data/config/locales/gl.yml

@@ -92,7 +92,7 @@ gl:
             other: "%{count} proxectos"
         filters:
           category: Categoría
-          category_prompt: Selecciona unha categoría
+          scope: Alcance
           search: Busca
         filters_small_view:
           close_modal: Pechar modal

data/config/locales/hu.yml

@@ -92,7 +92,7 @@ hu:
             other: "%{count} projektek"
         filters:
           category: Kategória
-          category_prompt: Válassz kategóriát
+          scope: Hatáskör
           search: Keresés
         filters_small_view:
           close_modal: Modal bezárása

data/config/locales/id-ID.yml

@@ -90,7 +90,7 @@ id:
             other: "%{count} proyek"
         filters:
           category: Kategori
-          category_prompt: Pilih Kategori
+          scope: Cakupan
           search: Pencarian
         filters_small_view:
           close_modal: Tutup modal

data/config/locales/is-IS.yml

@@ -71,7 +71,7 @@ is-IS:
             other: "%{count} verkefni"
         filters:
           category: Flokkur
-          category_prompt: Veldu flokk
+          scope: Umfang
           search: Leita
         filters_small_view:
           close_modal: Loka mát

data/config/locales/it.yml

@@ -92,7 +92,7 @@ it:
             other: "%{count} progetti"
         filters:
           category: Categoria
-          category_prompt: Scegli una categoria
+          scope: Ambito tematico
           search: Cerca
         filters_small_view:
           close_modal: Chiudi modalità

data/config/locales/nl.yml

@@ -92,7 +92,7 @@ nl:
             other: "%{count} projecten"
         filters:
           category: Categorie
-          category_prompt: Kies een categorie
+          scope: Reikwijdte
           search: Zoeken
         filters_small_view:
           close_modal: Dialoogvenster sluiten

data/config/locales/no.yml

@@ -92,7 +92,7 @@
             other: "%{count} prosjekter"
         filters:
           category: Kategori
-          category_prompt: Velg en kategori
+          scope: Omfang
           search: Søk
         filters_small_view:
           close_modal: Lukk modal

data/config/locales/pl.yml

@@ -96,7 +96,7 @@ pl:
             other: "%{count} projektów"
         filters:
           category: Kategoria
-          category_prompt: Wybierz kategorię
+          scope: Zakres
           search: Szukanie
         filters_small_view:
           close_modal: Zamknij modal

data/config/locales/pt-BR.yml

@@ -92,7 +92,7 @@ pt-BR:
             other: "%{count} projetos"
         filters:
           category: Categoria
-          category_prompt: Selecione uma categoria
+          scope: Âmbito
           search: Pesquisa
         filters_small_view:
           close_modal: Fechar modal

data/config/locales/pt.yml

@@ -92,7 +92,7 @@ pt:
             other: "%{count} projetos"
         filters:
           category: Categoria
-          category_prompt: Selecione uma categoria
+          scope: Âmbito
           search: Pesquisa
         filters_small_view:
           close_modal: Fechar modal

data/config/locales/ru.yml

@@ -96,7 +96,7 @@ ru:
             other: "%{count} проектов"
         filters:
           category: Категория
-          category_prompt: Выберите категорию
+          scope: Охват
           search: Поиск
         filters_small_view:
           close_modal: Закрыть окошко

data/config/locales/sv.yml

@@ -92,7 +92,7 @@ sv:
             other: "%{count} projekt"
         filters:
           category: Kategori
-          category_prompt: Välj en kategori
+          scope: Omfång
           search: Sök
         filters_small_view:
           close_modal: Stäng fönstret

data/config/locales/tr-TR.yml

@@ -92,7 +92,7 @@ tr:
             other: "%{count} proje"
         filters:
           category: Kategori
-          category_prompt: bir kategori seç
+          scope: kapsam
           search: Arama
         filters_small_view:
           close_modal: Kalıcı modal

data/config/locales/uk.yml

@@ -96,7 +96,7 @@ uk:
             other: "%{count} проектів"
         filters:
           category: Категорія
-          category_prompt: Оберіть категорію
+          scope: Обсяг
           search: Шукати
         filters_small_view:
           close_modal: Закрити віконце

data/lib/decidim/budgets/component.rb

@@ -13,6 +13,8 @@ Decidim.register_component(:budgets) do |component|
 
   component.newsletter_participant_entities = ["Decidim::Budgets::Order"]
 
+  component.query_type = "Decidim::Budgets::BudgetsType"
+
   component.actions = %(vote)
 
   component.on(:before_destroy) do |instance|
@@ -43,6 +45,11 @@ Decidim.register_component(:budgets) do |component|
     Decidim::Comments::Comment.where(root_commentable: projects).count
   end
 
+  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
+    projects_ids = Decidim::Budgets::FilteredProjects.for(components, start_at, end_at).pluck(:id)
+    Decidim::Follow.where(decidim_followable_type: "Decidim::Budgets::Project", decidim_followable_id: projects_ids).count
+  end
+
   component.settings(:global) do |settings|
     settings.attribute :projects_per_page, type: :integer, default: 12
     settings.attribute :total_budget, type: :integer, default: 100_000_000

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.20.1"
+      "0.21.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -74,42 +74,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -167,6 +167,8 @@ files:
 - app/queries/decidim/budgets/metrics/budget_participants_metric_measure.rb
 - app/serializers/decidim/budgets/data_portability_budgets_order_serializer.rb
 - app/services/decidim/budgets/project_search.rb
+- app/types/decidim/budgets/budgets_type.rb
+- app/types/decidim/budgets/project_type.rb
 - app/views/decidim/budgets/admin/projects/_form.html.erb
 - app/views/decidim/budgets/admin/projects/edit.html.erb
 - app/views/decidim/budgets/admin/projects/index.html.erb
@@ -196,6 +198,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml