decidim-budgets 0.27.9 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a5590dd1ff0443a745a9da5bf8fa946a8f8f525834d168eef4424de48a5d26
-  data.tar.gz: 42524da9525237fbc73e4a5eb0b3daead7ddd80032cb029f5c2695a4d361d20c
+  metadata.gz: 040e6569d57ec31a084de567cf3745c278b1e871b4b65c1f6c74193b25a5869a
+  data.tar.gz: 6fef0d93ae7c58c114c7f2ca7c04d266a870828055baf00be01640088d932012
 SHA512:
-  metadata.gz: '020788c513d9936c7273100823f7c7043f9db48b1035618ace11477de2ecd9f37b8acd47d016385e8db66e2dd188c78306cd0bbac4f818a4e55e7d7f25436f8e'
-  data.tar.gz: 35cefdc0f73f6fd9a01adcf8e533ce3a71da229a796e859577bb59467f8625733f1e4a95387890eb2a13f62590598c6d22852b50c9063c0f17c49ffe43f3be0e
+  metadata.gz: dbbc7b01a81c4c170850e8a2513b231eb3b5b66b6870af26776f0520810cd86cd63b8f1dc200f47d00d11101107ffed28870d09faae190b8365c37d1295c9d95
+  data.tar.gz: dc79f3ccf7dcd1a986ab3916370959459e61245ceff5f69c732bd5fba6060d8cfb1291a6d99ae3445107d02d442c7a7261a7b09ccf1b089f5653b68187098bbf

data/README.md

@@ -30,7 +30,7 @@ bundle
 
 ## Budget Workflows
 
-A budget workflow, let's an admin pick, at the component level, how a user can participate in it.
+A budget workflow, lets an admin pick, at the component level, how a user can participate in it.
 By default there are two workflows included in this module, `:one` and `:all` that can be found in the `lib/decidim/budgets/workflows/` directory, any app can add its own workflow.
 
 ### Adding a custom workflow

data/app/assets/stylesheets/decidim/budgets/budget/_budget-vote-button.scss

@@ -1,20 +1,20 @@
-.budget-vote-button.expanded{
+.budget-vote-button.expanded {
   display: flex;
   text-align: left;
   justify-content: space-between;
   align-items: center;
 
-  span{
+  span {
     font-size: 1rem;
   }
 
-  &.added{
+  &.added {
     background-color: tint($success, 80%);
     color: $body-font-color;
   }
 
-  &:not(.added){
-    .budget-list__action{
+  &:not(.added) {
+    .budget-list__action {
       border-color: white;
       color: white;
     }

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

@@ -13,7 +13,7 @@ module Decidim
       delegate :settings, to: :current_component
 
       def budgets_link_list(budgets)
-        budgets.map { |budget| link_to(decidim_escape_translated(budget.title), resource_locator(budget).path) }
+        budgets.map { |budget| link_to(translated_attribute(budget.title), resource_locator(budget).path) }
                .to_sentence
                .html_safe
       end

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

@@ -14,7 +14,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/budgets/budget_m"
+        case @options[:size]
+        when :s
+          "decidim/budgets/budget_s"
+        else
+          "decidim/budgets/budget_list_item"
+        end
       end
     end
   end

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

@@ -1,28 +1,16 @@
-<button class="link" data-open="budget-modal-info" aria-controls="budget-modal-info" aria-haspopup="dialog" tabindex="0">
-  <%= t(:more_information, scope: i18n_scope) %>
-</button>
-
-<div class="reveal" data-reveal id="budget-modal-info" aria-modal="true" aria-labelledby="budget-modal-info-label">
-  <div class="reveal__header">
-    <h3 id="budget-modal-info-label" class="reveal__title"><%= decidim_sanitize(component_name) %></h3>
-    <button class="close-button" data-close aria-label="<%= t(:close_modal, scope: i18n_scope) %>" type="button">
-      <span aria-hidden="true">×</span>
-    </button>
-  </div>
-
-  <%= content_tag(:p, more_information) if more_information %>
-
-  <% unless current_workflow.single? %>
-    <p>
-      <%= link_to t(:back_to, scope: i18n_scope, component_name: component_name), budgets_path %>
+<%= decidim_modal id: "budget-modal-info" do %>
+  <div data-dialog-container>
+    <%= icon "information-line" %>
+    <h3 class="h3" id="dialog-title-budget-modal-info" tabindex="-1" data-dialog-title>
+      <%= decidim_sanitize(component_name) %>
+    </h3>
+    <p id="dialog-desc-budget-modal-info">
+      <%= content_tag(:p, more_information) if more_information %>
     </p>
-  <% end %>
-
-  <div class="row">
-    <div class="columns medium-8 medium-offset-2">
-      <button class="button expanded" data-close>
-        <%= t(:continue, scope: i18n_scope) %>
-      </button>
-    </div>
   </div>
-</div>
+  <div data-dialog-actions>
+    <button class="button button__sm md:button__lg button__secondary" data-dialog-close="budget-modal-info">
+      <%= t("continue", scope: "decidim.budgets.budget_information_modal") %>
+    </button>
+  </div>
+<% end %>

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

@@ -0,0 +1,6 @@
+<div class="inline-block pr-4">
+  <%= icon "git-pull-request-line", class: "text-gray fill-current inline-block" , aria_label: t("activerecord.models.decidim/budgets/project", count: 1) %>
+  <span class="text-sm">
+    <%= t(:projects_count, scope: "decidim.budgets.projects.count", count: budget.projects.size) %>
+  </span>
+</div>

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

@@ -1,38 +1,43 @@
-<div class="<%= card_class %> budget-list__item budget-list__item-cell">
-  <div class="budget-list__text flex-horizontal">
-    <%= link_to budget_path(budget), class: link_class do %>
-      <h3 class="card--list__heading">
-        <%= decidim_escape_translated(title) %>
+<div class="<%= card_class %> card__highlight">
+  <div class="card__highlight-text md:w-[70%] p-0">
+    <%= link_to resource_path, class: "p-4" do %>
+      <h3 class="h3 text-secondary inline-block align-middle">
+        <%= translated_attribute(title) %>
       </h3>
+      <% if voted? %>
+        <%= icon "check-double-line", class: "inline-block align-middle fill-success ml-2 h-[1.5em] w-[1.5em]" %>
+      <% end %>
+      <div class="my-2">
+        <%= decidim_sanitize html_truncate(translated_attribute(description), length: 70) %>
+      </div>
+      <% unless voted? %>
+        <div class="divide-x-2 divide-gray-3">
+          <%= render :projects_count %>
+          <%= render :vote_action if voting_context? %>
+        </div>
+      <% end %>
+    <% end %>
+    <% if voted? %>
+      <div class="divide-x-2 divide-gray-3 p-4 pt-0">
+        <%= render :projects_count %>
+        <%= render :vote_action if voting_context? %>
+      </div>
     <% end %>
-
-    <div class="heading5">
-      <strong>
-        <%= budget_to_currency(total_budget) %>
-      </strong>
-    </div>
-
-    <%= decidim_sanitize html_truncate(translated_attribute(description), length: 140) %>
   </div>
-
-  <% if !voting_finished? %>
-    <div class="budget-list__icon mr-s">
-      <% if voted? %>
-        <span class="button tiny success card--list__check card--list__check--disabled card--list__check--inline">
-          <%= icon "check", class: "icon--small", role: "img", aria_label: t("decidim.budgets.budget_list_item.voting_finished") %>
+  <% if voting_context? %>
+    <%= link_to resource_path, class: "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>
-      <% elsif progress? %>
-        <span class="button tiny warning card--list__check card--list__check--disabled card--list__check--inline">
-          <%= icon "bookmark", class: "icon--small", role: "img", aria_label: t("decidim.budgets.budget_list_item.voting_started") %>
+        <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>
-  <% end %>
-
-  <div class="budget-list__data">
-    <%= link_to budget_path(budget), class: "button button--sc expanded #{button_class} mb-none" do %>
-      <span><%= button_text %></span>
-      <%= icon "chevron-right", class: "icon--small", role: "img" %>
     <% end %>
-  </div>
+  <% end %>
 </div>

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

@@ -0,0 +1,13 @@
+<% if voted? %>
+  <%= link_to(
+        budget_order_path(budget),
+        method: :delete,
+        class: "pl-4",
+        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-current" %>
+      <span class="inline-block align-middle underline text-alert">
+        <%= t("cancel_order", scope: "decidim.budgets.projects.budget_summary") %>
+      </span>
+  <% end %>
+<% end %>

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

@@ -9,7 +9,6 @@ module Decidim
       include ActiveSupport::NumberHelper
       include Decidim::Budgets::ProjectsHelper
 
-      delegate :voting_finished?, to: :controller
       delegate :highlighted, to: :current_workflow
 
       property :title, :description, :total_budget
@@ -64,6 +63,30 @@ module Decidim
       def i18n_scope
         "decidim.budgets.budgets_list"
       end
+
+      def resource_path
+        resource_locator(budget).path
+      end
+
+      def current_workflow
+        @current_workflow ||=
+          controller.try(:current_workflow) ||
+          Decidim::Budgets.workflows[component.settings.workflow.to_sym].new(component, current_user)
+      end
+
+      def component
+        @component ||= controller.try(:current_component) || budget.component
+      end
+
+      def voting_context?
+        controller.respond_to?(:voting_finished?)
+      end
+
+      def voting_finished?
+        return unless voting_context?
+
+        controller.voting_finished?
+      end
     end
   end
 end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders metadata for an instance of a budget
+    class BudgetMetadataCell < Decidim::CardMetadataCell
+      alias budget model
+
+      def initialize(*)
+        super
+
+        @items.prepend(*budget_items)
+      end
+
+      private
+
+      def budget_items
+        [project_count]
+      end
+
+      def project_count
+        {
+          text: t(:projects_count, scope: "decidim.budgets.projects.count", count: budget.projects.size),
+          icon: "git-pull-request-line"
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders the Search (:s) budget card
+    # for a given instance of a Budget
+    class BudgetSCell < Decidim::CardSCell
+      private
+
+      def metadata_cell
+        "decidim/budgets/budget_metadata"
+      end
+    end
+  end
+end

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

@@ -1,7 +1,3 @@
-<div class="row">
-  <div class="columns medium-7 mediumlarge-8">
-    <div class="section">
-      <%= decidim_sanitize_editor_admin(landing_page_content) %>
-    </div>
-  </div>
+<div class="editor-content">
+  <%= decidim_sanitize_editor_admin(landing_page_content) %>
 </div>

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

@@ -1,18 +1,13 @@
-<%# show highlighted budgets first %>
 <% if highlighted.any? %>
-  <div id="highlighted-budgets" class="card card--list budget-list">
-    <% highlighted.each do |budget| %>
-      <%= cell("decidim/budgets/budget_list_item", budget) %>
-    <% end %>
-  </div>
+  <% reordered_highlighted_budgets.each do |budget| %>
+    <%= cell("decidim/budgets/budget_list_item", budget) %>
+  <% end %>
 <% end %>
 
-<% non_highlighted = (budgets - highlighted - voted) %>
+<% non_highlighted = reorder(budgets).where.not(id: (highlighted + voted).map(&:id)) %>
 
-<% if non_highlighted.any? %>
-  <div id="budgets" class="card card--list budget-list">
-    <% non_highlighted.each do |budget| %>
-      <%= cell("decidim/budgets/budget_list_item", budget) %>
-    <% end %>
-  </div>
+<% if non_highlighted.exists? %>
+  <% non_highlighted.each do |budget| %>
+    <%= cell("decidim/budgets/budget_list_item", budget) %>
+  <% end %>
 <% end %>

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

@@ -0,0 +1,5 @@
+<h2 class="h5 md:h3 decorator"><%= t(:count, scope: i18n_scope, count: budgets.length) %></h2>
+
+<%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.projects.orders" } %>
+
+<%= render :card_list %>

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

@@ -1,19 +1,15 @@
-<div class="row">
-  <div class="columns medium-7 mediumlarge-8">
-    <% if !voting_finished? && (voted?) %>
-      <div class="section">
-        <h2 class="section-heading">
-          <%= t(:my_budgets, scope: i18n_scope) %>
-        </h2>
+<% if !voting_finished? && voted? %>
+  <h2 class="h5 md:h3 decorator mb-8">
+    <%= t("voted_budgets", scope: "decidim.budgets.budgets_list") %>
+  </h2>
 
-        <%= render :voted %>
-      </div>
-    <% end %>
+  <%= render :voted %>
+<% end %>
 
-    <div class="row">
-      <div class="columns mediumlarge-12">
-        <%= render :card_list %>
-      </div>
-    </div>
+<% if budgets.where.not(id: voted.map(&:id)).exists? %>
+  <div id="budgets" class="card__list-list">
+    <%= main_list %>
   </div>
-</div>
+<% end %>
+
+<%= decidim_paginate budget_paginate %>

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

@@ -1,49 +1,13 @@
 <% if voted? %>
-  <div id="voted-budgets">
-    <p class="lead">
-      <%= 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-list" class="card card--list budget-list">
-      <% voted.each do |budget| %>
-        <%= cell("decidim/budgets/budget_list_item", budget) %>
-      <% end %>
-    </div>
-
-    <% if finished? %>
-      <p class="lead">
-        <%= t(:finished_message, scope: i18n_scope) %>
-      </p>
-    <% end %>
-
-    <% if voting_open? %>
-      <div>
-        <p>
-          <%= t(:if_change_opinion, scope: i18n_scope) %>
-          <%= link_to(
-          t("cancel_order.only_one", scope: i18n_scope),
-          budget_order_path(voted.first),
-          method: :delete,
-          data: { confirm: t("projects.budget_summary.are_you_sure", scope: "decidim.budgets") }) if voted.one? %>
-        </p>
-
-        <% if !voted.one? && voted.any? %>
-          <ul>
-            <% voted.each do |budget| %>
-              <li>
-                <%= link_to(
-                            t("cancel_order.more_than_one", scope: i18n_scope, name: decidim_escape_translated(budget.title)),
-                            budget_order_path(budget),
-                            method: :delete,
-                            class: "cancel-order",
-                            data: {
-                              confirm: t("projects.budget_summary.are_you_sure", scope: "decidim.budgets")
-                            }) %>
-              </li>
-            <% end %>
-          </ul>
-        <% end %>
-      </div>
+  <div id="voted-budgets" class="card__list-list">
+    <% voted.each do |budget| %>
+      <%= cell("decidim/budgets/budget_list_item", budget) %>
     <% end %>
   </div>
+
+  <% if finished? %>
+    <p><%= t(:finished_message, scope: i18n_scope) %></p>
+  <% end %>
 <% end %>

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

@@ -4,6 +4,13 @@ module Decidim
   module Budgets
     # This cell renders the budgets list of a Budget component
     class BudgetsListCell < BaseCell
+      AVAILABLE_ORDERS = %w(random highest_cost lowest_cost).freeze
+
+      include Decidim::CellsPaginateHelper
+      include Decidim::OrdersHelper
+      include Decidim::Orderable
+      include Cell::ViewModel::Partial
+
       alias current_workflow model
 
       delegate :allowed, :budgets, :highlighted, :voted, to: :current_workflow
@@ -15,6 +22,8 @@ module Decidim
         render
       end
 
+      def main_list = render
+
       private
 
       def highlighted?
@@ -34,6 +43,31 @@ module Decidim
       def i18n_scope
         "decidim.budgets.budgets_list"
       end
+
+      def budget_paginate
+        @budget_paginate ||= Kaminari.paginate_array(budgets).page(params[:page]).per(10)
+      end
+
+      def reordered_highlighted_budgets
+        return highlighted if highlighted.length < 2
+
+        reorder(budgets.where(id: highlighted.map(&:id)))
+      end
+
+      def reorder(budgets)
+        case order
+        when "highest_cost"
+          budgets.order(total_budget: :desc)
+        when "lowest_cost"
+          budgets.order(total_budget: :asc)
+        when "random"
+          budgets.order_randomly(random_seed)
+        else
+          budgets
+        end
+      end
+
+      def available_orders = AVAILABLE_ORDERS
     end
   end
 end

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

@@ -0,0 +1,3 @@
+<section class="layout-main__section">
+  <%= cell("decidim/announcement", announcement_message, callout_class: "warning") %>
+</section>

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

@@ -2,14 +2,14 @@
 
 module Decidim
   module Budgets
-    # This cell renders information when current user can't create more budgets orders.
+    # This cell renders information when current user cannot create more budgets orders.
     class LimitAnnouncementCell < BaseCell
       alias budget model
       delegate :voted?, :vote_allowed?, :discardable, :limit_reached?, to: :current_workflow
       delegate :voting_open?, to: :controller
 
       def show
-        cell("decidim/announcement", announcement_message, callout_class: "warning") if announce?
+        render if announce?
       end
 
       private

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

@@ -5,10 +5,7 @@ module Decidim
     # A cell to display when actions happen on an order.
     class OrderActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.budgets.last_activity.new_vote_at_html",
-          link: participatory_space_link
-        )
+        I18n.t("decidim.budgets.last_activity.new_vote_at")
       end
 
       def resource_link_path

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

@@ -14,7 +14,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/budgets/project_m"
+        case @options[:size]
+        when :s
+          "decidim/budgets/project_s"
+        else
+          "decidim/budgets/project_l"
+        end
       end
     end
   end

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

@@ -0,0 +1,6 @@
+<div class="budget__card__list-project">
+  <span class="budget__card__list-project__amount">
+    <%= budget_to_currency(project.budget_amount) %>
+  </span>
+  <%= cell("decidim/budgets/project_vote_button", project, show_only_added:) %>
+</div>

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

@@ -0,0 +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? %>

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Budgets
+    # This cell renders the List (:l) project card
+    # for an instance of a Project
+    class ProjectLCell < Decidim::CardLCell
+      include ActiveSupport::NumberHelper
+      include Decidim::Budgets::ProjectsHelper
+
+      alias project model
+
+      private
+
+      def resource_path
+        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
+
+      def show_only_added
+        options[:show_only_added]
+      end
+
+      def resource_id = "project-#{project.id}-item"
+
+      def metadata_cell = "decidim/budgets/project_metadata"
+    end
+  end
+end