decidim-budgets 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36a0cd87302d85abc1401b212ba7f792da11a7b2
-  data.tar.gz: 0ba3e53eca08d996c1d7ef4e515b113e60246815
+  metadata.gz: e3e2656e58b1d375c6ed9cc32d4af823549aa19a
+  data.tar.gz: 1e3664e67a65acce779cf361bbd58dd305929b6d
 SHA512:
-  metadata.gz: 4f290147ea2a65b093245248598014046266abdeb3ee57fda81051f66297129b19b5d899867f74af9a93bf9a9bdf4af0295ac51c9fa814010993bc0e1e496c14
-  data.tar.gz: cefabce04a878a30200a62e6a5d4e28542f43bfd0e976324a6e45b6a0f6666f92e5e0edcfc713f3424b9c80cd65c4ebd79748e6aac158d0f7fb956906dd9b601
+  metadata.gz: d096815f3bf0747eea89df09a2a99b196451a826110015fcad984fd8af367b6eb3d80a7d3cbf64f65cb0c2e0768cce5034de72b3c57344293f45ea4007eb7bc2
+  data.tar.gz: 25da824f93001da298b80ecfaa5103a17d1aeee9a8f2478e383eff5ce0cff34a01d1afef9b5960f6e3023622222414929af0ed9543c1f112b3e62c5c87280bd5

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

@@ -22,7 +22,7 @@ module Decidim
       # Returns nothing.
       def call
         transaction do
-          return broadcast(:invalid) if order.checked_out?
+          return broadcast(:invalid) if votes_disabled? || order.checked_out?
           add_line_item
           broadcast(:ok, order)
         end
@@ -40,6 +40,14 @@ module Decidim
           order.save!
         end
       end
+
+      def feature
+        @project.feature
+      end
+
+      def votes_disabled?
+        !feature.active_step_settings.votes_enabled?
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Decidim
     module Admin
       # This controller allows an admin to manage projects from a Participatory Process
       class ProjectsController < Admin::ApplicationController
-        helper_method :projects
+        helper_method :projects, :finished_orders, :pending_orders
 
         def new
           @form = form(ProjectForm).instance
@@ -60,6 +60,18 @@ module Decidim
           @projects ||= Project.where(feature: current_feature)
         end
 
+        def orders
+          @orders ||= Order.where(feature: current_feature)
+        end
+
+        def pending_orders
+          orders.pending
+        end
+
+        def finished_orders
+          orders.finished
+        end
+
         def project
           @project ||= projects.find(params[:id])
         end

data/app/forms/decidim/budgets/admin/project_form.rb

@@ -26,12 +26,16 @@ module Decidim
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
         end
 
+        def process_scope
+          current_feature.participatory_process.scope
+        end
+
         def proposals
           @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, context.current_feature)&.order(title: :asc)&.pluck(:title, :id)
         end
 
         def scope
-          @scope ||= context.current_feature.scopes.where(id: decidim_scope_id).first
+          @scope ||= process_scope || current_organization.scopes.where(id: decidim_scope_id).first
         end
 
         def category

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

@@ -24,6 +24,9 @@ module Decidim
         less_than_or_equal_to: :maximum_budget
       }
 
+      scope :finished, -> { where.not(checked_out_at: nil) }
+      scope :pending, -> { where(checked_out_at: nil) }
+
       # Public: Returns the sum of project budgets
       def total_budget
         projects.to_a.sum(&:budget)

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

@@ -9,9 +9,12 @@ module Decidim
       include Decidim::HasScope
       include Decidim::HasCategory
       include Decidim::HasAttachments
+      include Decidim::HasReference
       include Decidim::Comments::Commentable
 
       feature_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"
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
@@ -20,13 +23,18 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-         commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.active_step_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_votes?` Commentable concern method.
       def comments_have_votes?
         true
       end
+
+      # Public: Returns the number of times an specific project have been checked out.
+      def confirmed_orders_count
+        orders.finished.count
+      end
     end
   end
 end

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

@@ -19,11 +19,6 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       end
 
-      # Handle the scope_id filter
-      def search_scope_id
-        query.where(decidim_scope_id: scope_id)
-      end
-
       # Returns the random projects for the current page.
       def results
         @projects ||= Project.transaction do

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

@@ -10,9 +10,11 @@
   <%= form.number_field :budget %>
 </div>
 
-<div class="field" >
-  <%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
-</div>
+<% if !current_participatory_process.scope %>
+  <div class="field" >
+    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+  </div>
+<% end %>
 
 <div class="field" >
   <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>

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

@@ -1,5 +1,10 @@
 <h2><%= t(".title") %></h2>
 
+<dl>
+  <dt><%= t ".finished_orders" %>: </dt><dd><%= finished_orders.count %></dd>
+  <dt><%= t ".pending_orders" %>: </dt><dd><%= pending_orders.count %></dd>
+</dl>
+
 <div class="actions title">
   <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_project_path, class: 'new' if can? :manage, current_feature %>
 </div>
@@ -8,6 +13,7 @@
   <thead>
     <tr>
       <th><%= t("models.project.fields.title", scope: "decidim.budgets") %></th>
+      <th class="center"><%= t("index.confirmed_orders_count") %></th>
       <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
     </tr>
   </thead>
@@ -17,6 +23,9 @@
         <td>
           <%= link_to translated_attribute(project.title), decidim_budgets.project_path(id: project, feature_id: current_feature, participatory_process_id: current_participatory_process), target: :blank %><br />
         </td>
+        <td class='center'>
+         <%= project.confirmed_orders_count %>
+        </td>
         <td class="actions">
           <%= link_to t("actions.edit", scope: "decidim.budgets"), edit_project_path(project) if can? :update, current_feature %>
           <%= link_to t("actions.attachments", scope: "decidim.budgets"), project_attachments_path(project) if can? :update, current_feature %>

data/app/views/decidim/budgets/line_items/update_budget.js.erb

@@ -11,6 +11,7 @@ morphdom($orderProgress[0], '<%= j(render partial: 'decidim/budgets/projects/ord
 morphdom($budgetConfirm[0], '<%= j(render partial: 'decidim/budgets/projects/budget_confirm') %>')
 
 $("#order-progress").foundation();
+$(".budget-summary__selected").foundation();
 
 if ($projectItem.length > 0) {
   morphdom($projectItem[0], '<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }) %>');

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

@@ -12,8 +12,8 @@
     </div>
   </div>
 
-  <% if current_organization.scopes.any? %>
-    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% if current_organization.scopes.any? && !current_participatory_process.scope %>
+    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
   <% end %>
 
   <% if current_feature.categories.any? %>

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

@@ -0,0 +1,18 @@
+<div class="filters-controls hide-for-mediumlarge">
+  <button data-open="filter-box" class="filters-controls__trigger">
+    <%= t ".filter" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
+  </button>
+</div>
+
+<div class="reveal" id="filter-box" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="filters">
+    <%= render partial: "filters" %>
+  </div>
+</div>

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

@@ -15,18 +15,28 @@
         <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 }, disabled: current_order_checked_out?, class: "button tiny budget--list__action success" do %>
+        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, 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 }, disabled: current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
+        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, 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 %>
@@ -37,6 +47,11 @@
       <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>

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

@@ -1,8 +1,8 @@
 <% 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 }, disabled: current_order_checked_out?, 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 }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
   <% 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 }, disabled: current_order_checked_out?, 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 }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
   <% end %>
 <% else %>
   <button class="button expanded button--sc disabled" data-toggle="loginModal"><%= t('.add') %></button>

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

@@ -3,7 +3,7 @@
     <% if project.category.present? %>
       <li><%= link_to translated_attribute(project.category.name), decidim_budgets.projects_path(filter: { category_id: project.category.id }) %></li>
     <% end %>
-    <% if project.scope.present? %>
+    <% if project.scope.present? && !current_participatory_process.scope %>
       <li><%= link_to project.scope.name, decidim_budgets.projects_path(filter: { scope_id: [project.scope.id] }) %></li>
     <% end %>
   </ul>

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

@@ -1,4 +1,4 @@
-<% if current_user.present? %>
+<% if current_user.present? && current_settings.votes_enabled? %>
   <div class="row column">
     <%= render partial: "budget_summary", locals: { include_heading: true } %>
   </div>
@@ -10,6 +10,7 @@
 </div>
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
+    <%= render partial: "filters_small_view"%>
     <div class="card card--secondary show-for-mediumlarge" >
       <%= render partial: "filters" %>
     </div>

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

@@ -4,7 +4,7 @@
 ) %>
 
 <div class="row column view-header">
-  <% if current_user.present? %>
+  <% if current_user.present? && current_settings.votes_enabled? %>
     <%= render partial: "budget_summary", locals: { include_heading: false } %>
   <% end %>
   <%= link_to projects_path, class: "muted-link" do %>
@@ -22,11 +22,17 @@
           <span class="definition-data__title"><%= t('.budget') %></span>
           <span class="definition-data__number"><%= budget_to_currency project.budget %></span>
         </div>
+        <% if current_settings.show_votes? %>
+          <div class="card__support__data">
+            <span><%= t('decidim.budgets.projects.project.count', count: project.confirmed_orders_count) %></span>
+          </div>
+        <% end %>
         <div id="project-<%= project.id %>-budget-button">
           <%= render partial: 'project_budget_button', locals: { project: project } %>
         </div>
       </div>
     </div>
+    <%= feature_reference(project) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">

data/config/i18n-tasks.yml

@@ -3,4 +3,5 @@ locales: [en]
 ignore_unused:
 - "decidim.features.budgets.name"
 - "decidim.features.budgets.settings.*"
+- "decidim.features.budgets.actions.*"
 - "activemodel.attributes.project.*"

data/config/locales/ca.yml

@@ -31,6 +31,8 @@ ca:
             title: Editar projecte
             update: Actualitzar projecte
           index:
+            finished_orders: Vots finalitzats
+            pending_orders: Vots en procés
             title: Projectes
           new:
             create: Crear projecte
@@ -51,7 +53,7 @@ ca:
           title: Confirmar vot
         budget_excess:
           close: Tancar
-          description: Aquest projecte sobrepassa el pressupost màxim i no es pot afegir. Si ho desitges, pots eliminar un projecte ja seleccionat per afegir aquest o votart amb les seves preferències.
+          description: Aquest projecte sobrepassa el pressupost màxim i no es pot afegir. Si ho desitges, pots eliminar un projecte ja seleccionat per afegir aquest o donar suport amb les seves preferències.
           ok: D'acord
           title: Pressupost superat
         budget_summary:
@@ -61,7 +63,7 @@ ca:
           checked_out:
             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? Has d'assignar com a mínim %{minimum_budget} als projectes que desitges i votar amb les teves preferències per definir el pressupost.
+          description: En quins projectes creus que hem de destinar el pressupost? Has d'assignar com a mínim %{minimum_budget} als projectes que desitges i donar suport amb les teves preferències per definir el pressupost.
           title: Tu decideixes el pressupost
         count:
           projects_count:
@@ -71,8 +73,13 @@ ca:
           category: Categoria
           scopes: Àmbits
           search: Cerca
+        filters_small_view:
+          close_modal: Tancar finestra
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Desplegar
         order_progress:
-          vote: Votar
+          vote: Donar suport
         order_selected_projects:
           remove: Esborrar
           selected_projects:
@@ -81,6 +88,9 @@ ca:
           view: Veure
         project:
           add: Afegir
+          count:
+            one: 1 suport
+            other: "%{count} suports"
           remove: Esborrar
         project_budget_button:
           add: Afegir
@@ -90,6 +100,8 @@ ca:
           view_all_projects: Veure tots els projectes
     features:
       budgets:
+        actions:
+          vote: Donar suport
         name: Pressupostos
         settings:
           global:
@@ -98,6 +110,7 @@ ca:
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
           step:
             comments_blocked: Comentaris bloquejats
+            votes_enabled: Suports habilitats
     orders:
       checkout:
         error: S'ha produït un error en processar el teu vot
@@ -105,4 +118,6 @@ ca:
       destroy:
         error: S'ha produït un error en cancel·lar el seu vot
         success: El seu vot ha estat cancel·lat correctament
+  index:
+    confirmed_orders_count: Nombre de vots
   total_budget: Pressupost total

data/config/locales/en.yml

@@ -32,6 +32,8 @@ en:
             title: Edit project
             update: Update project
           index:
+            finished_orders: Finished orders
+            pending_orders: Pending orders
             title: Projects
           new:
             create: Create project
@@ -78,6 +80,11 @@ en:
           category: Category
           scopes: Scopes
           search: Search
+        filters_small_view:
+          close_modal: Close modal
+          filter: Filter
+          filter_by: Filter by
+          unfold: Unfold
         order_progress:
           vote: Vote
         order_selected_projects:
@@ -88,6 +95,9 @@ en:
           view: View
         project:
           add: Add
+          count:
+            one: 1 support
+            other: "%{count} supports"
           remove: Remove
         project_budget_button:
           add: Add
@@ -97,6 +107,8 @@ en:
           view_all_projects: View all projects
     features:
       budgets:
+        actions:
+          vote: Vote
         name: Budgets
         settings:
           global:
@@ -105,6 +117,7 @@ en:
             vote_threshold_percent: Vote threshold percent
           step:
             comments_blocked: Comments blocked
+            votes_enabled: Votes enabled
     orders:
       checkout:
         error: An error ocurred while processing your vote
@@ -112,4 +125,6 @@ en:
       destroy:
         error: An error ocurred while canceling your vote
         success: Your vote has been canceled successfully
+  index:
+    confirmed_orders_count: Orders count
   total_budget: Total budget

data/config/locales/es.yml

@@ -31,6 +31,8 @@ es:
             title: Editar proyecto
             update: Actualizar proyecto
           index:
+            finished_orders: Votos finalizados
+            pending_orders: Votos pendientes
             title: Proyectos
           new:
             create: Crear proyecto
@@ -51,7 +53,7 @@ es:
           title: Confirmar voto
         budget_excess:
           close: Cerrar
-          description: Este proyecto sobrepasa el presupuesto máximo y no se puede añadir. Si lo deseas, puede eliminar un proyecto que ya hayas seleccionado o votar con tus preferencias.
+          description: Este proyecto sobrepasa el presupuesto máximo y no se puede añadir. Si lo deseas, puede eliminar un proyecto que ya hayas seleccionado o dar apoyo con tus preferencias.
           ok: De acuerdo
           title: Presupuesto excedido
         budget_summary:
@@ -71,8 +73,13 @@ es:
           category: Categoría
           scopes: Ámbitos
           search: Buscar
+        filters_small_view:
+          close_modal: Cerrar ventana
+          filter: Filtrar
+          filter_by: Filtrar por
+          unfold: Desplegar
         order_progress:
-          vote: Votar
+          vote: Dar apoyo
         order_selected_projects:
           remove: Eliminar
           selected_projects:
@@ -81,6 +88,9 @@ es:
           view: Ver
         project:
           add: Añadir
+          count:
+            one: 1 apoyo
+            other: "%{count} apoyos"
           remove: Eliminar
         project_budget_button:
           add: Añadir
@@ -90,6 +100,8 @@ es:
           view_all_projects: Ver todos los proyectos
     features:
       budgets:
+        actions:
+          vote: Dar apoyo
         name: Presupuestos
         settings:
           global:
@@ -98,6 +110,7 @@ es:
             vote_threshold_percent: Porcentaje mínimo del presupuesto
           step:
             comments_blocked: Comentarios bloqueados
+            votes_enabled: Votos habilitados
     orders:
       checkout:
         error: Se ha producido un error al procesar tu voto
@@ -105,4 +118,6 @@ es:
       destroy:
         error: Ha habido un error al cancelar tu voto
         success: Tu voto ha sido cancelado correctamente
+  index:
+    confirmed_orders_count: Número de votos
   total_budget: Presupuesto total

data/config/locales/eu.yml

@@ -2,4 +2,100 @@ eu:
   activemodel:
     attributes:
       project:
-        budget: Aurrekontua
+        budget: Aurrekontua
+        decidim_category_id: Kategoria
+        decidim_scope_id: Esparrua
+        description: Deskribapena
+        proposal_ids: Honekin lotutako proposamenak
+        title: Izenburua
+  decidim:
+    budgets:
+      actions:
+        attachments: Fitxategi erantsiak
+        confirm_destroy: Ziur zaude proiektu hau ezabatu nahi duzula?
+        destroy: Garbitu
+        edit: Editatu
+        new: '%{name} berria'
+        title: Ekintzak
+      admin:
+        models:
+          project:
+            name: Proiektua
+        projects:
+          create:
+            invalid: Arazo bat izan da proiektu hau sortzean
+            success: Proiektua ongi sortu da
+          destroy:
+            success: Proiektu ongi ezabatu da
+          edit:
+            title: Editatu proiektua
+            update: Eguneratu proiektua
+          index:
+            title: Proiektuak
+          new:
+            create: Sortu proiektua
+            title: Emaitza berria
+          update:
+            invalid: Arazo bat izan da proiektu hau eguneratzean
+            success: Proiektua zuzen eguneratu da
+      models:
+        project:
+          fields:
+            title: Izenburua
+      projects:
+        budget_confirm:
+          are_you_sure: Ados zaude? Behin zure botoa baieztatuta, ezin izanen duzu aldatu.'
+          cancel: Utzi
+          confirm: Baieztatu
+          description: Proiektu hauek hautatu dituzu aurrekontuan sartzeko
+          title: Baieztatu botoa
+        budget_excess:
+          close: Itxi
+          description: Proiektu honek gehieneko aurrekontua gainditzen du, eta ezin da gehitu. Nahi baduzu, jada hautatua duzun proiektu bat ezaba dezakezu edo botoa eman zure lehenespenekin bat.
+          ok: Ados
+          title: Aurrekontua gainditu da.
+        budget_summary:
+          are_you_sure: Ziur zaude zure botoa ezeztatu nahi duzula?
+          assigned: 'Esleituta:'
+          checked_out:
+            title: Botoa zuzen bidali da
+          description: Zure aburuz, proiektuetako zeinei esleitu behar diegu aurrekontua? Gutxienez, %{minimum_budget} esleitu nahi dituzun proiektuei, eta bozkatu aurrekontua zehazteko.
+          title: Zure esku dago aurrekontua erabakitzea
+        count:
+          projects_count:
+            one: Proiektu bat
+            other: "%{count} proiektu"
+        filters:
+          category: Kategoria
+          scopes: Esparruak
+          search: Bilatu
+        filters_small_view:
+          filter_by: 'Iragazi honen arabera:'
+        order_progress:
+          vote: Bozkatu
+        order_selected_projects:
+          remove: Kendu
+          selected_projects:
+            one: hautatutako proiektua
+            other: hautatutako proiektuak
+          view: Ikusi
+        project:
+          add: Gehitu
+          remove: Kendu
+        project_budget_button:
+          add: Gehitu
+          added: Erantsita
+        show:
+          budget: Aurrekontua
+          view_all_projects: Ikusi proiektu guztiak
+    features:
+      budgets:
+        name: Aurrekontuak
+    orders:
+      checkout:
+        error: Errorea gertatu da zure botoa prozesatzean
+        success: Zure botoa ongi bideratu da
+      destroy:
+        error: Errorea gertatu da zure botoa ezeztatzean
+        success: Zure botua zuzen ezeztatu da
+  total_budget: Guztizko aurrekontua

data/config/locales/fi.yml

@@ -0,0 +1,123 @@
+fi:
+  activemodel:
+    attributes:
+      project:
+        budget: Budjetti
+        decidim_category_id: Kategoria
+        decidim_scope_id: Konteksti
+        description: Kuvaus
+        proposal_ids: Liittyvät esitykset
+        title: Otsikko
+  decidim:
+    budgets:
+      actions:
+        attachments: Liitteet
+        confirm_destroy: Haluatko varmasti poistaa tämän projektin?
+        destroy: Poista
+        edit: Muokkaa
+        new: Uusi %{name}
+        title: Toiminnot
+      admin:
+        models:
+          project:
+            name: Projekti
+        projects:
+          create:
+            invalid: Tämän projektin lisäyksessä tapahtui virhe
+            success: Projekti lisätty onnistuneesti
+          destroy:
+            success: Projekti tuhottu onnistuneesti
+          edit:
+            title: Muokkaa projektia
+            update: Päivitä projektia
+          index:
+            finished_orders: Valmiit tilaukset
+            pending_orders: Odottavat tilaukset
+            title: Projektit
+          new:
+            create: Luo projekti
+            title: Uusi tulos
+          update:
+            invalid: Tämän projektin päivityksessä tapahtui virhe
+            success: Projekti päivitetty onnistuneesti
+      models:
+        project:
+          fields:
+            title: Otsikko
+      projects:
+        budget_confirm:
+          are_you_sure: Oletko samaa mieltä? Kun olet vahvistanut äänesi, et voi enää muuttaa sitä.
+          cancel: Peruuta
+          confirm: Vahvista
+          description: Olet valinnut nämä projektit osaksi budjettia.
+          title: Vahvista ääni
+        budget_excess:
+          close: Sulje
+          description: Tämä projekti ylittää maksimibudjetin, minkä takia sitä ei voida lisätä. Jos haluat, voit poistaa projektin, jonka olet jo valinnut lisättäväksi tai äänestää omien mieltymyksesi mukaisesti.
+          ok: OK
+          title: Maksimibudjetti ylitetty
+        budget_summary:
+          are_you_sure: Haluatko varmasti peruuttaa äänesi?
+          assigned: 'Varattu:'
+          cancel_order: poistaa äänesi ja aloittaa alusta
+          checked_out:
+            description: Olet jo äänestänyt tätä budjettia. Jos muutit mieltäsi, voit %{cancel_link}.
+            title: Budjetin äänestys suoritettu
+          description: Mitä projekteja varten sinun mielestäsi budjettia tulisi varata? Varaa vähintään %{minimum_budget} projekteille, jotka haluat toteutettavan ja äänestä mieltymystesi mukaisesti määrittääksesi budjetin.
+          title: Voit päättää budjetin
+        count:
+          projects_count:
+            one: 1 projekti
+            other: "%{count} projektia"
+        filters:
+          category: Kategoria
+          scopes: Konteksti
+          search: Haku
+        filters_small_view:
+          close_modal: Sulje ikkuna
+          filter: Suodata
+          filter_by: Suodata
+          unfold: Avaa
+        order_progress:
+          vote: Äänestä
+        order_selected_projects:
+          remove: Poista
+          selected_projects:
+            one: projekti valittu
+            other: projektia valittu
+          view: Näytä
+        project:
+          add: Lisää
+          count:
+            one: 1 kannatus
+            other: "%{count} kannatusta"
+          remove: Poista
+        project_budget_button:
+          add: Lisää
+          added: Lisätty
+        show:
+          budget: Budjetti
+          view_all_projects: Näytä kaikki projektit
+    features:
+      budgets:
+        actions:
+          vote: Äänestä
+        name: Budjetit
+        settings:
+          global:
+            comments_enabled: Kommentointi sallittu
+            total_budget: Koko budjetti
+            vote_threshold_percent: Äänestyskynnyksen prosentti
+          step:
+            comments_blocked: Kommentointi kielletty
+            votes_enabled: Äänestys sallittu
+    orders:
+      checkout:
+        error: Äänesi käsittelyssä tapahtui virhe
+        success: Äänesi on hyväksytty onnistuneesti
+      destroy:
+        error: Äänesi peruutuksen yhteydessä tapahtui virhe
+        success: Äänesi on peruttu onnistuneesti
+  index:
+    confirmed_orders_count: Tilauksien määrä
+  total_budget: Koko budjetti

data/db/migrate/20170215132708_add_reference_to_projects.rb

@@ -0,0 +1,7 @@
+class AddReferenceToProjects < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_budgets_projects, :reference, :string
+    Decidim::Budgets::Project.find_each(&:save)
+    change_column_null :decidim_budgets_projects, :reference, false
+  end
+end

data/lib/decidim/budgets/feature.rb

@@ -27,6 +27,8 @@ Decidim.register_feature(:budgets) do |feature|
 
   feature.settings(:step) do |settings|
     settings.attribute :comments_blocked, type: :boolean, default: false
+    settings.attribute :votes_enabled, type: :boolean, default: true
+    settings.attribute :show_votes, type: :boolean, default: false
   end
 
   feature.seeds do
@@ -54,13 +56,13 @@ Decidim.register_feature(:budgets) do |feature|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(Decidim::Dev.asset("city.jpeg")),
+          file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
           attached_to: project
         )
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(Decidim::Dev.asset("Exampledocument.pdf")),
+          file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
           attached_to: project
         )
         Decidim::Comments::Seed.comments_for(project)

data/lib/decidim/budgets/test/factories.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
   factory :budget_feature, parent: :feature do
     name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :budgets).i18n_name }
     manifest_name :budgets
-    participatory_process
+    participatory_process { create(:participatory_process, :with_steps) }
 
     trait :with_total_budget_and_vote_threshold_percent do
       transient do
@@ -21,6 +21,26 @@ FactoryGirl.define do
         }
       end
     end
+
+    trait :with_votes_disabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => {
+            votes_enabled: false
+          }
+        }
+      end
+    end
+
+    trait :with_show_votes_enabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => {
+            show_votes: true
+          }
+        }
+      end
+    end
   end
 
   factory :project, class: Decidim::Budgets::Project do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,42 +88,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 description: ''
 email:
 - josepjaume@gmail.com
@@ -175,6 +175,7 @@ files:
 - app/views/decidim/budgets/projects/_budget_summary.html.erb
 - app/views/decidim/budgets/projects/_count.html.erb
 - app/views/decidim/budgets/projects/_filters.html.erb
+- app/views/decidim/budgets/projects/_filters_small_view.html.erb
 - app/views/decidim/budgets/projects/_linked_projects.html.erb
 - app/views/decidim/budgets/projects/_order_progress.html.erb
 - app/views/decidim/budgets/projects/_order_selected_projects.html.erb
@@ -191,15 +192,19 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/eu.yml
+- config/locales/fi.yml
 - db/migrate/20170127114122_create_projects.rb
 - db/migrate/20170130095615_create_orders.rb
 - db/migrate/20170130101825_create_line_items.rb
 - db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb
+- db/migrate/20170215132708_add_reference_to_projects.rb
 - lib/decidim/budgets.rb
 - lib/decidim/budgets/admin.rb
 - lib/decidim/budgets/admin_engine.rb
 - lib/decidim/budgets/feature.rb
 - lib/decidim/budgets/list_engine.rb
+- lib/decidim/budgets/seeds/Exampledocument.pdf
+- lib/decidim/budgets/seeds/city.jpeg
 - lib/decidim/budgets/test/factories.rb
 homepage: https://github.com/AjuntamentdeBarcelona/decidim
 licenses: