decidim-budgets 0.30.2 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf98a0370260000cd9211217fb78f77b92f1cc9a52c50b7681b01fc48b6375e
-  data.tar.gz: aa9846b0a0cfeae924b10b3b9ffd8c97645713ea5db922849fe8093fd8052f50
+  metadata.gz: 1f852affad4369e3d28a45187e0298f90f0cbaea28cf7a16dbdba276b4320e98
+  data.tar.gz: 393fd5e0272ec16d86f3c74ab7bbcba6188418c1ce877640b9ebc4aa5b73361f
 SHA512:
-  metadata.gz: 06b58dbf6582fc3bb58abc17c822435cfffe13907ff8fa0a952f26f4a64ba095d20658127c00650610211a9023982f64336ac895ea19625f89fdf309ed83636a
-  data.tar.gz: 52b0765bde954b92c6910e179e2c167791ac84aa1682b5a3e7e113ae6530a225c32641599a5f5c1528f373faa7eb007530d3ac073767107ba127f036a5a75419
+  metadata.gz: 0474a624715529696457175cd5f371f1bc9bee9ca1fa601a20fc286812ad3865c30332ed973dda35f242c4a8a19f18ae7f6b90f7948ba430f04eae107e220fe3
+  data.tar.gz: 4393b8036c89f0ee549193e50f75d4619247650f4b96143a497471ce2d2a656bf0dfbf3dec2ec41e63a13ef182b1e7f6310e3ab3145070d2c5bfd177aa3071a2

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

@@ -5,7 +5,16 @@
         <%= decidim_escape_translated(title) %>
       </h3>
       <% if voted? %>
-        <%= icon "check-double-line", class: "inline-block align-middle fill-success ml-2 h-[1.5em] w-[1.5em]" %>
+        <div class="float-right">
+          <%= icon "check-double-line", class: "inline-block align-middle fill-success ml-2 h-[1.5em] w-[1.5em]" %>
+          <span class="text-success font-bold"><%= t("completed", scope: "decidim.budgets.budgets_list") %></span>
+        </div>
+      <% end %>
+      <% if progress? %>
+        <div class="float-right">
+          <%= icon "progress-2-line", class: "inline-block align-middle fill-warning ml-2 h-[1.5em] w-[1.5em]" %>
+          <span class="text-warning font-bold"><%= t("incomplete", scope: "decidim.budgets.budgets_list") %></span>
+        </div>
       <% end %>
       <div class="my-2">
         <%= decidim_sanitize html_truncate(translated_attribute(description), length: 70) %>
@@ -24,20 +33,21 @@
       </div>
     <% end %>
   </div>
+
   <% if voting_context? %>
-    <%= link_to resource_path, class: "budget__card__highlight-vote" do %>
+    <%= link_to_resource_or_vote("budget__card__highlight-vote") do %>
       <div class="budget__card__highlight-vote__header">
-        <span class="budget__card__highlight-vote__text">
-          <%= t("name", scope: "decidim.budgets.admin.models.budget") %>
-        </span>
         <span class="budget__card__highlight-vote__number">
           <%= budget_to_currency(total_budget) %>
         </span>
       </div>
-      <%= button_tag class: "button button__sm #{button_class} #{voted? ? "button__transparent-secondary" : "button__secondary"} budget__card__highlight-vote__button" do %>
-        <span><%= button_text %></span>
-        <%= icon "arrow-right-line" %>
-      <% end %>
+
+      <div class="w-2/3 px-4">
+        <%= button_tag class: button_class do %>
+          <span><%= button_text %></span>
+          <%= icon "arrow-right-line" %>
+        <% end %>
+      </div>
     <% end %>
   <% end %>
 </div>

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

@@ -1,4 +1,4 @@
-<% if voted? %>
+<% if voted? && voting_open? %>
   <%= link_to(
         budget_order_path(budget),
         method: :delete,
@@ -6,7 +6,7 @@
         data: { confirm: t(:are_you_sure, scope: "decidim.budgets.projects.budget_summary") }
       ) do %>
       <%= icon "delete-bin-line", class: "inline-block align-middle text-gray fill-secondary" %>
