decidim-budgets 0.27.10 → 0.28.0.rc4

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders metadata for an instance of a Project
+    class ProjectMetadataCell < Decidim::CardMetadataCell
+      include Decidim::Budgets::ProjectsHelper
+
+      delegate :selected?, to: :model
+
+      alias project model
+
+      def initialize(*)
+        super
+
+        @items.prepend(*project_items)
+      end
+
+      private
+
+      def project_items
+        [voted_item, category_item, scope_item, status_item]
+      end
+
+      def project_items_for_map
+        [voted_item_for_map, category_item, scope_item].compact_blank.map do |item|
+          {
+            text: item[:text].to_s.html_safe,
+            icon: item[:icon].present? ? icon(item[:icon]).html_safe : nil
+          }
+        end
+      end
+
+      def voted_item_for_map
+        {
+          text: "#{model.confirmed_orders_count} #{t("decidim.budgets.projects.project.votes", count: model.confirmed_orders_count)}",
+          icon: current_order_checked_out? && resource_added? ? "check-double-line" : "check-line"
+        }
+      end
+
+      def show_votes_count?
+        project.component.current_settings.show_votes?
+      end
+
+      def voted_item
+        return unless show_votes_count? && model.confirmed_orders_count.positive?
+
+        {
+          cell: "decidim/budgets/project_votes_count",
+          args: [model, { layout: :one_line }],
+          icon: current_order_checked_out? && resource_added? ? "check-double-line" : "check-line"
+        }
+      end
+
+      def status_item
+        return unless controller.try(:voting_finished?) && selected?
+
+        {
+          cell: "decidim/budgets/project_selected_status",
+          args: model,
+          icon: "question-line"
+        }
+      end
+
+      def current_order
+        @current_order ||= controller.try(:current_order)
+      end
+
+      def resource_added?
+        current_order && current_order.projects.include?(model)
+      end
+
+      def current_order_checked_out?
+        current_order&.checked_out?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Budgets
+    # This cell renders the Search (:s) project card
+    # for an instance of a Project
+    class ProjectSCell < Decidim::CardSCell
+      private
+
+      def resource_path
+        resource_locator([model.budget, model]).path
+      end
+
+      def metadata_cell
+        "decidim/budgets/project_metadata"
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 <%= content_tag :ul, class: tags_classes do %>
+  <%= icon "price-tag-3-line", class: "inline-block" %>
   <%= content_tag :li, link_to_category if category? %>
 
   <%= content_tag :li, link_to_scope if scope? %>

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

@@ -1,17 +1,23 @@
 <%= action_authorized_button_to "vote",
-      budget_order_line_item_path(model.budget, project_id: model),
-      method: vote_button_method,
-      remote: true,
-      class: "button tiny budget-list__action #{vote_button_class}",
-      id: "project-vote-button-#{model.id}",
-      data: {
-        add: !resource_added?,
-        disable: true,
-        budget: model.budget_amount,
-        allocation: resource_allocation,
-        "redirect-url": resource_path
-      },
-      disabled: vote_button_disabled?,
-      title: vote_button_label do %>
-  <%= icon(resource_added? ? "x" : "check", class: "icon--small", aria_label: vote_button_label, role: "img") %>
+                                budget_order_line_item_path(model.budget, project_id: model, show_only_added: options[:show_only_added]),
+                                method: vote_button_method,
+                                remote: true,
+                                class: "button w-full #{vote_button_classes}",
+                                id: "project-vote-button-#{model.id}",
+                                data: {
+                                  add: !resource_added?,
+                                  disable: true,
+                                  budget: model.budget_amount,
+                                  allocation: resource_allocation,
+                                  "redirect-url": resource_path
+                                },
+                                disabled: vote_button_disabled?,
+                                title: vote_button_label do %>
+  <% if resource_added? %>
+     <%= t("added", scope: "decidim.budgets.projects.project_budget_button") %>
+     <%= icon "checkbox-circle-line", class: "inline-block" %>
+  <% else %>
+     <%= t("add", scope: "decidim.budgets.projects.project_budget_button") %>
+     <%= icon "add-fill", class: "inline-block" %>
+  <% end %>
 <% end %>

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

@@ -4,7 +4,75 @@ module Decidim
   module Budgets
     # This cell renders an authorized_action button
     # to vote a given instance of a Project in a budget list
-    class ProjectVoteButtonCell < ProjectListItemCell
+    class ProjectVoteButtonCell < Decidim::ViewModel
+      include Decidim::ActionAuthorizationHelper
+      include Decidim::Budgets::ProjectsHelper
+      include Decidim::Budgets::Engine.routes.url_helpers
+
+      delegate :current_user, :current_order, :current_component, :can_have_order?, to: :parent_controller
+
+      private
+
+      def project_item?
+        options[:project_item]
+      end
+
+      def resource_path
+        resource_locator([model.budget, model]).path
+      end
+
+      def resource_title
+        translated_attribute model.title
+      end
+
+      def resource_added?
+        current_order && current_order.projects.include?(model)
+      end
+
+      def resource_allocation
+        current_order.allocation_for(model)
+      end
+
+      def vote_button_disabled?
+        current_user && !can_have_order?
+      end
+
+      def vote_button_classes
+        classes = []
+
+        classes << if resource_added?
+                     "success button__secondary budget-list__data--added"
+                   else
+                     "hollow button__transparent-secondary"
+                   end
+
+        classes << if project_item?
+                     "button__lg"
+                   else
+                     "button__sm"
+                   end
+
+        classes << "budget-list__action" unless vote_button_disabled?
+
+        classes.join(" ")
+      end
+
+      def vote_button_method
+        return :delete if resource_added?
+
+        :post
+      end
+
+      def vote_button_label
+        if resource_added?
+          return t(
+            "decidim.budgets.projects.project.remove",
+            resource_name: resource_title
+          )
+        end
+
+        t("decidim.budgets.projects.project.add", resource_name: resource_title)
+      end
     end
   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", "aria-hidden": true)
+        contents << icon("check-line", role: "img", "aria-hidden": true)
         contents << " "
         contents << t("decidim.budgets.projects.project.you_voted")
       end

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

@@ -6,7 +6,6 @@ module Decidim
     # Two possible layouts: One or two lines
     class ProjectVotesCountCell < Decidim::ViewModel
       include Decidim::IconHelper
-      delegate :show_votes_count?, to: :controller
 
       def show
         return unless show_votes_count?
@@ -16,22 +15,24 @@ module Decidim
 
       private
 
+      def show_votes_count?
+        model.component.current_settings.show_votes?
+      end
+
       def content
         if options[:layout] == :one_line
-          safe_join([model.confirmed_orders_count, " ", label(t("decidim.budgets.projects.project.votes",
-                                                                count: model.confirmed_orders_count))])
+          safe_join([model.confirmed_orders_count, " ", count_label])
         else
-          safe_join([number, label(t("decidim.budgets.projects.project.votes",
-                                     count: model.confirmed_orders_count))])
+          safe_join([number, count_label])
         end
       end
 
       def number
-        content_tag :div, model.confirmed_orders_count, class: "text-large"
+        content_tag :div, model.confirmed_orders_count
       end
 
-      def label(i18n_string)
-        content_tag :span, i18n_string, class: "text-uppercase text-small"
+      def count_label
+        content_tag(:span, t("decidim.budgets.projects.project.votes", count: model.confirmed_orders_count))
       end
 
       def css_class

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

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user creates a Project from the admin
       # panel.
       class CreateProject < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         def initialize(form)

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user changes a Project from the admin
       # panel.
       class UpdateProject < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         # Initializes an UpdateProject Command.
@@ -53,7 +52,7 @@ module Decidim
             title: form.title,
             description: form.description,
             budget_amount: form.budget_amount,
-            selected_at: selected_at,
+            selected_at:,
             address: form.address,
             latitude: form.latitude,
             longitude: form.longitude

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

@@ -45,7 +45,7 @@ module Decidim
 
         def update_project_scope(project)
           project.update!(
-            scope: scope
+            scope:
           )
         end
       end

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

@@ -47,7 +47,7 @@ module Decidim
         def update_project_selection(project)
           selected_at = selection ? Time.current : nil
           project.update!(
-            selected_at: selected_at
+            selected_at:
           )
         end
       end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class UpdateProjectsBudget < Decidim::Command
