decidim-budgets 0.19.0 → 0.22.0

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

@@ -17,11 +17,24 @@ module Decidim
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Randomable
+      include Decidim::Searchable
 
       component_manifest_name "budgets"
       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"
 
+      searchable_fields(
+        scope_id: :decidim_scope_id,
+        participatory_space: { component: :participatory_space },
+        A: :title,
+        D: :description,
+        datetime: :created_at
+      )
+
+      def self.ordered_ids(ids)
+        order(Arel.sql("position(id::text in '#{ids.join(",")}')"))
+      end
+
       def self.log_presenter_class_for(_log)
         Decidim::Budgets::AdminLog::ProjectPresenter
       end

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

@@ -19,6 +19,14 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       end
 
+      def search_category_id
+        super
+      end
+
+      def search_scope_id
+        super
+      end
+
       # Returns the random projects for the current page.
       def results
         Project.where(id: super.pluck(:id))

data/app/types/decidim/budgets/budgets_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    BudgetsType = GraphQL::ObjectType.define do
+      interfaces [-> { Decidim::Core::ComponentInterface }]
+
+      name "Budgets"
+      description "A budget component of a participatory space."
+
+      connection :projects, ProjectType.connection_type do
+        resolve ->(component, _args, _ctx) {
+                  ProjectTypeHelper.base_scope(component).includes(:component)
+                }
+      end
+
+      field(:project, ProjectType) do
+        argument :id, !types.ID
+
+        resolve ->(component, args, _ctx) {
+          ProjectTypeHelper.base_scope(component).find_by(id: args[:id])
+        }
+      end
+    end
+
+    module ProjectTypeHelper
+      def self.base_scope(component)
+        Project.where(component: component)
+      end
+    end
+  end
+end

data/app/types/decidim/budgets/project_type.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    ProjectType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Comments::CommentableInterface },
+        -> { Decidim::Core::CategorizableInterface }
+      ]
+
+      name "Project"
+      description "A project"
+
+      field :id, !types.ID, "The internal ID for this project"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this project"
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this project"
+      field :budget, types.Int, "The budget for this project"
+      field :createdAt, Decidim::Core::DateTimeType, "When this project was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "When this project was updated", property: :updated_at
+      field :reference, types.String, "The reference for this project"
+    end
+  end
+end

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

@@ -27,12 +27,9 @@
     </div>
 
     <div class="row column">
-      <% if @form.proposals %>
-        <%= form.select :proposal_ids,
-                        @form.proposals,
-                        {},
-                        { multiple: true, class: "chosen-select" } %>
-      <% end %>
+      <%= proposals_picker(form, :proposals, proposals_picker_projects_path) %>
     </div>
+
+    <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
   </div>
 </div>

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

@@ -0,0 +1 @@
+<%= cell "decidim/proposals/proposals_picker", current_component %>

data/app/views/decidim/budgets/order_summary_mailer/order_summary.html.erb

@@ -0,0 +1,21 @@
+<% if @component.try(:scopes_enabled) %>
+<%= t(
+  ".voted_on_space_with_scope",
+  space_name: translated_attribute(@space.title),
+  scope_name: translated_attribute(@component.scope.name),
+  scope_type: translated_attribute(@component.scope.scope_type.name)
+) %>
+<% else %>
+<%= t(
+  ".voted_on_space",
+  space_name: translated_attribute(@space.title)
+) %>
+<% end %>
+
+<p><%= t(".selected_projects") %></p>
+
+<ul>
+<% @order.projects.each do |project| %>
+  <li><%= translated_attribute(project.title) %></li>
+<% end %>
+</ul>

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

@@ -22,7 +22,7 @@
     <p class="text-center"><%= t(".are_you_sure") %></p>
     <div class="row">
       <div class="columns medium-8 medium-offset-2">
-        <%= button_to t(".confirm"), checkout_order_path, class: "button expanded", data: { disable: true } %>
+        <%= button_to t(".confirm"), "#{checkout_order_path}#content", class: "button expanded", data: { disable: true } %>
       </div>
     </div>
     <div class="text-center">

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

@@ -1,4 +1,4 @@
-<div class="card budget-summary" data-progress-reference>
+<div class="card budget-summary" data-progress-reference data-safe-url="<%= projects_base_url %>">
   <div class="card__content">
     <% if include_heading %>
       <% if current_order_checked_out? %>
@@ -8,7 +8,13 @@
         </p>
       <% else %>
         <h3 class="heading3"><%= t(".title") %></h3>
-        <p><%= t(".description", minimum_budget: budget_to_currency(current_order&.minimum_budget)) %></p>
+        <p>
+          <% if current_order.minimum_projects_rule? %>
+            <%= t(".description_minimum_projects_rule", minimum_number: current_order.minimum_projects) %>
+          <% else %>
+            <%= t(".description", minimum_budget: budget_to_currency(current_order.minimum_budget)) %>
+          <% end %>
+        </p>
       <% end %>
     <% end %>
 

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

@@ -1,11 +1,13 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "projects" } %>
+
 <%= filter_form_for filter do |form| %>
   <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") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="projects">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img", "aria-hidden": true %>
           </button>
         </div>
       </div>
@@ -13,10 +15,12 @@
   </div>
 
   <% if current_participatory_space.has_subscopes? %>
-    <%= scopes_picker_filter form, :scope_id %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "projects" %>
   <% end %>
 
-  <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+  <% if current_participatory_space.categories.any? %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "projects" %>
   <% end %>
+
+  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div class="card card--action card--list">
   <% resources.each do |project| %>
     <div class="card--list__item">
-      <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
+      <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
       <%= link_to resource_locator(project).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(project.title) %>

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

@@ -1,35 +1,27 @@
 <div id="order-progress">
   <div class="budget-summary__progressbox" data-current-budget="<%= current_order ? current_order.total_budget : 0 %>">
-    <div class="progress budget-progress" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= component_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
-      <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+    <div class="progress budget-progress" role="progressbar" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemin="0" aria-valuemax="100">
+      <div class="progress-meter progress-meter--minimum" style="width: <%= component_settings.vote_threshold_percent %>%"></div>
       <!--Change width and text dynamically.-->
       <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
-        <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
+        <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
       </div>
     </div>
     <% unless current_order_checked_out? %>
-      <% if current_order_can_be_checked_out? %>
-        <button class="button small button--sc" data-toggle="budget-confirm"><%= t(".vote") %></button>
-      <% else %>
-        <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t(".vote") %></button>
-      <% end %>
+      <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>><%= t(".vote") %></button>
     <% end %>
   </div>
 
   <div class="progressbox-fixed-wrapper" data-progressbox-fixed>
     <div class="budget-summary__progressbox budget-summary__progressbox--fixed">
-      <div class="progress budget-progress budget-progress--fixed" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= component_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
-        <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+      <div class="progress budget-progress budget-progress--fixed" role="progressbar" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemin="0" aria-valuemax="100">
+        <div class="progress-meter progress-meter--minimum" style="width: <%= component_settings.vote_threshold_percent %>%"></div>
         <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
-          <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
+          <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
         </div>
       </div>
       <% unless current_order_checked_out? %>
-        <% if current_order_can_be_checked_out? %>
-          <button class="button small button--sc" data-toggle="budget-confirm"><%= t(".vote") %></button>
-        <% else %>
-          <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t(".vote") %></button>
-        <% end %>
+        <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>><%= t(".vote") %></button>
       <% end %>
     </div>
   </div>

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

@@ -1,57 +1 @@
-<div id="project-<%= project.id %>-item" class="card--list__item">
-  <div class="card--list__text">
-    <div>
-      <%= link_to project, class: "card__link" do %>
-        <h5 class="card__title budget-list__title">
-          <%= translated_attribute project.title %>
-        </h5>
-      <% end %>
-      <%= cell "decidim/tags", project, context: { extra_classes: ["tags--project"] } %>
-    </div>
-  </div>
-  <% if current_user.present? %>
-    <% if current_order && current_order.projects.include?(project) %>
-      <div class="card--list__data budget-list__data budget-list__data--added">
-        <span class="card--list__data__number budget-list__number">
-          <%= budget_to_currency(project.budget) %>
-        </span>
-        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button tiny budget--list__action success" do %>
-          <%= icon("check", class: "icon--small", aria_label: t(".remove"), role: "img") %>
-        <% end %>
-        <% if current_settings.show_votes? %>
-          <div class="card__support" style="width: 7em">
-            <span><%= t(".count", count: project.confirmed_orders_count) %></span>
-          </div>
-        <% end %>
-      </div>
-    <% else %>
-      <div class="card--list__data budget-list__data">
-        <span class="card--list__data__number budget-list__number">
-          <%= budget_to_currency(project.budget) %>
-        </span>
-        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button tiny hollow budget--list__action" do %>
-          <%= icon("check", class: "icon--small", aria_label: t(".add"), role: "img") %>
-        <% end %>
-        <% if current_settings.show_votes? %>
-          <div class="card__support" style="width: 7em">
-            <span><%= t(".count", count: project.confirmed_orders_count) %></span>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
-  <% else %>
-    <div class="card--list__data budget-list__data">
-      <span class="card--list__data__number budget-list__number">
-        <%= budget_to_currency(project.budget) %>
-      </span>
-      <a href="#" class="button tiny hollow budget--list__action disabled" data-toggle="loginModal">
-        <%= icon("check", class: "icon--small", aria_label: t(".add"), role: "img") %>
-      </a>
-      <% if current_settings.show_votes? %>
-        <div class="card__support" style="width: 7em">
-          <span><%= t(".count", count: project.confirmed_orders_count) %></span>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-</div>
+<%= cell "decidim/budgets/project_list_item", project %>

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

@@ -1,11 +1,11 @@
 <div id="project-<%= project.id %>-budget-button">
   <% if current_user.present? %>
     <% if current_order && current_order.projects.include?(project) %>
-      <%= action_authorized_button_to "vote", t(".added"), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button expanded button--sc success budget--list__action" %>
+      <%= action_authorized_button_to "vote", t(".added"), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button expanded button--sc active budget--list__action", "aria-label": t(".added_descriptive", resource_name: translated_attribute(project.title)) %>
     <% else %>
-      <%= action_authorized_button_to "vote", t(".add"), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button expanded button--sc budget--list__action" %>
+      <%= action_authorized_button_to "vote", t(".add"), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button expanded button--sc budget--list__action", "aria-label": t(".add_descriptive", resource_name: translated_attribute(project.title)) %>
     <% end %>
   <% else %>
-    <button class="button expanded button--sc disabled" data-toggle="loginModal"><%= t(".add") %></button>
+    <button class="button expanded button--sc disabled" data-toggle="loginModal" aria-label="<%= t(".add_descriptive", resource_name: translated_attribute(project.title)) %>"><%= t(".add") %></button>
   <% end %>
 </div>

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

@@ -1,6 +1,13 @@
-<div class="card card--list budget-list">
+<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
+  <div class="column">
+    <%= order_selector available_orders, i18n_scope: "decidim.budgets.projects.orders" %>
+  </div>
+</div>
+
+<div class="budget-list">
   <% projects.each do |project| %>
     <%= render partial: "project", locals: { project: project } %>
   <% end %>
 </div>
+
 <%= decidim_paginate projects %>

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

@@ -6,9 +6,9 @@
   </div>
 <% end %>
 <div class="row columns">
-  <h2 class="section-heading">
+  <h3 class="section-heading">
     <%= render partial: "count" %>
-  </h2>
+  </h3>
 </div>
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
@@ -17,7 +17,7 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="projects" class="columns mediumlarge-8 large-9">
+  <div id="projects" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "projects" %>
   </div>
 </div>

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

@@ -1,2 +1,10 @@
 var $projects = $('#projects');
+var $projectsCount = $('#projects-count');
+var $orderFilterInput = $('.order_filter');
+
 $projects.html('<%= j(render partial: "projects").strip.html_safe %>');
+$projectsCount.html('<%= j(render partial: "count").strip.html_safe %>');
+$orderFilterInput.val('<%= order %>');
+
+var $dropdownMenu = $('.dropdown.menu', $projects);
+$dropdownMenu.foundation();

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

@@ -17,7 +17,7 @@ edit_link(
     <%= render partial: "budget_summary", locals: { include_heading: false } %>
   <% end %>
   <%= link_to projects_path, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".view_all_projects") %>
   <% end %>
   <h2 class="heading2"><%= translated_attribute project.title %></h2>

data/config/locales/ar.yml

@@ -100,7 +100,7 @@ ar:
             other: "%{count} مشاريع"
         filters:
           category: الفئة
-          category_prompt: اختر تصنيف
+          scope: نطاق
           search: بحث
         filters_small_view:
           close_modal: إغلاق مشروط
@@ -120,7 +120,6 @@ ar:
             other: المشاريع المختارة
           view: رأي
         project:
-          add: إضافة
           count:
             zero: "%{count} يدعم"
             one: 1 الدعم
@@ -128,11 +127,7 @@ ar:
             few: "%{count} يدعم"
             many: "%{count} يدعم"
             other: "%{count} يدعم"
-          remove: إزالة
           view: رأي
-        project_budget_button:
-          add: إضافة
-          added: وأضاف
         show:
           budget: ميزانية
           view_all_projects: عرض جميع المشاريع

data/config/locales/bg-BG.yml

@@ -0,0 +1,7 @@
+bg:
+  activemodel:
+    attributes:
+      project:
+        budget: Бюджет
+        decidim_category_id: Категория
+        decidim_scope_id: Сфера

data/config/locales/ca.yml

@@ -65,6 +65,12 @@ ca:
         project:
           fields:
             title: Títol
+      order_summary_mailer:
+        order_summary:
+          selected_projects: 'Els projectes que has seleccionat són:'
+          subject: Has votat a l'espai de participació %{space_name}
+          voted_on_space: Has votat en el pressupost de l'espai de participació %{space_name}.
+          voted_on_space_with_scope: Has votat en el pressupost de l'espai de participació %{space_name} a %{scope_name} (%{scope_type}).
       projects:
         budget_confirm:
           are_you_sure: Hi estàs d'acord? Un cop hagis confirmat el teu vot, no podràs canviar-lo.
@@ -85,6 +91,7 @@ ca:
             description: Ja has votat pel pressupost. Si has canviat d'idea, pots %{cancel_link}.
             title: Vot pels pressupostos completat
           description: En quins projectes creus que hem de destinar el pressupost? Assigna com a mínim %{minimum_budget} als projectes que desitges i vota per definir el pressupost.
+          description_minimum_projects_rule: A quins projectes creus que hem de destinar el pressupost? Selecciona com a mínim %{minimum_number} projectes i vota segons les teves preferències per a definir el pressupost.
           title: Tu decideixes el pressupost
         count:
           projects_count:
@@ -92,7 +99,7 @@ ca:
             other: "%{count} projectes"
         filters:
           category: Categoria
-          category_prompt: Selecciona una categoria
+          scope: Àmbit
           search: Cerca
         filters_small_view:
           close_modal: Tancar finestra
@@ -107,16 +114,24 @@ ca:
             one: projecte seleccionat
             other: projectes seleccionats
           view: Veure
+        orders:
+          highest_cost: Major cost
+          label: Ordenar projectes per
+          lowest_cost: Menor cost
+          most_voted: Més votats
+          random: Ordre aleatori
         project:
-          add: Afegir
+          add: Afegir el projecte %{resource_name} al teu vot
           count:
             one: 1 suport
             other: "%{count} suports"
-          remove: Esborrar
+          remove: Esborrar el projecte %{resource_name} del teu vot
           view: Veure
         project_budget_button:
-          add: Afegir
-          added: Afegit
+          add: Afegir al teu vot
+          add_descriptive: Afegir el projecte %{resource_name} al teu vot
+          added: Afegit al teu vot
+          added_descriptive: El projecte %{resource_name} s'ha afegit al teu vot
         show:
           budget: Pressupost
           view_all_projects: Veure tots els projectes
@@ -129,9 +144,16 @@ ca:
           global:
             announcement: Avís
             comments_enabled: Comentaris habilitats
+            form:
+              errors:
+                budget_voting_rule_only_one: Cal activar com a mínim una norma per a la votació
+                budget_voting_rule_required: Es requereix una norma per a la votació
             projects_per_page: Projectes per pàgina
             resources_permissions_enabled: Es poden establir permisos d'accions per a cada trobada
             total_budget: Pressupost total
+            vote_minimum_budget_projects_number: Nombre màxim de projectes a votar
+            vote_rule_minimum_budget_projects_enabled: 'Activar norma: Número mínim de projectes a votar'
+            vote_rule_threshold_percent_enabled: 'Activar norma: percentatge mínim del pressupost'
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
           step:
             announcement: Avís