decidim-budgets 0.21.0 → 0.22.0

data/config/locales/sl.yml

@@ -0,0 +1,5 @@
+sl:
+  activemodel:
+    attributes:
+      project:
+        budget: Proračun

data/config/locales/sr-CS.yml

@@ -0,0 +1,29 @@
+sr:
+  decidim:
+    budgets:
+      order_summary_mailer:
+        order_summary:
+          selected_projects: 'Projekti koje ste izabrali su:'
+          subject: Glasali ste na prostoru za diskusiju %{space_name}
+          voted_on_space: Glasali ste o budžetima za prostor za diskusiju %{space_name}.
+          voted_on_space_with_scope: Glasali ste o budžetima za prostor za diskusiju %{space_name}, preciznije o %{scope_name} (%{scope_type}).
+      projects:
+        budget_summary:
+          description_minimum_projects_rule: Za koje projekte mislite da bi trebalo da odvojimo sredstva u budžetu? Odaberite bar %{minimum_number} projekata koje želite, glasajte za predloge koji vam se sviđaju i tako pomognite u definisanju budžeta.
+        orders:
+          highest_cost: Najveća cena
+          label: Poređaj projekte po
+          lowest_cost: Najniža cena
+          most_voted: Najviše glasova
+          random: Slučajan redosled
+    components:
+      budgets:
+        settings:
+          global:
+            form:
+              errors:
+                budget_voting_rule_only_one: Samo jedno pravilo glasanja mora biti omogućeno
+                budget_voting_rule_required: Jedno pravilo glasanja je obavezno
+            vote_minimum_budget_projects_number: Minimum projekata za glasanje
+            vote_rule_minimum_budget_projects_enabled: 'Omogući pravilo: Minimalni broj projekata o kojima se glasa'
+            vote_rule_threshold_percent_enabled: 'Omogući pravilo: Minimalni procenta budžeta'

data/config/locales/sv.yml

@@ -65,6 +65,12 @@ sv:
         project:
           fields:
             title: Titel
+      order_summary_mailer:
+        order_summary:
+          selected_projects: 'De projekt som du har valt är:'
+          subject: Du har röstat i deltagarutrymmet %{space_name}
+          voted_on_space: Du har röstat på budgetarna i deltagarutrymmet %{space_name}.
+          voted_on_space_with_scope: Du har röstat på budgetarna i deltagarutrymmet %{space_name} för %{scope_name} (%{scope_type}).
       projects:
         budget_confirm:
           are_you_sure: Håller du med? När du har bekräftat din röst kan du inte ändra den.
@@ -85,6 +91,7 @@ sv:
             description: Du har redan röstat för budgeten. Om du har ändrat dig kan du %{cancel_link}.
             title: Budgetomröstning slutförd
           description: Vilka projekt tycker du att vi borde avsätta budget till? Tilldela minst %{minimum_budget} till de projekt som du vill ha och definiera budgeten genom att rösta med dina val.
+          description_minimum_projects_rule: Vilka projekt tycker du att vi borde avsätta budget till? Välj minst %{minimum_number} projekt som du vill ha och definiera budgeten genom att rösta med dina val.
           title: Du bestämmer budgeten
         count:
           projects_count:
@@ -107,16 +114,24 @@ sv:
             one: valt projekt
             other: valda projekt
           view: Visa
+        orders:
+          highest_cost: Högst kostnad
+          label: Ordna projekt efter
+          lowest_cost: Lägsta kostnad
+          most_voted: Mest röster
+          random: Slumpmässig ordning
         project:
-          add: Lägg till
+          add: Lägg till projekt %{resource_name} till din röst
           count:
             one: En röst
             other: "%{count} röster"
-          remove: Ta bort
+          remove: Ta bort projekt %{resource_name} från din röst
           view: Visa
         project_budget_button:
-          add: Lägg till
-          added: Tillagd
+          add: Lägg till i din röst
+          add_descriptive: Lägg till projekt %{resource_name} till din röst
+          added: Lades till i din röst
+          added_descriptive: Projekt %{resource_name} lades till i din röst
         show:
           budget: Budget
           view_all_projects: Visa alla projekt
