decidim-budgets 0.22.0 → 0.23.3

data/app/queries/decidim/budgets/metrics/budget_followers_metric_measure.rb

@@ -11,9 +11,10 @@ module Decidim
         end
 
         def calculate
-          budgets = Decidim::Budgets::Project.where(component: @resource)
+          budgets = Decidim::Budgets::Budget.where(component: @resource)
+          projects = Decidim::Budgets::Project.where(budget: budgets)
 
-          budgets_followers = Decidim::Follow.where(followable: budgets).joins(:user)
+          budgets_followers = Decidim::Follow.where(followable: projects).joins(:user)
                                              .where("decidim_follows.created_at <= ?", end_time)
           cumulative_users = budgets_followers.pluck(:decidim_user_id)
 

data/app/queries/decidim/budgets/metrics/budget_participants_metric_measure.rb

@@ -11,13 +11,14 @@ module Decidim
         end
 
         def calculate
-          budgets = Decidim::Budgets::Order.where(component: @resource).joins(:component)
-                                           .finished
-                                           .where("decidim_budgets_orders.checked_out_at <= ?", end_time)
+          budgets = Decidim::Budgets::Budget.where(component: @resource)
+          orders = Decidim::Budgets::Order.where(budget: budgets)
+                                          .finished
+                                          .where("decidim_budgets_orders.checked_out_at <= ?", end_time)
 
           {
-            cumulative_users: budgets.pluck(:decidim_user_id),
-            quantity_users: budgets.where("decidim_budgets_orders.checked_out_at >= ?", start_time).pluck(:decidim_user_id)
+            cumulative_users: orders.pluck(:decidim_user_id),
+            quantity_users: orders.where("decidim_budgets_orders.checked_out_at >= ?", start_time).pluck(:decidim_user_id)
           }
         end
       end

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

@@ -12,7 +12,8 @@ module Decidim
       def serialize
         {
           id: order.id,
-          component: order.component.name,
+          budget: order.budget.title,
+          component: order.budget.component.name,
           checked_out_at: order.checked_out_at,
           projects: all_projects,
           created_at: order.created_at,
@@ -30,7 +31,7 @@ module Decidim
             id: project.id,
             title: project.title,
             description: project.description,
-            budget: project.budget,
+            budget_amount: project.budget_amount,
             scope: project.try(:scope).try(:name),
             reference: project.reference,
             created_at: project.created_at,

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

@@ -6,45 +6,33 @@ module Decidim
     # `current_component` param with a `Decidim::Component` in order to
     # find the projects.
     class ProjectSearch < ResourceSearch
+      text_search_fields :title, :description
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the projects from.
       def initialize(options = {})
         super(Project.all, options)
       end
 
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(localized_search_text_in(:title), text: "%#{search_text}%")
-          .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
-      end
-
-      def search_category_id
-        super
-      end
+      # Creates the SearchLight base query.
+      def base_query
+        raise "Missing budget" unless budget
+        raise "Missing component" unless component
 
-      def search_scope_id
-        super
+        @scope.where(budget: budget)
       end
 
       # Returns the random projects for the current page.
       def results
-        Project.where(id: super.pluck(:id))
+        Project.where(id: super.pluck(:id)).includes([:scope, :component, :attachments, :category])
       end
 
       private
 
-      # Internal: builds the needed query to search for a text in the organization's
-      # available locales. Note that it is intended to be used as follows:
-      #
-      # Example:
-      #   Resource.where(localized_search_text_for(:title, text: "my_query"))
-      #
-      # The Hash with the `:text` key is required or it won't work.
-      def localized_search_text_in(field)
-        options[:organization].available_locales.map do |l|
-          "#{field} ->> '#{l}' ILIKE :text"
-        end.join(" OR ")
+      # Private: Since budget is not used by a search method we need
+      # to define the method manually.
+      def budget
+        options[:budget]
       end
     end
   end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    BudgetType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::TraceableInterface }
+      ]
+
+      name "Budget"
+      description "A budget"
+
+      field :id, !types.ID, "The internal ID of this budget"
+      field :title, !Decidim::Core::TranslatedFieldType, "The title for this budget"
+      field :description, !Decidim::Core::TranslatedFieldType, "The description for this budget"
+      field :total_budget, !types.Int, "The total budget"
+      field :createdAt, Decidim::Core::DateTimeType, "When this budget was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "When this budget was updated", property: :updated_at
+
+      field :projects, !types[Decidim::Budgets::ProjectType], "The projects for this budget"
+    end
+  end
+end

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

@@ -8,24 +8,24 @@ module Decidim
       name "Budgets"
       description "A budget component of a participatory space."
 
-      connection :projects, ProjectType.connection_type do
+      connection :budgets, BudgetType.connection_type do
         resolve ->(component, _args, _ctx) {
-                  ProjectTypeHelper.base_scope(component).includes(:component)
+                  BudgetsTypeHelper.base_scope(component).includes(:component)
                 }
       end
 
-      field(:project, ProjectType) do
+      field(:budget, BudgetType) do
         argument :id, !types.ID
 
         resolve ->(component, args, _ctx) {
-          ProjectTypeHelper.base_scope(component).find_by(id: args[:id])
+          BudgetsTypeHelper.base_scope(component).find_by(id: args[:id])
         }
       end
     end
 
-    module ProjectTypeHelper
+    module BudgetsTypeHelper
       def self.base_scope(component)
-        Project.where(component: component)
+        Budget.where(component: component)
       end
     end
   end

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

@@ -16,7 +16,8 @@ module Decidim
       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 :budget_amount, types.Int, "The budget amount for this project"
+      field :selected, types.Boolean, "Whether this proposal is selected or not", property: :selected?
       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"

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

@@ -0,0 +1,23 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+
+      <%= form.number_field :weight %>
+
+      <%= form.translated :editor, :description %>
+
+      <%= form.number_field :total_budget %>
+
+      <% if current_component.has_subscopes? %>
+        <div class="row column">
+          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, html: { class: "form edit_budget" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,58 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+
+      <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.budget.name", scope: "decidim.budgets.admin")), new_budget_path, class: "button tiny button--title" if allowed_to? :create, :budget %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.budget.fields.name", scope: "decidim.budgets") %></th>
+            <th><%= t("models.budget.fields.total_budget", scope: "decidim.budgets") %></th>
+            <th><%= t("models.budget.fields.projects_count", scope: "decidim.budgets") %></th>
+            <%= th_resource_scope_label %>
+            <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% budgets.each do |budget| %>
+            <tr data-id="<%= budget.id %>">
+              <td>
+                <%= link_to translated_attribute(budget.title), resource_locator(budget).path %>
+              </td>
+              <td>
+                <%= number_to_currency budget.total_budget, unit: Decidim.currency_unit, precision: 0 %>
+              </td>
+              <td>
+                <%= link_to budget.projects.count, budget_projects_path(budget) %>
+              </td>
+              <%= td_resource_scope_for(budget.scope) %>
+              <td class="table-list__actions">
+                <%= icon_link_to "eye", resource_locator(budget).path, t("actions.preview", scope: "decidim.budgets"), class: "action-icon--preview", target: :blank %>
+
+                <%= icon_link_to "list", budget_projects_path(budget), t("actions.edit_projects", scope: "decidim.budgets"), class: "action-icon--edit-projects" %>
+
+                <% if allowed_to? :update, :budget, budget: budget %>
+                  <%= icon_link_to "pencil", edit_budget_path(budget), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+                <% else %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                <% end %>
+
+                <% if allowed_to? :delete, :budget, budget: budget %>
+                  <%= icon_link_to "circle-x", budget_path(budget), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
+                <% else %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, html: { class: "form new_budget" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".create") %>
+  </div>
+<% end %>

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

@@ -1,6 +1,8 @@
 <div class="card">
   <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
+    <h2 class="card-title">
+      <%= title.html_safe %>
+    </h2>
   </div>
 
   <div class="card-section">
@@ -13,12 +15,12 @@
     </div>
 
     <div class="row column">
-      <%= form.number_field :budget %>
+      <%= form.number_field :budget_amount %>
     </div>
 
-    <% if current_participatory_space.has_subscopes? %>
+    <% if current_component.has_subscopes? %>
       <div class="row column">
-        <%= scopes_picker_field form, :decidim_scope_id %>
+        <%= scopes_picker_field form, :decidim_scope_id, root: budget.scope %>
       </div>
     <% end %>
 
@@ -31,5 +33,11 @@
     </div>
 
     <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
+
+    <% if form.object.persisted? %>
+      <div class="row column">
+        <%= form.check_box :selected %>
+      </div>
+    <% end %>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
-<%= decidim_form_for(@form, html: { class: "form edit_project" })  do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+<%= decidim_form_for([budget, @form], html: { class: "form edit_project" })  do |f| %>
+  <%= render partial: "form", object: f, locals: { title: "#{translated_attribute(budget.title)} &gt; #{t(".title")}" } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>

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

