decidim-budgets 0.26.5 → 0.27.0.rc1

data/config/locales/no.yml

@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -104,6 +105,12 @@
             no_components: Det er ingen andre forslag komponenter i dette deltaker området å importere forslagene inn i prosjekter.
             select_component: Velg en komponent
             title: Importer forslag
+        reminders:
+          orders:
+            description: Brukere vil motta en e-post med lenker til de budsjettene som de har ventende.
+            title:
+              one: Du er i ferd med å sende en e-postpåminnelse til %{count} bruker
+              other: Du er i ferd med å sende en e-postpåminnelse til %{count} brukere
       admin_log:
         budget:
           create: "%{user_name} opprettet %{resource_name} budsjettet i rommet %{space_name}"
@@ -240,6 +247,7 @@
           votes:
             one: stem
             other: stemmer
+          you_voted: Du stemte dette
         project_budget_button:
           add: Legg til i stemmen din
           add_descriptive: Legg til prosjektet %{resource_name} til din stemme
@@ -249,6 +257,15 @@
         show:
           budget: Budsjett
           view_all_projects: Vis alle prosjekter
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Områder hvor du har en uferdig stemme:'
+          email_intro: Du har startet på det deltakende budsjettet, men er ikke ferdig.
+          email_link: Fortsett for å fortsatt stemme
+          email_outro: Husk å fullføre stemmingen. For å stemme, må du først velge forslaget eller forslagene du ønsker å stemme på, og deretter bekrefte stemmen din med "Stemme"-knappen.
+          email_subject:
+            one: Du har en uferdig stemme i deltakende budsjettavstemming
+            other: Du har uferdige stemmer i deltakende budsjettavstemming
     components:
       budgets:
         actions:

data/config/locales/om-ET.yml

@@ -1 +1,2 @@
+---
 om:

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -226,6 +227,7 @@ pl:
             few: głosów
             many: głosów
             other: głosów
+          you_voted: Zagłosowałeś na
         project_budget_button:
           add: Dodaj do swojego głosu
           add_descriptive: Dodaj projekt %{resource_name} do swojego głosu

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     attributes:
       budget:
@@ -217,6 +218,7 @@ pt-BR:
           votes:
             one: voto
             other: votos
+          you_voted: Você votou nisto
         project_budget_button:
           add: Adicione ao seu voto
           add_descriptive: Adicione o projeto %{resource_name} ao seu voto

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -220,6 +221,7 @@ pt:
           votes:
             one: Votações
             other: Votações
+          you_voted: Votou isto
         project_budget_button:
           add: Adicionar à sua votação
           add_descriptive: Adicionar projeto %{resource_name} à sua votação

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -13,11 +14,8 @@ ro:
         decidim_scope_id: Domeniu de interes
         description: Descriere
         proposal_ids: Propuneri asociate
-        proposals: Propuneri
         selected: Selectate pentru implementare
         title: Titlu
-      proposals_import:
-        scope_id: Domeniu de interes
   activerecord:
     models:
       decidim/budgets/project:
@@ -247,6 +245,7 @@ ro:
             one: vot
             few: voturi
             other: voturi
+          you_voted: Ai votat pentru
         project_budget_button:
           add: Adaugă la votul tău
           add_descriptive: Adaugă proiectul %{resource_name} la votul tău

data/config/locales/ru.yml

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

data/config/locales/si-LK.yml

@@ -1 +1,2 @@
+---
 si:

data/config/locales/sk.yml

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

data/config/locales/sl.yml

@@ -1 +1,2 @@
+---
 sl:

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

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:
@@ -6,7 +7,7 @@ sv:
         description: Beskrivning
         title: Titel
         total_budget: Total budget
-        weight: Ordning
+        weight: Vikt
       project:
         budget_amount: Belopp
         decidim_category_id: Kategori
@@ -87,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
@@ -107,6 +113,12 @@ sv:
             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}"
@@ -151,6 +163,7 @@ sv:
           fields:
             category: Kategori
             id: ID
+            scope: Omfång
             title: Titel
       order_summary_mailer:
         order_summary:
@@ -167,13 +180,10 @@ sv:
           title: Bekräfta röst
         budget_excess:
           budget_excess:
-            description: Detta projekt överstiger den maximala budgeten och kan inte tilläggas. Du måste först ta bort ett projekt innan du lägger till ett nytt.
             title: Maximal budget överskriden
           close: Stäng
-          description: Detta projekt överstiger den maximala budgeten och kan inte tilläggas. Du måste först ta bort ett projekt innan du lägger till ett nytt.
           ok: OK
           projects_excess:
-            description: Du har valt för många projekt. Du måste först ta bort ett projekt innan du lägger till ett nytt.
             title: Maximalt antal projekt överskridet
         budget_summary:
           are_you_sure: Vill du dra tillbaka din röst?
@@ -246,6 +256,7 @@ sv:
           votes:
             one: röst
             other: röster
+          you_voted: Det här är din röst
         project_budget_button:
           add: Lägg till i din röst
           add_descriptive: Lägg till projekt %{resource_name} till din röst
@@ -255,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/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -209,6 +210,7 @@ tr:
           votes:
             one: oy
             other: oylar
+          you_voted: Buna oy verdin
         project_budget_button:
           add: Oyunuza ekleyin
           add_descriptive: Oyunuza %{resource_name} projesini ekleyin

data/config/locales/uk.yml

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

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

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

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

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: Decidim::Budgets.workflows.keys.sample
+        workflow: %w(one random all).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.5"
+      "0.27.0.rc1"
     end
   end
 end