decidim-budgets 0.26.2 → 0.27.0.rc2

data/config/locales/sr-CS.yml

@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     budgets:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -15,6 +16,8 @@ sv:
         proposal_ids: Relaterade förslag
         selected: Valda för genomförande
         title: Titel
+      proposals_import:
+        scope_id: Omfång
   activerecord:
     models:
       decidim/budgets/project:
@@ -85,10 +88,15 @@ sv:
             title: Redigera projekt
             update: Uppdatera
           index:
+            actions: Åtgärder
+            cancel: Avbryt
+            deselect_implementation: Avmarkera
             finished_orders: Avslutade omröstningar
             pending_orders: Pågående omröstningar
+            select_for_implementation: Välj
             selected: Valda
             title: Projekt
+            update: Uppdatera
           new:
             create: Skapa
             title: Nytt projekt
@@ -101,9 +109,16 @@ sv:
             success: "%{number} förslag har importerats till projekt"
           new:
             create: Importera förslag till projekt
+            default_budget: Förvald budget
             no_components: Det finns inga andra förslagskomponenter med förslag i deltagarutrymmet som kan importeras till projekt.
             select_component: Välj en komponent
             title: Importera förslag
+        reminders:
+          orders:
+            description: Användarna kommer få ett e-post med länkar till budgetar de har börjat rösta i.
+            title:
+              one: Du är på väg att skicka ett e-postpåminnelse till %{count} användare
+              other: Du är på väg att skicka ett e-postpåminnelse till %{count} användare
       admin_log:
         budget:
           create: "%{user_name} skapade budgeten %{resource_name} i utrymmet %{space_name}"
@@ -148,6 +163,7 @@ sv:
           fields:
             category: Kategori
             id: ID
+            scope: Omfång
             title: Titel
       order_summary_mailer:
         order_summary:
@@ -250,6 +266,15 @@ sv:
         show:
           budget: Budget
           view_all_projects: Visa alla projekt
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Områden där du inte har skickat din röst:'
+          email_intro: Du har börjat rösta i medborgarbudgeten men inte skickat den.
+          email_link: Rösta klart
+          email_outro: Kom ihåg att slutföra omröstningen. För att rösta måste du först välja ett eller flera förslag som du vill rösta för och bekräfta din röst med knappen "Rösta".
+          email_subject:
+            one: Du har börjat rösta i medborgarbudgeten men glömt skicka din röst
+            other: Du har börjat rösta i medborgarbudgeten men glömt skicka dina röster
     components:
       budgets:
         actions:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:

data/db/migrate/20200804175222_votes_enabled_to_votes_choices.rb

@@ -14,7 +14,7 @@ class VotesEnabledToVotesChoices < ActiveRecord::Migration[5.2]
         new_steps_settings = component["settings"]["steps"].each_with_object({}) do |(step, config), new_config|
           votes_value = config["votes_enabled"] ? "enabled" : "disabled"
 
-          new_config[step] = config.merge("votes": votes_value).except("votes_enabled")
+          new_config[step] = config.merge(votes: votes_value).except("votes_enabled")
           new_config
         end
         component["settings"]["steps"] = new_steps_settings
@@ -22,7 +22,7 @@ class VotesEnabledToVotesChoices < ActiveRecord::Migration[5.2]
       elsif default_step.present?
         votes_value = component["settings"]["default_step"]["votes_enabled"] ? "enabled" : "disabled"
 
-        new_default_step_settings = component["settings"]["default_step"].merge("votes": votes_value).except("votes_enabled")
+        new_default_step_settings = component["settings"]["default_step"].merge(votes: votes_value).except("votes_enabled")
         component["settings"]["default_step"] = new_default_step_settings
         component.save!
       end

data/db/migrate/20220428072638_add_geolocalization_fields_to_projects.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddGeolocalizationFieldsToProjects < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_budgets_projects, :address, :text
+    add_column :decidim_budgets_projects, :latitude, :float
+    add_column :decidim_budgets_projects, :longitude, :float
+  end
+end

data/lib/decidim/budgets/admin_engine.rb

@@ -15,6 +15,9 @@ module Decidim
         resources :budgets do
           resources :projects do
             collection do
+              post :update_category
+              post :update_scope
+              post :update_selected
               resource :proposals_import, only: [:new, :create]
             end
           end

data/lib/decidim/budgets/component.rb

@@ -46,7 +46,7 @@ Decidim.register_component(:budgets) do |component|
 
   component.register_stat :orders_count do |components, start_at, end_at|
     budgets = Decidim::Budgets::Budget.where(component: components)
