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

changes valuation interface to show only assigned

Browse Source 
Valuators can only see their assigned spending proposals
Admins can see/edit all but index only shows their assigned items

Removed filter by_valuator
This commit is contained in:
Juanjo Bazán
2016-03-08 12:58:09 +01:00
committed by Juanjo Bazán
parent d39eb9ba9b
commit 09bb3a1386
5 changed files with 132 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/valuation/spending_proposals_controller.rb
View File

@@ -2,12 +2,18 @@ class Valuation::SpendingProposalsController < Valuation::BaseController
include FeatureFlags
feature_flag :spending_proposals
has_filters %w{valuation_open valuating valuation_finished}, only: :index
before_action :restrict_access_to_assigned_items, only: [:show, :edit, :valuate]
has_filters %w{valuating valuation_finished}, only: :index
load_and_authorize_resource
def index
@spending_proposals = SpendingProposal.search(params, @current_filter).order(created_at: :desc).page(params[:page])
if current_user.valuator?
@spending_proposals = SpendingProposal.search(params_for_current_valuator, @current_filter).order(created_at: :desc).page(params[:page])
else
@spending_proposals = SpendingProposal.none.page(params[:page])
end
end
def valuate
@@ -21,4 +27,12 @@ class Valuation::SpendingProposalsController < Valuation::BaseController
params.require(:spending_proposal).permit(:price, :price_first_year, :price_explanation, :feasible, :feasible_explanation, :time_scope, :valuation_finished, :internal_comments)
end
def params_for_current_valuator
params.merge({valuator_id: current_user.valuator.id})
end
def restrict_access_to_assigned_items
raise ActionController::RoutingError.new('Not Found') unless current_user.administrator? || ValuationAssignment.exists?(spending_proposal_id: params[:id], valuator_id: current_user.valuator.id)
end
end

7
app/views/valuation/spending_proposals/index.html.erb
View File

@@ -9,13 +9,6 @@
label: false,
class: "js-submit-on-change" } %>
</div>
<div class="small-12 medium-4 column float-right">
<%= select_tag :valuator_id,
options_for_select(valuator_select_options(current_user.valuator), params[:valuator_id]),
{ prompt: t("valuation.spending_proposals.index.valuator_filter_all"),
label: false,
class: "js-submit-on-change" } %>
</div>
<% end %>
</div>

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

@@ -7,7 +7,6 @@ en:
spending_proposals:
index:
geozone_filter_all: All zones
valuator_filter_all: All valuators
filters:
valuation_open: Open
valuating: Under valuation

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

@@ -7,7 +7,6 @@ es:
spending_proposals:
index:
geozone_filter_all: Todos los ámbitos de actuación
valuator_filter_all: Todos los evaluadores
filters:
valuation_open: Abiertas
valuating: En evaluación

182
spec/features/valuation/spending_proposals_spec.rb
View File