-      <span class="inline-block align-middle underline text-secondary">
+      <span class="inline-block align-middle text-secondary font-semibold">
         <%= t("cancel_order", scope: "decidim.budgets.projects.budget_summary") %>
       </span>
   <% end %>

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

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::Budgets::ProjectsHelper
 
       delegate :highlighted, to: :current_workflow
+      delegate :voting_finished?, to: :controller
 
       property :title, :description, :total_budget
       alias budget model
@@ -14,13 +15,12 @@ module Decidim
       private
 
       def card_class
-        ["card--list__item"].tap do |list|
-          unless voting_finished?
-            list << "card--list__data-added" if voted?
-            list << "card--list__data-progress" if progress?
-          end
-          list << "budget--highlighted" if highlighted?
-        end.join(" ")
+        css_classes = "card--list__item"
+        css_classes += " budget__card__list-budget--highlighted" if highlighted?
+        css_classes += " budget__card__list-budget--progress" if progress?
+        css_classes += " budget__card__list-budget--voted" if voted?
+
+        css_classes
       end
 
       def link_class
@@ -32,7 +32,7 @@ module Decidim
       end
 
       def progress?
-        current_user && status == :progress
+        current_user && status == :progress && voting_open?
       end
 
       def highlighted?
@@ -43,12 +43,38 @@ module Decidim
         @status ||= current_workflow.status(budget)
       end
 
+      # If the voting is open, then do the link for the authorized focus mode
+      # If not (i.e. voting is disabled or finished), then link to the resource itself
+      def link_to_resource_or_vote(css_class)
+        if voting_open?
+          action_authorized_link_to "vote",
+                                    budget_projects_path(budget, start_voting: true),
+                                    resource: budget,
+                                    data: { "redirect-url": budget_projects_path(budget) },
+                                    class: css_class do
+            yield
+          end
+        else
+          link_to resource_path, class: css_class do
+            yield
+          end
+        end
+      end
+
       def button_class
-        "hollow" if voted? || !highlighted?
+        css_classes = "button button__sm w-full budget__card__highlight-vote__button "
+        css_classes += voted? ? "button__transparent-secondary" : "button__secondary"
+        css_classes += " hollow" if voted? || !highlighted?
+
+        css_classes
       end
 
       def button_text
-        key = if current_workflow.vote_allowed?(budget) && !voted?
+        key = if voting_disabled?
+                :see_projects
+              elsif voting_finished?
+                :see_results
+              elsif voting_allowed? && !voted?
                 progress? ? :progress : :vote
               else
                 :show
@@ -75,6 +101,14 @@ module Decidim
         @component ||= controller.try(:current_component) || budget.component
       end
 
+      def voting_disabled?
+        current_settings.votes == "disabled"
+      end
+
+      def voting_allowed?
+        current_workflow.vote_allowed?(budget)
+      end
+
       def voting_context?
         controller.respond_to?(:voting_finished?)
       end

data/app/cells/decidim/budgets/budgets_list/card_list.erb

@@ -4,8 +4,6 @@
   <% end %>
 <% end %>
 
-<% non_highlighted = reorder(budgets).where.not(id: (highlighted + voted).map(&:id)) %>
-
 <% if non_highlighted.exists? %>
   <% non_highlighted.each do |budget| %>
     <%= cell("decidim/budgets/budget_list_item", budget) %>

data/app/cells/decidim/budgets/budgets_list/main_list.erb

@@ -1,5 +1,5 @@
-<h2 class="h5 md:h3 decorator"><%= t(:count, scope: i18n_scope, count: budgets.length) %></h2>
+<h2 class="h5 md:h3 decorator"><%= t(:count, scope: i18n_scope, count: (highlighted + non_highlighted).length) %></h2>
 
-  <%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.budgets_list.orders", css_class: "items-start ml-6", b_css_class: "!justify-start pb-0 pl-0" } %>
+<%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.budgets_list.orders", css_class: "items-start ml-6", b_css_class: "!justify-start pb-0 pl-0" } %>
 
 <%= render :card_list %>

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

@@ -1,12 +1,12 @@
-<% if !voting_finished? && voted? %>
-  <h2 class="h5 md:h3 decorator mb-8">
+<% if voted? || progress? %>
+  <h2 class="h5 md:h3 decorator">
     <%= t("voted_budgets", scope: "decidim.budgets.budgets_list") %>
   </h2>
 
   <%= render :voted %>
 <% end %>
 
-<% if budgets.where.not(id: voted.map(&:id)).exists? %>
+<% if non_voted_budgets.any? %>
   <div id="budgets" class="card__list-list !space-y-5 w-full">
     <%= main_list %>
   </div>

data/app/cells/decidim/budgets/budgets_list/voted.erb

@@ -1,13 +1,15 @@
-<% if voted? %>
-  <p><%= t(:voted_on, scope: i18n_scope, links: budgets_link_list(voted)) %></p>
+<p><%= t(:voted_on, scope: i18n_scope, links: budgets_link_list(voted)) %></p>
 
-  <div id="voted-budgets" class="card__list-list">
-    <% voted.each do |budget| %>
-      <%= cell("decidim/budgets/budget_list_item", budget) %>
-    <% end %>
-  </div>
+<% if finished? %>
+  <%= cell("decidim/announcement", { body: t(:finished_message, scope: i18n_scope) }, callout_class: "success w-full") %>
+<% end %>
 
-  <% if finished? %>
-    <p><%= t(:finished_message, scope: i18n_scope) %></p>
+<div id="voted-budgets" class="card__list-list w-full">
+  <% voted.each do |budget| %>
+    <%= cell("decidim/budgets/budget_list_item", budget) %>
   <% end %>
-<% end %>
+
+  <% progress_budgets.each do |budget| %>
+    <%= cell("decidim/budgets/budget_list_item", budget) %>
+  <% end %>
+</div>

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

@@ -26,6 +26,18 @@ module Decidim
 
       private
 
+      def progress?
+        current_user && voting_open? && progress_budgets.any?
+      end
+
+      def progress_budgets
+        budgets.select { |budget| current_workflow.status(budget) == :progress }
+      end
+
+      def non_voted_budgets
+        budgets.where.not(id: voted.map(&:id))
+      end
+
       def highlighted?
         current_user && highlighted.any?
       end
@@ -34,6 +46,16 @@ module Decidim
         current_user && voted.any?
       end
 
+      def non_highlighted
+        budgets_to_exclude = if voting_finished?
+                               highlighted + voted
+                             else
+                               highlighted + voted + progress_budgets
+                             end
+
+        reorder(budgets).where.not(id: budgets_to_exclude.map(&:id))
+      end
+
       def finished?
         return unless budgets.any?
 

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders the project budget amount
+    class ProjectBudgetAmountCell < Decidim::ViewModel
+      delegate :voting_finished?, to: :controller
+
+      def show
+        budget_to_currency(model.budget_amount)
+      end
+    end
+  end
+end

data/app/cells/decidim/budgets/project_l/extra_data.erb

@@ -1,6 +1,12 @@
 <div class="budget__card__list-project">
   <span class="budget__card__list-project__amount">
-    <%= budget_to_currency(project.budget_amount) %>
+    <% if show_votes_count? %>
+      <%= cell "decidim/budgets/project_votes_count", project, layout: :with_count_label %>
+    <% else %>
+      <%= budget_to_currency_with_html(project.budget_amount) %>
+    <% end %>
   </span>
-  <%= cell("decidim/budgets/project_vote_button", project, show_only_added:) %>
+  <% if voting_open? %>
+    <%= cell("decidim/budgets/project_vote_button", project, show_only_added:) %>
+  <% end %>
 </div>

data/app/cells/decidim/budgets/project_l/metadata.erb

@@ -1,4 +1,4 @@
 <div class="card__list-metadata">
   <%= cell metadata_cell, project %>
 </div>
-<%= cell("decidim/budgets/project_voted_hint", project, class: "margin-left-1") if current_order_checked_out? && resource_added? %>
+<%= cell("decidim/budgets/project_voted_hint", project, class: "margin-left-1") if current_order_checked_out? && resource_added?(project) %>

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

@@ -9,6 +9,8 @@ module Decidim
     class ProjectLCell < Decidim::CardLCell
       include Decidim::Budgets::ProjectsHelper
 
+      delegate :voting_open?, :resource_added?, to: :controller
+
       alias project model
 
       private
@@ -17,10 +19,6 @@ module Decidim
         resource_locator([project.budget, project]).path(url_extra_params)
       end
 
-      def resource_added?
-        current_order && current_order.projects.include?(model)
-      end
-
       def current_order
         @current_order ||= controller.try(:current_order)
       end

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

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::Budgets::ProjectsHelper
 
       delegate :selected?, to: :model
+      delegate :show_votes_count?, :resource_added?, to: :controller
 
       alias project model
 
@@ -19,7 +20,7 @@ module Decidim
       private
 
       def project_items
-        [voted_item] + taxonomy_items + [status_item]
+        [status_item] + taxonomy_items + [budget_amount]
       end
 
       def items_for_map
@@ -34,31 +35,26 @@ module Decidim
       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"
+          icon: current_order_checked_out? && resource_added?(model) ? "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?
+      def status_item
+        return unless controller.try(:voting_finished?) && selected?
 
         {
-          cell: "decidim/budgets/project_votes_count",
-          args: [model, { layout: :one_line }],
-          icon: current_order_checked_out? && resource_added? ? "check-double-line" : "check-line"
+          cell: "decidim/budgets/project_selected_status",
+          args: model
         }
       end
 
-      def status_item
-        return unless controller.try(:voting_finished?) && selected?
+      def budget_amount
+        return unless show_votes_count?
 
         {
-          cell: "decidim/budgets/project_selected_status",
+          cell: "decidim/budgets/project_budget_amount",
           args: model,
-          icon: "question-line"
+          icon: "coin-line"
         }
       end
 
@@ -66,10 +62,6 @@ module Decidim
         @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

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

@@ -8,21 +8,11 @@ module Decidim
 
       def show
         if voting_finished? && model.selected?
-          content_tag :span, class: css_class do
+          content_tag :span, class: "label success" do
             t("decidim.budgets.projects.project.selected")
           end
         end
       end
-
-      private
-
-      def css_class
-        if options[:as_label] == true
-          "success label project-status"
-        else
-          "success card__text--status"
-        end
-      end
     end
   end
 end

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

@@ -2,20 +2,20 @@
                                 budget_order_line_item_path(model.budget, project_id: model, show_only_added: options[:show_only_added]),
                                 method: vote_button_method,
                                 remote: true,
-                                resource: model,
+                                resource: model.budget,
                                 class: "button #{vote_button_classes}",
                                 id: "project-vote-button-#{model.id}",
                                 data: {
-                                  add: !resource_added?,
+                                  add: !resource_added?(model),
                                   disable: true,
                                   budget: model.budget_amount,
                                   allocation: resource_allocation,
-                                  "redirect-url": resource_path,
-                                  onboarding_redirect_path: resource_index_path
+                                  "redirect-url": authorization_redirect_path,
+                                  onboarding_redirect_path: authorization_redirect_path
                                 },
                                 disabled: vote_button_disabled?,
                                 title: vote_button_label do %>
-  <% if resource_added? %>
+  <% if resource_added?(model) %>
      <%= t("added", scope: "decidim.budgets.projects.project_budget_button") %>
      <%= icon "checkbox-circle-line", class: "inline-block" %>
   <% else %>

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

@@ -8,7 +8,7 @@ module Decidim
       include Decidim::Budgets::ProjectsHelper
       include Decidim::Budgets::Engine.routes.url_helpers
 
-      delegate :current_user, :current_order, :current_component, :can_have_order?, to: :parent_controller
+      delegate :current_user, :current_order, :current_component, :can_have_order?, :resource_added?, to: :parent_controller
 
       private
 
@@ -16,6 +16,10 @@ module Decidim
         options[:project_item]
       end
 
+      def button_extra_classes
+        options[:button_extra_classes] || []
+      end
+
       def resource_path
         resource_locator([model.budget, model]).path
       end
@@ -28,10 +32,6 @@ module Decidim
         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
@@ -41,9 +41,9 @@ module Decidim
       end
 
       def vote_button_classes
-        classes = []
+        classes = ["xl:w-40"]
 
-        classes << if resource_added?
+        classes << if resource_added?(model)
                      "success button__secondary budget-list__data--added"
                    else
                      "hollow button__transparent-secondary"
@@ -56,18 +56,23 @@ module Decidim
                    end
 
         classes << "budget-list__action" unless vote_button_disabled?
+        classes << button_extra_classes
 
         classes.join(" ")
       end
 
       def vote_button_method
-        return :delete if resource_added?
+        return :delete if resource_added?(model)
 
         :post
       end
 
+      def authorization_redirect_path
+        budget_projects_path(budget, start_voting: true)
+      end
+
       def vote_button_label
-        if resource_added?
+        if resource_added?(model)
           return t(
             "decidim.budgets.projects.project.remove",
             resource_name: resource_title

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

@@ -3,25 +3,25 @@
 module Decidim
   module Budgets
     # This cell renders the vote count.
-    # Two possible layouts: One or two lines
+    # Two possible layouts:
+    # - with the count label ("0 votes", "1 vote", "999 votes")
+    # - without the count label ("0", "1", "999")
     class ProjectVotesCountCell < Decidim::ViewModel
+      delegate :show_votes_count?, to: :controller
+
       def show
         return unless show_votes_count?
 
-        content_tag :span, content, class: css_class
+        content
       end
 
       private
 
-      def show_votes_count?
-        model.component.current_settings.show_votes?
-      end
-
       def content
-        if options[:layout] == :one_line
+        if options[:layout] == :with_count_label
           safe_join([model.confirmed_orders_count, " ", count_label])
         else
-          safe_join([number, count_label])
+          number
         end
       end
 
@@ -32,12 +32,6 @@ module Decidim
       def count_label
         content_tag(:span, t("decidim.budgets.projects.project.votes", count: model.confirmed_orders_count))
       end
-
-      def css_class
-        css = ["project-votes"]
-        css << options[:class] if options[:class]
-        css.join(" ")
-      end
     end
   end
 end

data/app/commands/decidim/budgets/cancel_order.rb

@@ -19,6 +19,7 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if invalid_order?
+        return broadcast(:invalid) unless voting_open?
 
         cancel_order!
         broadcast(:ok, @order)
@@ -33,6 +34,10 @@ module Decidim
       def cancel_order!
         @order.destroy!
       end
+
+      def voting_open?
+        @order.budget.component.current_settings.votes == "enabled"
+      end
     end
   end
 end

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

@@ -26,7 +26,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end
@@ -48,7 +48,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end

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

@@ -39,7 +39,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end
@@ -62,7 +62,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
-              render action: "edit"
+              render action: "edit", status: :unprocessable_entity
             end
           end
         end

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

@@ -24,7 +24,7 @@ module Decidim
 
             on(:invalid) do
               flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
-              render action: "new"
+              render action: "new", status: :unprocessable_entity
             end
           end
         end

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

@@ -8,7 +8,7 @@ module Decidim
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      helper_method :current_workflow, :voting_finished?, :voting_open?
+      helper_method :current_workflow, :voting_finished?, :voting_open?, :show_votes_count?
 
       def current_workflow
         @current_workflow ||= Decidim::Budgets.workflows[workflow_name].new(current_component, current_user)
@@ -22,11 +22,23 @@ module Decidim
         current_settings.votes == "finished"
       end
 
+      def show_votes_count?
+        current_settings.show_votes?
+      end
+
+      def resource_added?(project)
+        current_order && current_order.projects.include?(project)
+      end
+
       private
 
       def workflow_name
         @workflow_name ||= current_component.settings.workflow.to_sym
       end
+
+      def set_focus_mode_if_voting_open
+        @focus_mode = true if voting_open?
+      end
     end
   end
 end