-    orders = Decidim::Budgets::Order.where(component: budgets)
+    orders = Decidim::Budgets::Order.where(budget: budgets)
     orders = orders.where("created_at >= ?", start_at) if start_at.present?
     orders = orders.where("created_at <= ?", end_at) if end_at.present?
     orders.count
@@ -90,6 +90,7 @@ Decidim.register_component(:budgets) do |component|
     settings.attribute :vote_selected_projects_maximum, type: :integer, default: 1
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: false
+    settings.attribute :geocoding_enabled, type: :boolean, default: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
     settings.attribute :announcement, type: :text, translated: true, editor: true
 
@@ -123,7 +124,7 @@ Decidim.register_component(:budgets) do |component|
       settings: {
         landing_page_content: landing_page_content,
         more_information_modal: Decidim::Faker::Localized.paragraph(sentence_count: 4),
-        workflow: %w(one random all).sample
+        workflow: Decidim::Budgets.workflows.keys.sample
       }
     )
 
@@ -148,7 +149,7 @@ Decidim.register_component(:budgets) do |component|
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
-          budget_amount: Faker::Number.number(digits: 8)
+          budget_amount: Faker::Number.between(from: Integer(budget.total_budget * 0.7), to: budget.total_budget)
         )
 
         attachment_collection = Decidim::AttachmentCollection.create!(
@@ -163,7 +164,7 @@ Decidim.register_component(:budgets) do |component|
           attachment_collection: attachment_collection,
           attached_to: project,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",
@@ -175,7 +176,7 @@ Decidim.register_component(:budgets) do |component|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: project,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",
@@ -187,7 +188,7 @@ Decidim.register_component(:budgets) do |component|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: project,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",

data/lib/decidim/budgets/engine.rb

@@ -42,6 +42,23 @@ module Decidim
       initializer "decidim_budgets.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_budgets.register_reminders" do
+        Decidim.reminders_registry.register(:orders) do |reminder_registry|
+          reminder_registry.generator_class_name = "Decidim::Budgets::OrderReminderGenerator"
+          reminder_registry.form_class_name = "Decidim::Budgets::Admin::OrderReminderForm"
+          reminder_registry.command_class_name = "Decidim::Budgets::Admin::CreateOrderReminders"
+
+          reminder_registry.settings do |settings|
+            settings.attribute :reminder_times, type: :array, default: [2.hours, 1.week, 2.weeks]
+          end
+
+          reminder_registry.messages do |msg|
+            msg.set(:title) { |count: 0| I18n.t("decidim.budgets.admin.reminders.orders.title", count: count) }
+            msg.set(:description) { I18n.t("decidim.budgets.admin.reminders.orders.description") }
+          end
+        end
+      end
     end
   end
 end

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

@@ -12,6 +12,14 @@ FactoryBot.define do
     manifest_name { :budgets }
     participatory_space { create(:participatory_process, :with_steps, organization: organization) }
 
+    trait :with_geocoding_enabled do
+      settings do
+        {
+          geocoding_enabled: true
+        }
+      end
+    end
+
     trait :with_vote_threshold_percent do
       transient do
         vote_rule_threshold_percent_enabled { true }
@@ -120,6 +128,9 @@ FactoryBot.define do
   factory :project, class: "Decidim::Budgets::Project" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
+    latitude { Faker::Address.latitude }
+    longitude { Faker::Address.longitude }
     budget_amount { Faker::Number.number(digits: 8) }
     budget { create(:budget) }
 

data/lib/decidim/budgets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -110,6 +110,7 @@ files:
 - app/cells/decidim/budgets/budgets_list/voted.erb
 - app/cells/decidim/budgets/budgets_list_cell.rb
 - app/cells/decidim/budgets/limit_announcement_cell.rb
+- app/cells/decidim/budgets/order_activity_cell.rb
 - 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_image.erb
@@ -128,12 +129,16 @@ files:
 - app/cells/decidim/budgets/project_votes_count_cell.rb
 - app/commands/decidim/budgets/add_line_item.rb
 - app/commands/decidim/budgets/admin/create_budget.rb
+- app/commands/decidim/budgets/admin/create_order_reminders.rb
 - app/commands/decidim/budgets/admin/create_project.rb
 - app/commands/decidim/budgets/admin/destroy_budget.rb
 - app/commands/decidim/budgets/admin/destroy_project.rb
 - app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
 - app/commands/decidim/budgets/admin/update_budget.rb
 - app/commands/decidim/budgets/admin/update_project.rb
+- app/commands/decidim/budgets/admin/update_project_category.rb
+- app/commands/decidim/budgets/admin/update_project_scope.rb
+- app/commands/decidim/budgets/admin/update_project_selection.rb
 - app/commands/decidim/budgets/cancel_order.rb
 - app/commands/decidim/budgets/checkout.rb
 - app/commands/decidim/budgets/remove_line_item.rb
@@ -153,21 +158,27 @@ files:
 - app/controllers/decidim/budgets/projects_controller.rb
 - app/forms/decidim/budgets/admin/budget_form.rb
 - app/forms/decidim/budgets/admin/component_form.rb
+- app/forms/decidim/budgets/admin/order_reminder_form.rb
 - app/forms/decidim/budgets/admin/project_form.rb
 - app/forms/decidim/budgets/admin/project_import_proposals_form.rb
 - app/helpers/decidim/budgets/admin/application_helper.rb
 - app/helpers/decidim/budgets/admin/filterable_helper.rb
+- app/helpers/decidim/budgets/admin/project_bulk_actions_helper.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/jobs/decidim/budgets/send_vote_reminder_job.rb
 - app/mailers/decidim/budgets/order_summary_mailer.rb
+- app/mailers/decidim/budgets/vote_reminder_mailer.rb
 - app/models/decidim/budgets/application_record.rb
 - app/models/decidim/budgets/budget.rb
 - app/models/decidim/budgets/line_item.rb
 - app/models/decidim/budgets/order.rb
 - app/models/decidim/budgets/project.rb
 - app/packs/entrypoints/decidim_budgets.js
+- app/packs/entrypoints/decidim_budgets_admin.js
 - app/packs/images/decidim/budgets/decidim_budgets.svg
+- app/packs/src/decidim/budgets/admin/projects.js
 - app/packs/src/decidim/budgets/exit_handler.js
 - app/packs/src/decidim/budgets/progressFixed.js
 - app/packs/src/decidim/budgets/projects.js
@@ -182,17 +193,24 @@ files:
 - app/queries/decidim/budgets/filtered_projects.rb
 - app/queries/decidim/budgets/metrics/budget_followers_metric_measure.rb
 - 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/serializers/decidim/budgets/download_your_data_budgets_order_serializer.rb
+- app/services/decidim/budgets/order_reminder_generator.rb
 - app/views/decidim/budgets/admin/budgets/_form.html.erb
 - app/views/decidim/budgets/admin/budgets/edit.html.erb
 - app/views/decidim/budgets/admin/budgets/index.html.erb
 - app/views/decidim/budgets/admin/budgets/new.html.erb
+- app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb
 - app/views/decidim/budgets/admin/projects/_form.html.erb
+- app/views/decidim/budgets/admin/projects/_project-tr.html.erb
+- app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb
+- app/views/decidim/budgets/admin/projects/bulk_actions/_dropdown.html.erb
+- app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb
+- app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb
 - 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/projects/update_attribute.js.erb
 - app/views/decidim/budgets/admin/proposals_imports/new.html.erb
 - app/views/decidim/budgets/budgets/index.html.erb
 - app/views/decidim/budgets/line_items/update_budget.js.erb
@@ -214,6 +232,7 @@ files:
 - app/views/decidim/budgets/projects/index.html.erb
 - app/views/decidim/budgets/projects/index.js.erb
 - app/views/decidim/budgets/projects/show.html.erb
+- app/views/decidim/budgets/vote_reminder_mailer/vote_reminder.html.erb
 - config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -305,6 +324,7 @@ files:
 - db/migrate/20200804175222_votes_enabled_to_votes_choices.rb
 - db/migrate/20200827154129_add_commentable_counter_cache_to_projects.rb
 - db/migrate/20210310120613_add_followable_counter_cache_to_budgets.rb
+- db/migrate/20220428072638_add_geolocalization_fields_to_projects.rb
 - lib/decidim/api/budget_type.rb
 - lib/decidim/api/budgets_type.rb
 - lib/decidim/api/project_type.rb
@@ -335,14 +355,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim budgets module

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

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    # This class handles search and filtering of projects. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the projects.
-    class ProjectSearch < ResourceSearch
-      text_search_fields :title, :description
-
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the projects from.
-      def initialize(options = {})
-        super(Project.all, options)
-      end
-
-      # Creates the SearchLight base query.
-      def base_query
-        raise "Missing budget" unless budget
-        raise "Missing component" unless component
-
-        @scope.where(budget: budget)
-      end
-
-      # Returns the random projects for the current page.
-      def results
-        Project.where(id: super.pluck(:id)).includes([:scope, :component, :attachments, :category])
-      end
-
-      def search_status
-        return query if status.member?("all")
-
-        apply_scopes(%w(selected not_selected), status)
-      end
-
-      private
-
-      # Private: Since budget is not used by a search method we need
-      # to define the method manually.
-      def budget
-        options[:budget]
-      end
-    end
-  end
-end