@@ -12,11 +12,29 @@ feature 'Valuation spending proposals' do
expect{ visit valuation_spending_proposals_path }.to raise_exception(FeatureFlags::FeatureDisabled)
end
scenario 'Index shows spending proposals' do
spending_proposal = create(:spending_proposal)
scenario 'Index shows spending proposals assigned to current valuator' do
spending_proposal1 = create(:spending_proposal)
spending_proposal2 = create(:spending_proposal)
spending_proposal1.valuators << @valuator
visit valuation_spending_proposals_path
expect(page).to have_content(spending_proposal.title)
expect(page).to have_content(spending_proposal1.title)
expect(page).to_not have_content(spending_proposal2.title)
end
scenario 'Index shows no spending proposals to admins no valuators' do
spending_proposal1 = create(:spending_proposal)
spending_proposal2 = create(:spending_proposal)
spending_proposal1.valuators << @valuator
logout
login_as create(:administrator).user
visit valuation_spending_proposals_path
expect(page).to_not have_content(spending_proposal1.title)
expect(page).to_not have_content(spending_proposal2.title)
end
scenario 'Index shows assignments info' do
@@ -24,33 +42,35 @@ feature 'Valuation spending proposals' do
spending_proposal2 = create(:spending_proposal)
spending_proposal3 = create(:spending_proposal)
valuator1 = create(:valuator, user: create(:user, username: 'Olga'))
valuator2 = create(:valuator, user: create(:user, username: 'Miriam'))
admin = create(:administrator, user: create(:user, username: 'Gema'))
valuator1 = create(:valuator, user: create(:user))
valuator2 = create(:valuator, user: create(:user))
valuator3 = create(:valuator, user: create(:user))
spending_proposal1.valuators << valuator1
spending_proposal2.valuator_ids = [valuator1.id, valuator2.id]
spending_proposal3.update({administrator_id: admin.id})
spending_proposal1.valuator_ids = [@valuator.id]
spending_proposal2.valuator_ids = [@valuator.id, valuator1.id, valuator2.id]
spending_proposal3.valuator_ids = [@valuator.id, valuator3.id]
visit valuation_spending_proposals_path
within("#spending_proposal_#{spending_proposal1.id}") do
expect(page).to have_content("Olga")
expect(page).to have_content("Rachel")
end
within("#spending_proposal_#{spending_proposal2.id}") do
expect(page).to have_content("2 valuators assigned")
expect(page).to have_content("3 valuators assigned")
end
within("#spending_proposal_#{spending_proposal3.id}") do
expect(page).to have_content("No valuators assigned")
expect(page).to have_content("2 valuators assigned")
end
end
scenario "Index filtering by geozone", :js do
geozone = create(:geozone, name: "District 9")
create(:spending_proposal, title: "Realocate visitors", geozone: geozone)
create(:spending_proposal, title: "Destroy the city")
spending_proposal1 = create(:spending_proposal, title: "Realocate visitors", geozone: geozone)
spending_proposal2 = create(:spending_proposal, title: "Destroy the city")
spending_proposal1.valuators << @valuator
spending_proposal2.valuators << @valuator
visit valuation_spending_proposals_path
expect(page).to have_link("Realocate visitors")
@@ -71,32 +91,8 @@ feature 'Valuation spending proposals' do
expect(page).to have_link("Destroy the city")
end
scenario "Index filtering by valuator", :js do
user = create(:user, username: 'Karnak')
valuator1 = create(:valuator, user: user)
spending = create(:spending_proposal, title: "Realocate visitors")
spending.valuators << valuator1
create(:spending_proposal, title: "Destroy the city")
visit valuation_spending_proposals_path
expect(page).to have_link("Realocate visitors")
expect(page).to have_link("Destroy the city")
select "Karnak", from: "valuator_id"
expect(page).to have_link("Realocate visitors")
expect(page).to_not have_link("Destroy the city")
select "All valuators", from: "valuator_id"
expect(page).to have_link("Destroy the city")
expect(page).to have_link("Realocate visitors")
end
scenario "Current filter is properly highlighted" do
filters_links = {'valuation_open' => 'Open',
'valuating' => 'Under valuation',
filters_links = {'valuating' => 'Under valuation',
'valuation_finished' => 'Valuation finished'}
visit valuation_spending_proposals_path
@@ -118,8 +114,8 @@ feature 'Valuation spending proposals' do
scenario "Index filtering by valuation status" do
valuating = create(:spending_proposal, title: "Ongoing valuation")
valuated = create(:spending_proposal, title: "Old idea", valuation_finished: true)
valuating.valuators << create(:valuator)
valuated.valuators << create(:valuator)
valuating.valuators << @valuator
valuated.valuators << @valuator
visit valuation_spending_proposals_path(filter: 'valuation_open')
@@ -137,36 +133,90 @@ feature 'Valuation spending proposals' do
expect(page).to have_content("Old idea")
end
scenario 'Show' do
administrator = create(:administrator, user: create(:user, username: 'Ana', email: 'ana@admins.org'))
valuator2 = create(:valuator, user: create(:user, username: 'Rick', email: 'rick@valuators.org'))
spending_proposal = create(:spending_proposal,
geozone: create(:geozone),
association_name: 'People of the neighbourhood',
price: 1234,
feasible: false,
feasible_explanation: 'It is impossible',
administrator: administrator)
spending_proposal.valuators << [@valuator, valuator2]
feature 'Show' do
scenario 'visible for assigned valuators' do
administrator = create(:administrator, user: create(:user, username: 'Ana', email: 'ana@admins.org'))
valuator2 = create(:valuator, user: create(:user, username: 'Rick', email: 'rick@valuators.org'))
spending_proposal = create(:spending_proposal,
geozone: create(:geozone),
association_name: 'People of the neighbourhood',
price: 1234,
feasible: false,
feasible_explanation: 'It is impossible',
administrator: administrator)
spending_proposal.valuators << [@valuator, valuator2]
visit valuation_spending_proposals_path
visit valuation_spending_proposals_path
click_link spending_proposal.title
click_link spending_proposal.title
expect(page).to have_content(spending_proposal.title)
expect(page).to have_content(spending_proposal.description)
expect(page).to have_content(spending_proposal.author.name)
expect(page).to have_content(spending_proposal.association_name)
expect(page).to have_content(spending_proposal.geozone.name)
expect(page).to have_content('1234')
expect(page).to have_content('Not feasible')
expect(page).to have_content('It is impossible')
expect(page).to have_content('Ana (ana@admins.org)')
expect(page).to have_content(spending_proposal.title)
expect(page).to have_content(spending_proposal.description)
expect(page).to have_content(spending_proposal.author.name)
expect(page).to have_content(spending_proposal.association_name)
expect(page).to have_content(spending_proposal.geozone.name)
expect(page).to have_content('1234')
expect(page).to have_content('Not feasible')
expect(page).to have_content('It is impossible')
expect(page).to have_content('Ana (ana@admins.org)')
within('#assigned_valuators') do
expect(page).to have_content('Rachel (rachel@valuators.org)')
expect(page).to have_content('Rick (rick@valuators.org)')
within('#assigned_valuators') do
expect(page).to have_content('Rachel (rachel@valuators.org)')
expect(page).to have_content('Rick (rick@valuators.org)')
end
end
scenario 'visible for admins' do
logout
login_as create(:administrator).user
administrator = create(:administrator, user: create(:user, username: 'Ana', email: 'ana@admins.org'))
valuator2 = create(:valuator, user: create(:user, username: 'Rick', email: 'rick@valuators.org'))
spending_proposal = create(:spending_proposal,
geozone: create(:geozone),
association_name: 'People of the neighbourhood',
price: 1234,
feasible: false,
feasible_explanation: 'It is impossible',
administrator: administrator)
spending_proposal.valuators << [@valuator, valuator2]
visit valuation_spending_proposal_path(spending_proposal)
expect(page).to have_content(spending_proposal.title)
expect(page).to have_content(spending_proposal.description)
expect(page).to have_content(spending_proposal.author.name)
expect(page).to have_content(spending_proposal.association_name)
expect(page).to have_content(spending_proposal.geozone.name)
expect(page).to have_content('1234')
expect(page).to have_content('Not feasible')
expect(page).to have_content('It is impossible')
expect(page).to have_content('Ana (ana@admins.org)')
within('#assigned_valuators') do
expect(page).to have_content('Rachel (rachel@valuators.org)')
expect(page).to have_content('Rick (rick@valuators.org)')
end
end
scenario 'not visible for not assigned valuators' do
logout
login_as create(:valuator).user
administrator = create(:administrator, user: create(:user, username: 'Ana', email: 'ana@admins.org'))
valuator2 = create(:valuator, user: create(:user, username: 'Rick', email: 'rick@valuators.org'))
spending_proposal = create(:spending_proposal,
geozone: create(:geozone),
association_name: 'People of the neighbourhood',
price: 1234,
feasible: false,
feasible_explanation: 'It is impossible',
administrator: administrator)
spending_proposal.valuators << [@valuator, valuator2]
expect { visit valuation_spending_proposal_path(spending_proposal) }.to raise_error "Not Found"
end
end
feature 'Valuate' do