@@ -1,9 +1,10 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
+      <%= link_to translated_attribute(budget.title), budgets_path %> &gt;
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.budgets"), new_project_path, class: "button tiny button--title new" if allowed_to? :create, :project %>
-      <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_proposals_import_path, class: "button tiny button--title" if allowed_to? :import_proposals, :project %>
+      <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_project_path, class: "button tiny button--title new" if allowed_to? :create, :project %>
+      <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_proposals_import_path(budget), class: "button tiny button--title" if allowed_to? :import_proposals, :project %>
     </h2>
   </div>
 
@@ -13,7 +14,9 @@
         <thead>
           <tr>
             <th><%= t("models.project.fields.title", scope: "decidim.budgets") %></th>
-            <th class="center"><%= t("index.confirmed_orders_count") %></th>
+            <th><%= t("index.confirmed_orders_count") %></th>
+            <th><%= t(".selected") %></th>
+            <%= th_resource_scope_label %>
             <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
           </tr>
         </thead>
@@ -23,14 +26,22 @@
               <td>
                 <%= translated_attribute(project.title) %><br>
               </td>
-              <td class='center'>
+              <td>
                <%= project.confirmed_orders_count %>
               </td>
+              <td>
+                <% if project.selected? %>
+                  <%= content_tag :strong, t(".selected"), class: "text-success" %>
+                <% else %>
+                  <%= content_tag :span, "×", class: "text-muted" %>
+                <% end %>
+              </td>
+              <%= td_resource_scope_for(project.scope) %>
               <td class="table-list__actions">
-                <%= icon_link_to "eye", resource_locator(project).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
+                <%= icon_link_to "eye", resource_locator([budget, project]).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
 
                 <% if allowed_to? :update, :project, project: project %>
-                  <%= icon_link_to "pencil", edit_project_path(project), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+                  <%= icon_link_to "pencil", resource_locator([budget, project]).edit, t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
                 <% end %>
 
                 <% if allowed_to? :update, :project, project: project %>
@@ -44,7 +55,9 @@
                 <%= resource_permissions_link(project) %>
 
                 <% if allowed_to? :destroy, :project, project: project %>
-                  <%= icon_link_to "circle-x", project_path(project), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
+                  <%= icon_link_to "circle-x", resource_locator([budget, project]).show, t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
+                <% else %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
                 <% end %>
               </td>
             </tr>

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

@@ -1,5 +1,5 @@
-<%= decidim_form_for(@form, html: { class: "form new_project" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+<%= decidim_form_for([budget, @form], html: { class: "form new_project" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: "#{translated_attribute(budget.title)} &gt; #{t(".title")}" } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>

data/app/views/decidim/budgets/admin/proposals_imports/new.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: proposals_import_path, html: { class: "form import_proposals" }) do |f| %>
+<%= decidim_form_for(@form, url: budget_proposals_import_path(budget), html: { class: "form import_proposals" }) do |f| %>
   <% if @form.origin_components.any? %>
     <div class="card">
       <div class="card-divider">

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

@@ -0,0 +1,5 @@
+<%= render partial: "decidim/shared/component_announcement" %>
+
+<%= cell("decidim/budgets/budgets_header", current_workflow) %>
+
+<%= cell("decidim/budgets/budgets_list", current_workflow) %>

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

@@ -8,6 +8,7 @@
 <% else %>
 <%= t(
   ".voted_on_space",
+  budget_name: translated_attribute(@budget.title),
   space_name: translated_attribute(@space.title)
 ) %>
 <% end %>

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

@@ -11,9 +11,9 @@
       <ul class="card__content">
         <% current_order.projects.each do |project| %>
           <li class="budget-summary__selected-item">
-            <%= link_to translated_attribute(project.title), project %>
+            <%= link_to translated_attribute(project.title), resource_locator([budget, project]).path %>
             <strong class="budget-summary__selected-number">
-              <%= budget_to_currency project.budget %>
+              <%= budget_to_currency project.budget_amount %>
             </strong>
           </li>
         <% end %>
@@ -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}#content", class: "button expanded", data: { disable: true } %>
+        <%= button_to t(".confirm"), checkout_budget_order_path(budget), class: "button expanded", data: { disable: true } %>
       </div>
     </div>
     <div class="text-center">