decidim-budgets 0.24.3 → 0.25.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99236af82e1741b097227cf2e4f026411ad3e010194e802386ca695846479ce
-  data.tar.gz: 5c257f19c77ca4a45f044ce7cd676a4b3c4579e33928d0a0c6d8f23220ce7d72
+  metadata.gz: 8d5f52b55491cbb9db4ab39ad53f9f5f4bef09904eebb5cec0353647fd9a3855
+  data.tar.gz: b54721c17f5446818644ff49058570562259cb1ff049ae9554f6bd8208ec205f
 SHA512:
-  metadata.gz: 42d26e2dfa1f1e5c8a740882f13fe5fa32995a07baaaba95865a6414367308dfadbd5cb24a20ad70e486e77c349e3101fc44042dec1934f8151156c0ad5ba907
-  data.tar.gz: d632d45a8bb76e79aa113e3d6ffb4b8461fffbd421485d7635b6f3b4e5619c7c7d7c19ba9e10095fe8aa4788e531d727346c2a13e1d3f0391d4ddc5a7bd0c5ce
+  metadata.gz: c52b6e8009ca7a4a3b535064a2f26f0c13119db5eefaab16719add91b1517a369f2cf55975c134d4cb6aecff56900603702b41ae741a9add5b4d81e53820fe40
+  data.tar.gz: 4fa010ce15c1eada7a86f023c452073b267e0126620673a994d0f52438e66471a7a23a329776057afe157b023cb03a4ba69cb982158e9d2fe1b507704f72a66e

data/app/cells/decidim/budgets/budget_list_item/show.erb

@@ -6,14 +6,14 @@
           <%= translated_attribute(title) %>
         </strong>
         <span class="button tiny success card--list__check card--list__check--disabled">
-          <%= icon "check", class: "icon--small", role: "img" %>
+          <%= icon "check", class: "icon--small", role: "img", aria_label: t("decidim.budgets.budget_list_item.voting_finished") %>
         </span>
       <% else %>
         <%= translated_attribute(title) %>
 
         <% if progress? && !voting_finished? %>
           <span class="button tiny hollow secondary card--list__check card--list__check--disabled">
-            <%= icon "bookmark", class: "icon--small", role: "img" %>
+            <%= icon "bookmark", class: "icon--small", role: "img", aria_label: t("decidim.budgets.budget_list_item.voting_started") %>
           </span>
         <% end %>
       <% end %>

data/app/cells/decidim/budgets/project_voted_hint_cell.rb

@@ -18,7 +18,7 @@ module Decidim
 
       def hint
         contents = []
-        contents << icon("check", role: "img")
+        contents << icon("check", role: "img", "aria-hidden": true)
         contents << " "
         contents << t("decidim.budgets.projects.project.you_voted")
       end

data/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb

@@ -46,7 +46,7 @@ module Decidim
             budget: form.budget,
             title: original_proposal.title,
             description: original_proposal.body,
-            budget_amount: form.default_budget,
+            budget_amount: budget_for(original_proposal),
             category: original_proposal.category,
             scope: original_proposal.scope
           }
@@ -59,6 +59,12 @@ module Decidim
           )
         end
 
+        def budget_for(original_proposal)
+          return form.default_budget if original_proposal.cost.blank?
+
+          original_proposal.cost
+        end
+
         def proposals
           return all_proposals if form.scope_id.blank?
 

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

@@ -6,7 +6,7 @@ module Decidim
       # This controller allows an admin to manage projects from a Participatory Process
       class ProjectsController < Admin::ApplicationController
         include Decidim::ApplicationHelper
-        include Decidim::Proposals::Admin::Picker
+        include Decidim::Proposals::Admin::Picker if Decidim::Budgets.enable_proposal_linking
 
         helper_method :projects, :finished_orders, :pending_orders, :present
 

data/app/models/decidim/budgets/project.rb