+        include TranslatableAttributes
+
+        # Public: Initializes the command.
+        #
+        # destination_budget - the destination budget for which the projects should update to.
+        # project_ids - the project ids to update.
+        def initialize(destination_budget, project_ids)
+          @destination_budget = destination_budget
+          @project_ids = project_ids
+          @response = { selection_name: "", successful: [], errored: [], failed_ids: [] }
+        end
+
+        def call
+          return broadcast(:invalid_project_ids) if @project_ids.blank?
+          return broadcast(:invalid_project_ids) if @destination_budget.blank?
+
+          update_projects_budget
+
+          broadcast(:update_projects_budget, @response)
+        end
+
+        private
+
+        attr_reader :selection, :project_ids
+
+        def update_projects_budget
+          ::Decidim::Budgets::Project.includes(:budget, budget: { component: :participatory_space }).where(id: project_ids).find_each do |project|
+            if update_allowed?(project)
+              transaction do
+                project.update!(
+                  decidim_budgets_budget_id: @destination_budget.id
+                )
+              end
+              @response[:successful] << translated_attribute(project.title)
+            else
+              @response[:errored] << translated_attribute(project.title)
+              @response[:failed_ids] << project.id
+            end
+          end
+        end
+
+        def update_allowed?(project)
+          origin_budget = project.budget
+          return false if origin_budget == @destination_budget
+
+          origin_budget.participatory_space == @destination_budget.participatory_space
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/budgets/admin/filterable.rb

@@ -39,7 +39,7 @@ module Decidim
             }
           end
 
-          # Can't user `super` here, because it does not belong to a superclass
+          # Cannot user `super` here, because it does not belong to a superclass
           # but to a concern.
           def dynamically_translated_filters
             [:scope_id_eq, :category_id_eq]

data/app/controllers/concerns/decidim/budgets/needs_current_order.rb

@@ -15,7 +15,7 @@ module Decidim
         #
         # Returns an Order.
         def current_order
-          @current_order ||= Order.includes(:projects).find_or_initialize_by(user: current_user, budget: budget)
+          @current_order ||= Order.includes(:projects).find_or_initialize_by(user: current_user, budget:)
         end
 
         def current_order=(order)
@@ -30,7 +30,7 @@ module Decidim
           current_user.present? &&
             voting_open? &&
             current_participatory_space.can_participate?(current_user) &&
-            allowed_to?(:create, :order, budget: budget, workflow: current_workflow)
+            allowed_to?(:create, :order, budget:, workflow: current_workflow)
         end
 
         # Return true if the user has voted the project

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

@@ -15,7 +15,7 @@ module Decidim
 
         def create
           enforce_permission_to :create, :budget
-          @form = form(BudgetForm).from_params(params, current_component: current_component)
+          @form = form(BudgetForm).from_params(params, current_component:)
 
           CreateBudget.call(@form) do
             on(:ok) do
@@ -31,13 +31,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :budget, budget: budget
+          enforce_permission_to(:update, :budget, budget:)
           @form = form(BudgetForm).from_model(budget)
         end
 
         def update
-          enforce_permission_to :update, :budget, budget: budget
-          @form = form(BudgetForm).from_params(params, current_component: current_component)
+          enforce_permission_to(:update, :budget, budget:)
+          @form = form(BudgetForm).from_params(params, current_component:)
 
           UpdateBudget.call(@form, budget) do
             on(:ok) do
@@ -53,7 +53,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :delete, :budget, budget: budget
+          enforce_permission_to(:delete, :budget, budget:)
 
           DestroyBudget.call(budget, current_user) do
             on(:ok) do

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

@@ -6,9 +6,9 @@ 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 if Decidim::Budgets.enable_proposal_linking
         include Decidim::Budgets::Admin::Filterable
         helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
+        helper Decidim::Budgets::ProjectsHelper
 
         helper_method :projects, :finished_orders, :pending_orders, :present, :project_ids
 
@@ -19,15 +19,14 @@ module Decidim
         def new
           enforce_permission_to :create, :project
           @form = form(ProjectForm).from_params(
-            { attachment: form(AttachmentForm).instance },
-            budget: budget
+            attachment: form(AttachmentForm).instance
           )
         end
 
         def create
           enforce_permission_to :create, :project
 
-          @form = form(ProjectForm).from_params(params, budget: budget)
+          @form = form(ProjectForm).from_params(params, budget:)
 
           CreateProject.call(@form) do
             on(:ok) do
@@ -43,14 +42,14 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :project, project: project
-          @form = form(ProjectForm).from_model(project, budget: budget)
+          enforce_permission_to(:update, :project, project:)
+          @form = form(ProjectForm).from_model(project)
           @form.attachment = form(AttachmentForm).instance
         end
 
         def update
-          enforce_permission_to :update, :project, project: project
-          @form = form(ProjectForm).from_params(params, budget: budget)
+          enforce_permission_to(:update, :project, project:)
+          @form = form(ProjectForm).from_params(params, budget:)
 
           UpdateProject.call(@form, project) do
             on(:ok) do
@@ -66,7 +65,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :destroy, :project, project: project
+          enforce_permission_to(:destroy, :project, project:)
 
           DestroyProject.call(project, current_user) do
             on(:ok) do
@@ -163,6 +162,25 @@ module Decidim
           end
         end
 
+        def update_budget
+          enforce_permission_to :update, :project, project: sample_project
+          ::Decidim::Budgets::Admin::UpdateProjectsBudget.call(reference_budget, project_ids) do
+            on(:invalid_project_ids) do
+              flash.now[:alert] = t("projects.update_budget.select_a_project", scope: "decidim.budgets.admin")
+            end
+
+            on(:update_projects_budget) do
+              moved_items(@response)
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :budget)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :budget)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-budget-change-projects", attribute_selector: "#selected_value", moved_items: } }
+          end
+        end
+
         private
 
         def projects
@@ -170,13 +188,19 @@ module Decidim
         end
 
         def orders
-          @orders ||= Order.where(budget: budget)
+          @orders ||= Order.where(budget:)
         end
 
         def project_ids
           @project_ids ||= params[:project_ids]
         end
 
+        def reference_budget
+          return unless params[:reference_id]
+
+          Budget.find(params[:reference_id])
+        end
+
         def pending_orders
           orders.pending
         end
@@ -185,6 +209,12 @@ module Decidim
           orders.finished
         end
 
+        def sample_project
+          return if project_ids.empty?
+
+          Decidim::Budgets::Project.find(project_ids.first)
+        end
+
         def project
           @project ||= projects.find(params[:id])
         end
@@ -202,6 +232,8 @@ module Decidim
             t("projects.update_category.success", scope: "decidim.budgets.admin", **interpolations)
           when :scope
             t("projects.update_scope.success", scope: "decidim.budgets.admin", **interpolations)
+          when :budget
+            t("projects.update_budget.success", scope: "decidim.budgets.admin", **interpolations)
           when :selected
             if extra[:selection]
               t("projects.update_selected.success.selected", scope: "decidim.budgets.admin", **interpolations)
@@ -224,6 +256,8 @@ module Decidim
             t("projects.update_category.invalid", scope: "decidim.budgets.admin", **interpolations)
           when :scope
             t("projects.update_scope.invalid", scope: "decidim.budgets.admin", **interpolations)
+          when :budget
+            t("projects.update_budget.invalid", scope: "decidim.budgets.admin", **interpolations)
           when :selected
             if extra[:selection]
               t("projects.update_selected.invalid.selected", scope: "decidim.budgets.admin", **interpolations)
@@ -232,6 +266,14 @@ module Decidim
             end
           end
         end
+
+        def moved_items(response = nil)
+          @moved_items ||= if response
+                             @project_ids - response[:failed_ids]
+                           else
+                             @project_ids
+                           end
+        end
       end
     end
   end

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

@@ -15,7 +15,7 @@ module Decidim
         def create
           enforce_permission_to :import_proposals, :projects
 
-          @form = form(Admin::ProjectImportProposalsForm).from_params(params, budget: budget)
+          @form = form(Admin::ProjectImportProposalsForm).from_params(params, budget:)
           Admin::ImportProposalsToBudgets.call(@form) do
             on(:ok) do |projects|
               flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.budgets.admin", number: projects.length)

data/app/controllers/decidim/budgets/application_controller.rb

@@ -22,10 +22,6 @@ module Decidim
         current_settings.votes == "finished"
       end
 
-      def show_votes_count?
-        current_settings.show_votes?
-      end
-
       private
 
       def workflow_name

data/app/controllers/decidim/budgets/budgets_controller.rb

@@ -4,6 +4,11 @@ module Decidim
   module Budgets
     # Exposes the budget resources so users can participate on them
     class BudgetsController < Decidim::Budgets::ApplicationController
+      helper_method :announcement_body
+
+      include Decidim::Budgets::Orderable
+      include Decidim::TranslatableAttributes
+
       def index
         redirect_to budget_projects_path(current_workflow.single) if current_workflow.single?
       end
@@ -16,6 +21,10 @@ module Decidim
 
       private
 
+      def announcement_body
+        @announcement_body ||= [translated_attribute(current_settings.announcement), translated_attribute(component_settings.announcement)].find(&:present?)&.html_safe
+      end
+
       def budget
         @budget ||= Budget.where(component: current_component).includes(:projects).find_by(id: params[:id])
       end