@@ -129,9 +144,16 @@ sv:
           global:
             announcement: Meddelande
             comments_enabled: Kommentarer aktiverade
+            form:
+              errors:
+                budget_voting_rule_only_one: Endast en röstningsregel får vara aktiverad
+                budget_voting_rule_required: En röstningsregel krävs
             projects_per_page: Projekt per sida
             resources_permissions_enabled: Åtgärdsbehörigheter kan ställas in för varje möte
             total_budget: Total budget
+            vote_minimum_budget_projects_number: Minsta antal projekt att rösta om
+            vote_rule_minimum_budget_projects_enabled: 'Aktivera regel: Minsta antal projekt att rösta om'
+            vote_rule_threshold_percent_enabled: 'Aktivera regel: Lägsta procentandel av budget'
             vote_threshold_percent: Tröskel för röster i procent
           step:
             announcement: Meddelande

data/config/locales/tr-TR.yml

@@ -108,15 +108,10 @@ tr:
             other: seçilen projeler
           view: Görünüm
         project:
-          add: Eklemek
           count:
             one: 1 destek
             other: "%{count} destek"
-          remove: Kaldır
           view: Görünüm
-        project_budget_button:
-          add: Eklemek
-          added: Katma
         show:
           budget: Bütçe
           view_all_projects: Tüm projeleri görüntüle

data/config/locales/uk.yml

@@ -114,17 +114,12 @@ uk:
             other: обраних проектів
           view: Переглянути
         project:
-          add: Додати
           count:
             one: 1 людина підтримує
             few: "%{count} людей підтримує"
             many: "%{count} людей підтримують"
             other: "%{count} людей підтримують"
-          remove: Видалити
           view: Переглянути
-        project_budget_button:
-          add: Додати
-          added: Додано
         show:
           budget: Бюджет
           view_all_projects: Переглянути всi проекти

data/lib/decidim/budgets/admin_engine.rb

@@ -13,6 +13,8 @@ module Decidim
 
       routes do
         resources :projects do
+          get :proposals_picker, on: :collection
+
           resources :attachment_collections
           resources :attachments
           collection do

data/lib/decidim/budgets/component.rb

@@ -8,6 +8,7 @@ Decidim.register_component(:budgets) do |component|
   component.icon = "decidim/budgets/icon.svg"
   component.stylesheet = "decidim/budgets/budgets"
   component.permissions_class_name = "Decidim::Budgets::Permissions"
+  component.component_form_class_name = "Decidim::Budgets::Admin::ComponentForm"
 
   component.data_portable_entities = ["Decidim::Budgets::Order"]
 
@@ -53,7 +54,10 @@ Decidim.register_component(:budgets) do |component|
   component.settings(:global) do |settings|
     settings.attribute :projects_per_page, type: :integer, default: 12
     settings.attribute :total_budget, type: :integer, default: 100_000_000
+    settings.attribute :vote_rule_threshold_percent_enabled, type: :boolean, default: true
     settings.attribute :vote_threshold_percent, type: :integer, default: 70
+    settings.attribute :vote_rule_minimum_budget_projects_enabled, type: :boolean, default: false
+    settings.attribute :vote_minimum_budget_projects_number, type: :integer, default: 1
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
     settings.attribute :announcement, type: :text, translated: true, editor: true

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

@@ -15,17 +15,39 @@ FactoryBot.define do
     trait :with_total_budget_and_vote_threshold_percent do
       transient do
         total_budget { 100_000_000 }
+        vote_rule_threshold_percent_enabled { true }
+        vote_rule_minimum_budget_projects_enabled { false }
         vote_threshold_percent { 70 }
       end
 
       settings do
         {
           total_budget: total_budget,
+          vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
+          vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
           vote_threshold_percent: vote_threshold_percent
         }
       end
     end
 
