decidim-budgets 0.22.0 → 0.23.0

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">

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

@@ -1,13 +1,24 @@
-<div class="card budget-summary" data-progress-reference data-safe-url="<%= projects_base_url %>">
+<div class="card budget-summary" data-progress-reference data-safe-url="<%= budget_url(budget) %>">
   <div class="card__content">
     <% if include_heading %>
       <% if current_order_checked_out? %>
-        <h3 class="heading3"><%= t(".checked_out.title") %></h3>
+        <h3 class="heading3">
+          <%= t(".checked_out.title") %>
+          <% unless current_workflow.single? %>
+            <small><%= translated_attribute(budget.title) %></small>
+          <% end %>
+        </h3>
         <p>
-          <%= raw t(".checked_out.description", cancel_link: link_to(t(".cancel_order"), order_path, method: :delete, class: "cancel-order", data: { confirm: t(".are_you_sure") })) %>
+          <%= raw t(".checked_out.description", cancel_link: link_to(t(".cancel_order"), budget_order_path(return_to: "budget"), method: :delete, class: "cancel-order", data: { confirm: t(".are_you_sure") })) %>
         </p>
       <% else %>
-        <h3 class="heading3"><%= t(".title") %></h3>
+        <h3 class="heading3">
+          <% if current_workflow.single? %>
+            <%= t(".title") %>
+          <% else %>
+            <%= translated_attribute(budget.title) %>
+          <% end %>
+        </h3>
         <p>
           <% if current_order.minimum_projects_rule? %>
             <%= t(".description_minimum_projects_rule", minimum_number: current_order.minimum_projects) %>
@@ -18,10 +29,10 @@
       <% end %>
     <% end %>
 
-    <div class="budget-summary__total" data-total-budget="<%= component_settings.total_budget %>">
+    <div class="budget-summary__total" data-total-budget="<%= budget.total_budget %>">
       <span class="mini-title"><%= t("total_budget") %>
         <strong class="mini-title__strong mini-title__strong--highlight">
-          <%= budget_to_currency(component_settings.total_budget) %>
+          <%= budget_to_currency(budget.total_budget) %>
         </strong>
       </span>
     </div>
@@ -34,6 +45,8 @@
         <%= render partial: "order_total_budget" %>
       </span>
     </div>
+
+    <%= cell("decidim/budgets/budget_information_modal", budget) %>
   </div>
 
   <%= render partial: "order_selected_projects" %>

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

@@ -14,8 +14,12 @@
     </div>
   </div>
 
-  <% if current_participatory_space.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "projects" %>
+  <% if voting_finished? %>
+    <%= form.check_boxes_tree :status, filter_status_values, legend_title: t(".status"), "aria-controls": "projects" %>
+  <% end %>
+
+  <% if current_component.has_subscopes? %>
+    <%= form.check_boxes_tree :scope_id, resource_filter_scope_values(budget.scope), legend_title: t(".scope"), "aria-controls": "projects" %>
   <% end %>
 
   <% if current_participatory_space.categories.any? %>

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

@@ -2,7 +2,7 @@
   <% resources.each do |project| %>
     <div class="card--list__item">
       <%= 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 %>
+      <%= link_to resource_locator([project.budget, project]).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(project.title) %>
         </h5>

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

@@ -1,27 +1,31 @@
 <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" 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 progress-meter--minimum" style="width: <%= current_order_budget_percent_minimum %>%"></div>
       <!--Change width and text dynamically.-->
       <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
         <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
       </div>
     </div>
-    <% unless current_order_checked_out? %>
-      <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>><%= t(".vote") %></button>
+    <% if !current_order_checked_out? && voting_open? %>
+      <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" 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 progress-meter--minimum" style="width: <%= current_order_budget_percent_minimum %>%"></div>
         <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
           <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
         </div>
       </div>
-      <% unless current_order_checked_out? %>
-        <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>><%= t(".vote") %></button>
+      <% if !current_order_checked_out? && voting_open? %>
+        <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/_order_selected_projects.html.erb

@@ -9,12 +9,12 @@
         <ul class="budget-summary__selected-list">
           <% 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>
               <% unless current_order_checked_out? %>
-                <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
+                <%= button_to budget_order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
                   <%= icon("trash", aria_label: t(".remove"), role: "img") %>
                 <% end %>
               <% end %>