decidim-budgets 0.30.3 → 0.31.0.rc2

data/config/locales/pt.yml

@@ -21,10 +21,7 @@ pt:
   decidim:
     budgets:
       actions:
-        attachment_collections: Pastas
-        attachments: Anexos
         edit: Editar
-        edit_projects: Gerir projectos
         import: Importar propostas para projetos
         preview: Pré-visualização
         title: Ações
@@ -45,8 +42,6 @@ pt:
         exports:
           projects: Projectos
         models:
-          budget:
-            name: Orçamento
           project:
             name: Projeto
         projects:
@@ -121,7 +116,6 @@ pt:
             title: Projectos máximos excedidos
         budget_summary:
           are_you_sure: Tem a certeza de que deseja cancelar o seu voto?
-          cancel_order: elimine o seu voto e comece de novo
           checked_out:
             title: Votação do orçamento concluída
         count:
@@ -206,6 +200,5 @@ pt:
         project_proposal: Propostas incluídas neste projecto
     statistics:
       orders_count: Suportes
-      projects_count: Projetos
   index:
     confirmed_orders_count: Contagem de votos

data/config/locales/ro-RO.yml

@@ -33,10 +33,7 @@ ro:
               'true': Implementare refuzată
     budgets:
       actions:
-        attachment_collections: Dosare
-        attachments: Atașamente
         edit: Editare
-        edit_projects: Gestionați proiectele
         import: Importă propuneri în proiecte
         preview: Previzualizare
         send_voting_reminders: Trimite memento-uri de votare
@@ -58,8 +55,6 @@ ro:
         exports:
           projects: Proiecte
         models:
-          budget:
-            name: Buget
           project:
             name: Proiect
         projects:
@@ -119,7 +114,10 @@ ro:
             title: Titlu
       order:
         status:
+          share_text: "Tocmai am votat pentru proiectele mele favorite în %{space_name}! 🎉Votați acum: %{component_url}"
           title: Votul tău a fost acceptat cu succes
+      order_pdf:
+        text: Ați votat în %{space_name}, pentru următoarele proiecte
       order_summary_mailer:
         order_summary:
           selected_projects: 'Proiectele pe care le-ai selectat sunt:'
@@ -140,7 +138,7 @@ ro:
             title: Numărul maxim de proiecte a fost depășit
         budget_summary:
           are_you_sure: Sigur dorești să îți anulezi votul?
-          cancel_order: șterge votul și reia procesul
+          cancel_order: Ștergeți votul dumneavoastră
           checked_out:
             title: Votul pentru buget a fost finalizat
         count:
@@ -177,6 +175,7 @@ ro:
           add: Adaugă la votul tău
           added: Adăugat la votul tău
         projects_for: Proiecte pentru %{name}
+        select_projects: Adaugați proiecte
         show:
           budget: Buget
     components:
@@ -232,6 +231,7 @@ ro:
         project_proposal: Propuneri incluse în acest proiect
     statistics:
       orders_count: Voturi
-      projects_count: Proiecte
+      projects_count: Bugete
+      projects_count_tooltip: Numărul de proiecte bugetare participative și totalul voturilor exprimate asupra acestora.
   index:
     confirmed_orders_count: Numărul de voturi

data/config/locales/ru.yml

@@ -16,16 +16,12 @@ ru:
   decidim:
     budgets:
       actions:
-        attachment_collections: Папки
-        attachments: Прикрепленные файлы
         edit: Редактировать
         import: Внести в проекты позаимствованные предложения
         preview: Предпросмотр
         title: Действия
       admin:
         models:
-          budget:
-            name: Бюджет
           project:
             name: Проект
         projects:
@@ -68,7 +64,6 @@ ru:
           ok: Хорошо
         budget_summary:
           are_you_sure: Вы действительно хотите отменить свой голос?
-          cancel_order: удалить свой голос и начать все сначала
           checked_out:
             title: Голосование по бюджету завершено
         count:
@@ -102,7 +97,5 @@ ru:
             show_votes: Показать голоса
             votes_choices:
               enabled: Голосование включено
-    statistics:
-      projects_count: Проекты
   index:
     confirmed_orders_count: Количество голосов

data/config/locales/sk.yml

@@ -16,16 +16,12 @@ sk:
   decidim:
     budgets:
       actions:
-        attachment_collections: Priečinky
-        attachments: Prílohy
         edit: Upraviť
         import: Importovať návrhy do projektov
         preview: Ukážka
         title: Akcie
       admin:
         models:
-          budget:
-            name: Rozpočet
           project:
             name: Projekt
         projects:
@@ -72,7 +68,6 @@ sk:
           ok: OK
         budget_summary:
           are_you_sure: Naozaj chcete zrušiť svoj hlas?
-          cancel_order: vymažte svoj hlas a začnite odznova
           checked_out:
             title: Hlasovanie o rozpočte dokončené
         count:
@@ -115,7 +110,5 @@ sk:
             show_votes: Zobraziť hlasy
             votes_choices:
               enabled: Hlasovanie povolené
-    statistics:
-      projects_count: Projekty
   index:
     confirmed_orders_count: Počet hlasov

data/config/locales/sq-AL.yml

@@ -32,10 +32,7 @@ sq:
               'true': Nuk është përzgjedhur për zbatim
     budgets:
       actions:
-        attachment_collections: Dosjet
-        attachments: Bashkëngjitjet
         edit: Përpuno
-        edit_projects: Menaxho projektet
         import: Importo propozimet ne projekte
         new_budget: Buxhet i ri
         new_project: Projekt i ri

data/config/locales/sv.yml

@@ -42,15 +42,15 @@ sv:
               'true': Inte valda för genomförande
           taxonomies_part_of_contains:
             label: Kategorisering
+      tooltips:
+        deleted_projects_info: Kan inte ta bort detta projekt
     budgets:
       actions:
-        attachment_collections: Mappar
-        attachments: Bilagor
         confirm_delete_budget: Är du säker på att du vill ta bort budgeten?
         confirm_delete_project: Är du säker på att du vill radera projektet?
         deleted_budgets_info: Raderade budgetar kan återställas från papperskorgen.
         edit: Redigera
-        edit_projects: Hantera projekt
+        edit_projects: Lägg till projekt
         import: Importera förslag till projekt
         new_budget: Ny budget
         new_project: Nytt projekt
@@ -84,8 +84,6 @@ sv:
         exports:
           projects: Projekt
         models:
-          budget:
-            name: Budget
           project:
             name: Projekt
         projects:
@@ -179,6 +177,7 @@ sv:
         cancel_order:
           more_than_one: dra tillbaka din röst på %{name} och börja om
           only_one: dra tillbaka din röst och börja om.
+        completed: Slutförd
         count:
           one: "%{count} budget"
           other: "%{count} budgetar"
@@ -186,6 +185,7 @@ sv:
         finished_message: Du har avslutat omröstningen. Tack för ditt deltagande!
         highlighted_cta: Rösta på %{name}
         if_change_opinion: Om du har ändrat dig kan du
+        incomplete: Ofullständig
         orders:
           highest_cost: Högst kostnad
           label: Sortera budgetar efter
@@ -193,6 +193,8 @@ sv:
           random: Slumpvis ordning
         progress: Avsluta omröstning
         remove_vote: Ta bort röst
+        see_projects: Visa projekt
+        see_results: Visa resultat
         show: Visa projekt
         vote: Rösta
         voted_budgets: Budgetar som röstats i
@@ -223,6 +225,7 @@ sv:
           pending_to_vote_budgets:
             one: Du kan rösta i en till budget
             other: Du kan rösta i fler budgetar
+          share_text: "Jag röstade just på mina favoritprojekt i %{space_name}! 🎉 Rösta nu: %{component_url}"
           share_vote: Dela din röst
           title: Din röst har tagits emot
           view_votes:
@@ -231,12 +234,16 @@ sv:
           votes_count:
             one: Din röst på %{budget_name} har redan registrerats.
             other: Dina %{count} röster för %{budget_name} har redan registrerats.
+      order_pdf:
+        text: Du har röstat på följande projekt i %{space_name}
+        title: Din röst har tagits emot.
       order_summary_mailer:
         order_summary:
           selected_projects: 'Du har valt följande projekt:'
           subject: Du har röstat i %{space_name}
           voted_on_space: Du har röstat på budgeten %{budget_name} i %{space_name}.
       projects:
+        back_to_budgets: Tillbaka till budgetar
         budget_confirm:
           are_you_sure: Om du ändrar dig kan du ändra rösten senare.
           cancel: Avbryt
@@ -254,7 +261,7 @@ sv:
             title: Maximalt antal projekt överskridet
         budget_summary:
           are_you_sure: Vill du dra tillbaka din röst?
-          cancel_order: dra tillbaka din röst
+          cancel_order: Dra tillbaka din röst
           checked_out:
             description: Du har redan röstat i budgeten. Om du har ändrat dig kan du ta bort din röst.
             title: Budgetomröstning slutförd
@@ -280,18 +287,16 @@ sv:
           assigned: Valda
           budget: Budget
           dynamic_help:
-            keep_adding_projects: Fortsätt lägga till projekt
             minimum_reached: Du har uppnått den lägsta gränsen för att kunna rösta
-            start_adding_projects: Börja lägga till projekt
           minimum: Minst
           minimum_projects_rule:
-            description: Välj minst %{minimum_number} projekt att rösta på inom budgeten.
+            description: "<b>Välj minst %{minimum_number} projekt</b> som du vill rösta på."
           projects_rule:
-            description: Välj minst %{minimum_number} och som mest %{maximum_number} projekt att rösta på inom budgeten.
+            description: "<b>Välj minst %{minimum_number} och som mest %{maximum_number} projekt</b> som du vill rösta på."
           projects_rule_maximum_only:
-            description: Välj upp till %{maximum_number} projekt att rösta på inom budgeten.
+            description: "Välj upp till %{maximum_number} projekt</b> som du vill rösta på."
           vote_threshold_percent_rule:
-            description: Tilldela minst %{minimum_budget} till de projekt du vill rösta på inom budgeten.
+            description: "<b>Tilldela minst %{minimum_budget}</b> åt de projekt du vill rösta på inom budgeten."
         orders:
           highest_cost: Högst kostnad
           label: Sortera projekt efter
@@ -319,6 +324,7 @@ sv:
         select_projects: Välj projekt
         show:
           budget: Budget
+          votes: Röster
       prompt: Välj budget
       vote_reminder_mailer:
         vote_reminder:
@@ -363,6 +369,11 @@ sv:
             vote_selected_projects_maximum: Maximalt antal projekt att välja
             vote_selected_projects_minimum: Minsta antal projekt att välja
             vote_threshold_percent: Tröskelvärde för röster i procent
+            voting_rule: Omröstningsregel
+            voting_rule_choices:
+              minimum_projects: Minsta antal projekt att rösta på
+              selected_projects: Minsta och högsta antal projekt som ska röstas på
+              threshold_percent: Minsta del av budgeten i procent
             workflow: Arbetsflöde
             workflow_choices:
               all: 'Rösta på alla: låt deltagare att rösta i alla budgetar.'
@@ -436,6 +447,7 @@ sv:
         project_proposal: Förslag som ingår i projektet
     statistics:
       orders_count: Stöd
-      projects_count: Projekt
+      projects_count: Budgetar
+      projects_count_tooltip: Antalet projekt och det totala antalet röster.
   index:
     confirmed_orders_count: Antal röster

data/config/locales/tr-TR.yml

@@ -20,10 +20,7 @@ tr:
   decidim:
     budgets:
       actions:
-        attachment_collections: Klasörler
-        attachments: Ekler
         edit: Düzenle
-        edit_projects: Projeleri Yönet
         import: Teklifleri projelere aktarın
         new_budget: Yeni Bütçe
         new_project: Yeni proje
@@ -42,8 +39,6 @@ tr:
         exports:
           projects: Projeler
         models:
-          budget:
-            name: Bütçe
           project:
             name: proje
         projects:
@@ -120,7 +115,6 @@ tr:
             title: Maksimum proje sınırını aştı
         budget_summary:
           are_you_sure: Oyunuzu iptal etmek istediğinizden emin misiniz?
-          cancel_order: oyunuzu silin ve baştan başlayın
           checked_out:
             title: Bütçe oyu tamamlandı
         count:
@@ -199,7 +193,5 @@ tr:
           email_outro: Bu bildirimi, %{participatory_space_title} adlı kişiyi takip ettiğiniz için aldınız. Önceki bağlantıyı izleyerek bildirim almayı durdurabilirsiniz.
           email_subject: '%{resource_title} bütçesi artık %{participatory_space_title} için aktif.'
           notification_title: <a href="%{resource_path}">%{resource_title} </a> bütçesi artık %{participatory_space_title} için aktif.
-    statistics:
-      projects_count: Projeler
   index:
     confirmed_orders_count: Oy sayısı

data/config/locales/uk.yml

@@ -16,16 +16,12 @@ uk:
   decidim:
     budgets:
       actions:
-        attachment_collections: Теки
-        attachments: Вкладені файли
         edit: Редагувати
         import: Внести до проектів запозичені пропозиції
         preview: Попередній перегляд
         title: Дії
       admin:
         models:
-          budget:
-            name: Бюджет
           project:
             name: Проект
         projects:
@@ -68,7 +64,6 @@ uk:
           ok: Гаразд
         budget_summary:
           are_you_sure: Ви дійсно бажаєте скасувати ваш голос?
-          cancel_order: видалити ваш голос і почати все спочатку
           checked_out:
             title: Голосування щодо бюджету завершено
         count:
@@ -101,7 +96,5 @@ uk:
             show_votes: Показати голоси
             votes_choices:
               enabled: Голосування увімкнене
-    statistics:
-      projects_count: Проекти
   index:
     confirmed_orders_count: Кількість голосів

data/config/locales/zh-CN.yml

@@ -18,10 +18,7 @@ zh-CN:
   decidim:
     budgets:
       actions:
-        attachment_collections: 文件夹
-        attachments: 附件
         edit: 编辑
-        edit_projects: 管理项目
         import: 导入提案到项目
         preview: 预览
         title: 行动
@@ -36,8 +33,6 @@ zh-CN:
             create: 创建预算
             title: 新预算
         models:
-          budget:
-            name: 三. 预算
           project:
             name: 项目
         projects:
@@ -107,7 +102,6 @@ zh-CN:
           ok: 好的
         budget_summary:
           are_you_sure: 您确定要取消您的投票吗？
-          cancel_order: 删除您的投票并开始
           checked_out:
             title: 预算投票完成
         count:
@@ -180,7 +174,5 @@ zh-CN:
           email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
           email_subject: '%{resource_title} 的预算现在在 %{participatory_space_title} 处于活动状态。'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 预算现在已经在 %{participatory_space_title} 中生效。
-    statistics:
-      projects_count: 项目
   index:
     confirmed_orders_count: 所得票数

data/config/locales/zh-TW.yml

@@ -31,10 +31,7 @@ zh-TW:
               'true': 未選擇實施
     budgets:
       actions:
-        attachment_collections: 資料夾
-        attachments: 附件
         edit: 編輯
-        edit_projects: 管理專案
         import: 將提案匯入專案
         preview: 預覽
         send_voting_reminders: 發送投票提醒
@@ -62,8 +59,6 @@ zh-TW:
         exports:
           projects: 專案
         models:
-          budget:
-            name: 預算
           project:
             name: 專案
         projects:
@@ -174,7 +169,6 @@ zh-TW:
             title: 超過最大專案數量
         budget_summary:
           are_you_sure: 您確定要取消您的投票嗎?
-          cancel_order: 刪除你的投票並重新開始
           checked_out:
             description: 你已經對預算表決投票了。如果你改變了主意，你可以%{cancel_link}。
             title: 預算投票完成
@@ -287,6 +281,5 @@ zh-TW:
         project_proposal: 此專案中包括的提案
     statistics:
       orders_count: 支援
-      projects_count: 專案
   index:
     confirmed_orders_count: 投票數

data/db/migrate/20250912110212_move_voting_rules_to_radio_buttons.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class MoveVotingRulesToRadioButtons < ActiveRecord::Migration[7.2]
+  class Component < ApplicationRecord
+    self.table_name = :decidim_components
+  end
+
+  def change
+    budgets_components = Component.where(manifest_name: "budgets")
+
+    budgets_components.each do |component|
+      settings = component["settings"]["global"]
+
+      settings["voting_rule"] = "threshold_percent" if settings["vote_rule_threshold_percent_enabled"]
+      settings["voting_rule"] = "minimum_projects" if settings["vote_rule_minimum_budget_projects_enabled"]
+      settings["voting_rule"] = "selected_projects" if settings["vote_rule_selected_projects_enabled"]
+
+      component["settings"]["global"] = settings
+      component.save
+    end
+  end
+end

data/lib/decidim/api/budget_type.rb

@@ -5,6 +5,7 @@ module Decidim
     class BudgetType < Decidim::Api::Types::BaseObject
       implements Decidim::Core::TimestampsInterface
       implements Decidim::Core::TraceableInterface
+      implements Decidim::Core::TaxonomizableInterface
 
       description "A budget"
 
@@ -13,6 +14,12 @@ module Decidim
       field :projects, [Decidim::Budgets::ProjectType, { null: true }], "The projects for this budget", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title for this budget", null: false
       field :total_budget, GraphQL::Types::Int, "The total budget", null: false, camelize: false
+      field :url, String, "The URL for this budget", null: false
+      field :weight, GraphQL::Types::Int, "The weight for this budget", null: false
+
+      def url
+        Decidim::EngineRouter.main_proxy(object.component).budget_url(object)
+      end
 
       def self.authorized?(object, context)
         super && object.visible?

data/lib/decidim/api/project_type.rb

@@ -7,15 +7,43 @@ module Decidim
       implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Core::AttachableInterface
       implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::AttachableCollectionInterface
+      implements Decidim::Core::FollowableInterface
+      implements Decidim::Core::LocalizableInterface
+      implements Decidim::Core::TimestampsInterface
+      implements Decidim::Core::ReferableInterface
+      implements Decidim::Core::TraceableInterface
 
       description "A project"
 
       field :budget_amount, GraphQL::Types::Int, "The budget amount for this project", null: true, camelize: false
+      field :budget_url, String, "The URL for the budget", null: false
+      field :confirmed_votes, Integer, "The number of confirmed votes this project has received", null: true
       field :description, Decidim::Core::TranslatedFieldType, "The description for this project", null: true
       field :id, GraphQL::Types::ID, "The internal ID for this project", null: false
-      field :reference, GraphQL::Types::String, "The reference for this project", null: true
+      field :related_proposals, [Decidim::Proposals::ProposalType, { null: true }], "The related proposals", null: true
       field :selected, GraphQL::Types::Boolean, "Whether this proposal is selected or not", method: :selected?, null: true
+      field :selected_at, Decidim::Core::DateTimeType, "The date when the project was selected", null: true
       field :title, Decidim::Core::TranslatedFieldType, "The title for this project", null: true
+      field :url, String, "The URL for this project", null: false
+
+      def confirmed_votes
+        return unless object.component.current_settings.show_votes?
+
+        object.confirmed_orders_count
+      end
+
+      def related_proposals
+        object.linked_resources(:proposals, "included_proposals")
+      end
+
+      def url
+        object.resource_locator.url
+      end
+
+      def budget_url
+        Decidim::EngineRouter.main_proxy(object.component).budget_url(object.budget)
+      end
 
       def self.authorized?(object, context)
         context[:project] = object

data/lib/decidim/budgets/budget_order_pdf.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "hexapdf"
+
+module Decidim
+  module Budgets
+    class OrderPDF
+      include Decidim::TranslatableAttributes
+      include Decidim::ResourceHelper
+
+      delegate :document, to: :composer
+
+      attr_reader :order
+
+      def initialize(order)
+        @order = order
+      end
+
+      def render
+        composer.styles(**styles)
+
+        add_content
+
+        ::Decidim::Exporters::ExportData.new(composer.write_to_string, "pdf")
+      end
+
+      def composer
+        @composer ||= ::HexaPDF::Composer.new(page_orientation: :portrait, page_size: :A4)
+      end
+
+      def styles
+        {
+          h1: { font: bold_font, text_align: :left, font_size: 15 },
+          text: { font:, text_align: :left, font_size: 10 }
+        }
+      end
+
+      def add_content
+        composer.text(I18n.t("decidim.budgets.order_pdf.title"), style: :h1, position: [30, 700])
+        composer.text(I18n.t("decidim.budgets.order_pdf.text", space_name:), style: :text, position: [30, 670])
+        order.projects.each_with_index do |project, index|
+          composer.text("- #{translated_attribute(project.title)}", style: :text, position: [30, 650 - (index * 20)])
+        end
+
+        composer.text(component_url, style: :text, position: [30, 650 - (order.projects.count * 20) - 10])
+      end
+
+      def space_name
+        translated_attribute(budget.participatory_space.title)
+      end
+
+      def component_url
+        Decidim::ResourceLocatorPresenter.new(budget).url
+      end
+
+      def budget
+        @budget ||= order.budget
+      end
+
+      def font
+        @font ||= load_font("source-sans-pro-v21-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.ttf")
+      end
+
+      def bold_font
+        @bold_font ||= load_font("source-sans-pro-v21-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.ttf")
+      end
+
+      def load_font(path)
+        document.fonts.add(Decidim::Core::Engine.root.join("app/packs/fonts/decidim/").join(path))
+      end
+    end
+  end
+end