+    trait :with_total_budget_and_minimum_budget_projects do
+      transient do
+        total_budget { 100_000_000 }
+        vote_rule_threshold_percent_enabled { false }
+        vote_rule_minimum_budget_projects_enabled { true }
+        vote_minimum_budget_projects_number { 3 }
+      end
+
+      settings do
+        {
+          total_budget: total_budget,
+          vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
+          vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
+          vote_minimum_budget_projects_number: vote_minimum_budget_projects_number
+        }
+      end
+    end
+
     trait :with_votes_disabled do
       step_settings do
         {
@@ -45,6 +67,17 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_voting_finished do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            votes_enabled: false,
+            show_votes: true
+          }
+        }
+      end
+    end
   end
 
   factory :project, class: "Decidim::Budgets::Project" do

data/lib/decidim/budgets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,42 +18,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -74,42 +80,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -130,6 +136,14 @@ files:
 - app/assets/stylesheets/decidim/budgets/budget/_budget-meter.scss
 - app/assets/stylesheets/decidim/budgets/budget/_progress.scss
 - app/cells/decidim/budgets/project_cell.rb
+- app/cells/decidim/budgets/project_list_item/project_data.erb
+- app/cells/decidim/budgets/project_list_item/project_data_number.erb
+- app/cells/decidim/budgets/project_list_item/project_data_vote_button.erb
+- app/cells/decidim/budgets/project_list_item/project_data_votes.erb
+- app/cells/decidim/budgets/project_list_item/project_image.erb
+- app/cells/decidim/budgets/project_list_item/project_text.erb
+- app/cells/decidim/budgets/project_list_item/show.erb
+- app/cells/decidim/budgets/project_list_item_cell.rb
 - app/cells/decidim/budgets/project_m/data.erb
 - app/cells/decidim/budgets/project_m/footer.erb
 - app/cells/decidim/budgets/project_m_cell.rb
@@ -142,6 +156,7 @@ files:
 - app/commands/decidim/budgets/checkout.rb
 - app/commands/decidim/budgets/remove_line_item.rb
 - app/controllers/concerns/decidim/budgets/needs_current_order.rb
+- app/controllers/concerns/decidim/budgets/orderable.rb
 - app/controllers/decidim/budgets/admin/application_controller.rb
 - app/controllers/decidim/budgets/admin/attachment_collections_controller.rb
 - app/controllers/decidim/budgets/admin/attachments_controller.rb
@@ -151,10 +166,13 @@ files:
 - app/controllers/decidim/budgets/line_items_controller.rb
 - app/controllers/decidim/budgets/orders_controller.rb
 - app/controllers/decidim/budgets/projects_controller.rb
+- app/forms/decidim/budgets/admin/component_form.rb
 - app/forms/decidim/budgets/admin/project_form.rb
 - app/forms/decidim/budgets/admin/project_import_proposals_form.rb
 - app/helpers/decidim/budgets/application_helper.rb
 - app/helpers/decidim/budgets/projects_helper.rb
+- app/jobs/decidim/budgets/send_order_summary_job.rb
+- app/mailers/decidim/budgets/order_summary_mailer.rb
 - app/models/decidim/budgets/application_record.rb
 - app/models/decidim/budgets/line_item.rb
 - app/models/decidim/budgets/order.rb
@@ -173,8 +191,10 @@ files:
 - app/views/decidim/budgets/admin/projects/edit.html.erb
 - app/views/decidim/budgets/admin/projects/index.html.erb
 - app/views/decidim/budgets/admin/projects/new.html.erb
+- app/views/decidim/budgets/admin/projects/proposals_picker.html.erb
 - app/views/decidim/budgets/admin/proposals_imports/new.html.erb
 - app/views/decidim/budgets/line_items/update_budget.js.erb
+- app/views/decidim/budgets/order_summary_mailer/order_summary.html.erb
 - app/views/decidim/budgets/projects/_budget_confirm.html.erb
 - app/views/decidim/budgets/projects/_budget_excess.html.erb
 - app/views/decidim/budgets/projects/_budget_summary.html.erb
@@ -193,9 +213,11 @@ files:
 - app/views/decidim/budgets/projects/show.html.erb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
@@ -204,22 +226,35 @@ files:
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/lt-LT.yml
+- config/locales/lv-LV.yml
+- config/locales/mt-MT.yml
 - config/locales/nl.yml
 - config/locales/no.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml