consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1670 from consul/feature/1601#generate_budget_heading_winners

Browse Source 
Add Budget Investments filter by winners
This commit is contained in:
Raimond Garcia
2017-06-21 17:53:01 +02:00
committed by GitHub
parent 57f4a7b897 4fd3eb643a
commit 6667494629
9 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/budget_investments_controller.rb
View File

@@ -3,7 +3,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
feature_flag :budgets
has_filters(%w{valuation_open without_admin managed valuating valuation_finished
valuation_finished_feasible selected all},
valuation_finished_feasible selected winners all},
only: [:index, :toggle_selection])
before_action :load_budget

1
app/models/budget/investment.rb
View File

@@ -49,6 +49,7 @@ class Budget
scope :undecided, -> { where(feasibility: "undecided") }
scope :with_supports, -> { where('cached_votes_up > 0') }
scope :selected, -> { feasible.where(selected: true) }
scope :winners, -> { selected.where(winner: true) }
scope :unselected, -> { not_unfeasible.where(selected: false) }
scope :last_week, -> { where("created_at >= ?", 7.days.ago)}

4
app/views/admin/budget_investments/_investments.html.erb
View File

@@ -12,6 +12,7 @@
<th><%= t("admin.budget_investments.index.table_feasibility") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_valuation_finished") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_selection") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_winner") %></th>
</tr>
</thead>
@@ -74,6 +75,9 @@
<% end %>
<% end %>
</td>
<td class="small text-center">
<%= investment.winner? ? t('shared.yes'): t('shared.no') %>
</td>
</tr>
<% end %>
</table>

1
config/locales/admin.en.yml
View File

@@ -135,6 +135,7 @@ en:
table_feasibility: "Feasibility"
table_valuation_finished: "Val. Fin."
table_selection: "Selection"
table_winner: "Winner"
show:
assigned_admin: Assigned administrator
assigned_valuators: Assigned valuators

1
config/locales/admin.es.yml
View File

@@ -135,6 +135,7 @@ es:
table_feasibility: "Viabilidad"
table_valuation_finished: "Ev. Fin."
table_selection: "Selección"
table_winner: "Ganadora"
show:
assigned_admin: Administrador asignado
assigned_valuators: Evaluadores asignados

1
config/locales/admin.fr.yml
View File

@@ -135,6 +135,7 @@ fr:
table_feasibility: "Faisabilité"
table_valuation_finished: "Ev. Ter."
table_selection: "Sélection"
table_winner: "Winner"
show:
assigned_admin: Administrateur assigné
assigned_valuators: Évaluateur assigné

1
config/locales/admin.nl.yml
View File

@@ -135,6 +135,7 @@ nl:
table_feasibility: "Feasibility"
table_valuation_finished: "Val. Fin."
table_selection: "Selection"
table_winner: "Winner"
show:
assigned_admin: Assigned administrator
assigned_valuators: Assigned valuators

6
spec/factories.rb
View File

@@ -291,6 +291,12 @@ FactoryGirl.define do
selected true
feasibility "feasible"
valuation_finished true
end
trait :winner do
selected
winner true
end
trait :unselected do

15
spec/features/admin/budget_investments_spec.rb
View File

@@ -463,6 +463,7 @@ feature 'Admin budget investments' do
let!(:feasible_bi) { create(:budget_investment, :feasible, budget: @budget, title: "Feasible project") }
let!(:feasible_vf_bi) { create(:budget_investment, :feasible, :finished, budget: @budget, title: "Feasible, VF project") }
let!(:selected_bi) { create(:budget_investment, :selected, budget: @budget, title: "Selected project") }
let!(:winner_bi) { create(:budget_investment, :winner, budget: @budget, title: "Winner project") }
scenario "Filtering by valuation and selection" do
visit admin_budget_budget_investments_path(@budget)
@@ -472,18 +473,28 @@ feature 'Admin budget investments' do
expect(page).to_not have_content(feasible_bi.title)
expect(page).to have_content(feasible_vf_bi.title)
expect(page).to have_content(selected_bi.title)
expect(page).to have_content(winner_bi.title)
within('#filter-subnav') { click_link 'Val. fin. Feasible' }
expect(page).to_not have_content(unfeasible_bi.title)
expect(page).to_not have_content(feasible_bi.title)
expect(page).to have_content(feasible_vf_bi.title)
expect(page).to have_content(selected_bi.title)
expect(page).to have_content(winner_bi.title)
within('#filter-subnav') { click_link 'Selected' }
expect(page).to_not have_content(unfeasible_bi.title)
expect(page).to_not have_content(feasible_bi.title)
expect(page).to_not have_content(feasible_vf_bi.title)
expect(page).to have_content(selected_bi.title)
expect(page).to have_content(winner_bi.title)
within('#filter-subnav') { click_link 'Winners' }
expect(page).to_not have_content(unfeasible_bi.title)
expect(page).to_not have_content(feasible_bi.title)
expect(page).to_not have_content(feasible_vf_bi.title)
expect(page).to_not have_content(selected_bi.title)
expect(page).to have_content(winner_bi.title)
end
scenario "Showing the selection buttons", :js do
@@ -532,14 +543,14 @@ feature 'Admin budget investments' do
visit admin_budget_budget_investments_path(@budget)
within('#filter-subnav') { click_link 'Selected' }
expect(page).to have_content('There is 1 investment')
expect(page).to have_content('There are 2 investments')
within("#budget_investment_#{selected_bi.id}") do
click_link('Selected')
end
expect(page).to_not have_content(selected_bi.title)
expect(page).to have_content('investments cannot be found')
expect(page).to have_content('There is 1 investment')
within('#filter-subnav') { click_link 'All' }