@@ -12,7 +12,7 @@ module Decidim
       include Decidim::HasAttachmentCollections
       include Decidim::HasReference
       include Decidim::Followable
-      include Decidim::Comments::Commentable
+      include Decidim::Comments::CommentableWithComponent
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Randomable
@@ -26,7 +26,12 @@ module Decidim
       has_many :line_items, class_name: "Decidim::Budgets::LineItem", foreign_key: "decidim_project_id", dependent: :destroy
       has_many :orders, through: :line_items, foreign_key: "decidim_project_id", class_name: "Decidim::Budgets::Order"
 
-      delegate :organization, :participatory_space, to: :component
+      delegate :organization, :participatory_space, :can_participate_in_space?, to: :component
+
+      alias can_participate? can_participate_in_space?
+
+      scope :selected, -> { where.not(selected_at: nil) }
+      scope :not_selected, -> { where(selected_at: nil) }
 
       searchable_fields(
         scope_id: :decidim_scope_id,
@@ -56,16 +61,6 @@ module Decidim
         ::Decidim::ResourceLocatorPresenter.new([budget, self]).url(url_params)
       end
 
-      # Public: Overrides the `commentable?` Commentable concern method.
-      def commentable?
-        component.settings.comments_enabled?
-      end
-
-      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
-      def accepts_new_comments?
-        commentable? && !component.current_settings.comments_blocked
-      end
-
       # Public: Overrides the `comments_have_votes?` Commentable concern method.
       def comments_have_votes?
         true
@@ -86,11 +81,6 @@ module Decidim
         component.settings.resources_permissions_enabled
       end
 
-      # Public: Whether the object can have new comments or not.
-      def user_allowed_to_comment?(user)
-        component.can_participate_in_space?(user)
-      end
-
       # Public: Checks if the project has been selected or not.
       #
       # Returns Boolean.

data/app/packs/entrypoints/decidim_budgets.js

@@ -0,0 +1,5 @@
+import "src/decidim/budgets/projects"
+import "src/decidim/budgets/progressFixed"
+
+// Images
+require.context("../images", true)

data/app/{assets/javascripts/decidim/budgets/projects.js.es6 → packs/src/decidim/budgets/projects.js}

@@ -1,6 +1,3 @@
-// = require ./progressFixed
-// = require_self
-
 $(() => {
   const $projects = $("#projects, #project");
   const $budgetSummaryTotal = $(".budget-summary__total");

data/app/packs/stylesheets/decidim/budgets/_budgets.scss

@@ -0,0 +1,3 @@
+@import "stylesheets/decidim/budgets/budget/budget-list";
+@import "stylesheets/decidim/budgets/budget/budget-meter";
+@import "stylesheets/decidim/budgets/budget/progress";

data/app/{assets → packs}/stylesheets/decidim/budgets/budget/_budget-list.scss

@@ -28,7 +28,7 @@
     flex-shrink: 0;
     margin-top: $card-padding-small * .7;
     margin-bottom: $card-padding-small * .7;
-    margin-left: $card-padding-small / 2;
+    margin-left: $card-padding-small * .5;
 
     @include breakpoint(medium){
       width: 6rem;
@@ -47,7 +47,7 @@
   }
 
   &__text{
-    padding: $card-padding-small / 2;
+    padding: $card-padding-small * .5;
     flex-grow: 1;
 
     @include breakpoint(medium){
@@ -72,7 +72,7 @@
     font-size: 85%;
     line-height: 1;
     color: $muted;
-    padding: $card-padding-small / 2;
+    padding: $card-padding-small * .5;
     background: $card-secondary-bg;
 
     @include breakpoint(medium){

data/app/serializers/decidim/budgets/data_portability_budgets_order_serializer.rb

@@ -24,6 +24,7 @@ module Decidim
       private
 
       attr_reader :order
+      alias resource order
 
       def all_projects
         order.projects.map do |project|

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

@@ -27,6 +27,12 @@ module Decidim
         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

data/app/views/decidim/budgets/admin/budgets/index.html.erb

@@ -48,13 +48,13 @@
                 <% if allowed_to? :update, :budget, budget: budget %>
                   <%= icon_link_to "pencil", edit_budget_path(budget), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
                 <% else %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.budgets") %>
                 <% end %>
 
                 <% if allowed_to? :delete, :budget, budget: budget %>
                   <%= icon_link_to "circle-x", budget_path(budget), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
                 <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -28,9 +28,11 @@
       <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
     </div>
 
-    <div class="row column">
-      <%= proposals_picker(form, :proposals, proposals_picker_projects_path) %>
-    </div>
+    <% if Decidim::Budgets.enable_proposal_linking %>
+      <div class="row column">
+        <%= proposals_picker(form, :proposals, proposals_picker_projects_path) %>
+      </div>
+    <% end %>
 
     <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
 

data/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -64,7 +64,7 @@
                 <% if allowed_to? :destroy, :project, project: project %>
                   <%= icon_link_to "circle-x", resource_locator([budget, project]).show, t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
                 <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
                 <% end %>
               </td>
             </tr>

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

@@ -4,10 +4,10 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="projects">
-            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img", "aria-hidden": true %>
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>

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

@@ -30,5 +30,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag("decidim/filters") %>
-<%= javascript_include_tag("decidim/budgets/projects") %>
+<%= javascript_pack_tag("decidim_budgets") %>

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

@@ -49,6 +49,7 @@ edit_link(
       </div>
     </div>
     <%= resource_reference(project) %>
+    <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -56,6 +57,7 @@ edit_link(
       <%= decidim_sanitize translated_attribute project.description %>
       <%= cell "decidim/budgets/project_tags", project, context: { extra_classes: ["tags--project"] } %>
     </div>
+    <%= attachments_for project %>
     <%= linked_resources_for project, :proposals, "included_proposals" %>
     <%= linked_resources_for project, :results, "included_projects" %>
   </div>
@@ -63,5 +65,4 @@ edit_link(
 
 <%= comments_for project %>
 
-<%= attachments_for project %>
-<%= javascript_include_tag("decidim/budgets/projects") %>
+<%= javascript_pack_tag("decidim_budgets") %>

data/config/assets.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_budgets: "#{base_path}/app/packs/entrypoints/decidim_budgets.js"
+)
+Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/budgets/budgets")

data/config/locales/ar.yml

@@ -145,8 +145,5 @@ ar:
       destroy:
         error: حدثت مشكلة في إلغاء تصويتك
         success: تم إلغاء تصويتك بنجاح
-    resource_links:
-      included_proposals:
-        project_proposal: 'المقترحات المدرجة في هذا المشروع:'
   index:
     confirmed_orders_count: عدد الأصوات

data/config/locales/ca.yml

@@ -6,7 +6,7 @@ ca:
         description: Descripció
         title: Títol
         total_budget: Pressupost total
-        weight: Pes
+        weight: Ordre de posició
       project:
         budget_amount: Import del pressupost
         decidim_category_id: Categoria
@@ -108,6 +108,9 @@ ca:
         close_modal: Tancar el modal
         continue: Continuar
         more_information: Més informació
+      budget_list_item:
+        voting_finished: Has votat en aquest pressupost
+        voting_started: Has començat a votar en aquest pressupost
       budgets_list:
         cancel_order:
           more_than_one: eliminar el teu vot a %{name} i començar de nou
@@ -290,6 +293,9 @@ ca:
         success: El teu vot ha estat cancel·lat correctament
     resource_links:
       included_proposals:
-        project_proposal: 'Propostes incloses en aquest projecte:'
+        project_proposal: Propostes incloses en aquest projecte
+    statistics:
+      orders_count: Suports
+      projects_count: Projectes
   index:
     confirmed_orders_count: Recompte de vots

data/config/locales/cs.yml

@@ -6,7 +6,7 @@ cs:
         description: Popis
         title: Název
         total_budget: Celkový rozpočet
-        weight: Váha
+        weight: Pozice v řazení
       project:
         budget_amount: Částka rozpočtu
         decidim_category_id: Kategorie
@@ -110,6 +110,9 @@ cs:
         close_modal: Zavřít okno
         continue: Pokračovat
         more_information: Více informací
+      budget_list_item:
+        voting_finished: Hlasovali jste v tomto rozpočtu
+        voting_started: Začali jste hlasovat v tomto rozpočtu
       budgets_list:
         cancel_order:
           more_than_one: smažte svůj hlas na %{name} a začněte znovu
@@ -298,6 +301,9 @@ cs:
         success: Váš hlas byl úspěšně zrušen
     resource_links:
       included_proposals:
-        project_proposal: 'Návrhy zahrnuté do tohoto projektu:'
+        project_proposal: Návrhy zahrnuté do tohoto projektu
+    statistics:
+      orders_count: Podpory
+      projects_count: Projekty
   index:
     confirmed_orders_count: Počet hlasů

data/config/locales/de.yml

@@ -6,7 +6,7 @@ de:
         description: Beschreibung
         title: Titel
         total_budget: Gesamtbudget
-        weight: Gewichtung
+        weight: Bestellposition
       project:
         budget_amount: Höhe des Budgets
         decidim_category_id: Kategorie
@@ -108,6 +108,9 @@ de:
         close_modal: Dialog schließen
         continue: Weiter
         more_information: Mehr Informationen
+      budget_list_item:
+        voting_finished: Sie haben bei diesem Budget abgestimmt
+        voting_started: Sie haben damit begonnen, bei diesem Budget abzustimmen
       budgets_list:
         cancel_order:
           more_than_one: lösche deine Stimme am %{name} und beginne neu
@@ -290,6 +293,9 @@ de:
         success: Ihre Abstimmung wurde erfolgreich abgebrochen
     resource_links:
       included_proposals:
-        project_proposal: 'Vorschläge in diesem Projekt:'
+        project_proposal: Vorschläge in diesem Projekt
+    statistics:
+      orders_count: Projektauswahlen
+      projects_count: Projekte
   index:
     confirmed_orders_count: Stimmen zählen

data/config/locales/el.yml

@@ -158,8 +158,5 @@ el:
       destroy:
         error: Υπήρξε ένα πρόβλημα κατά την ακύρωση της ψήφου σας
         success: Η ψήφος σας ακυρώθηκε με επιτυχία
-    resource_links:
-      included_proposals:
-        project_proposal: 'Προτάσεις που περιλαμβάνονται σε αυτό το έργο:'
   index:
     confirmed_orders_count: Πλήθος ψήφων

data/config/locales/en.yml

@@ -7,7 +7,7 @@ en:
         description: Description
         title: Title
         total_budget: Total budget
-        weight: Weight
+        weight: Order position
       project:
         budget_amount: Budget amount
         decidim_category_id: Category
@@ -109,6 +109,9 @@ en:
         close_modal: Close modal
         continue: Continue
         more_information: More information
+      budget_list_item:
+        voting_finished: You have voted in this budget
+        voting_started: You have started to vote in this budget
       budgets_list:
         cancel_order:
           more_than_one: delete your vote on %{name} and start over
@@ -231,6 +234,7 @@ en:
     components:
       budgets:
         actions:
+          comment: Comment
           vote: Vote
         name: Budgets
         settings:
@@ -291,6 +295,9 @@ en:
         success: Your vote has been successfully canceled
     resource_links:
       included_proposals:
-        project_proposal: 'Proposals included in this project:'
+        project_proposal: Proposals included in this project
+    statistics:
+      orders_count: Supports
+      projects_count: Projects
   index:
     confirmed_orders_count: Votes count