From cddfdf4b84f9c55ccf169ff6044c8522570fd478 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 26 Jan 2018 19:52:41 +0100 Subject: [PATCH 01/17] Add valuator groups --- .../admin/valuator_groups_controller.rb | 52 +++++++++++++++ app/models/valuator_group.rb | 2 + .../admin/valuator_groups/_group.html.erb | 18 +++++ app/views/admin/valuator_groups/edit.html.erb | 4 ++ .../admin/valuator_groups/index.html.erb | 4 ++ app/views/admin/valuator_groups/new.html.erb | 4 ++ app/views/admin/valuator_groups/show.html.erb | 4 ++ app/views/admin/valuators/index.html.erb | 2 + config/locales/en/user_groups.yml | 6 ++ config/locales/es/user_groups.yml | 6 ++ config/routes/admin.rb | 1 + .../20180208151658_create_valuator_groups.rb | 7 ++ db/schema.rb | 9 +++ spec/factories.rb | 3 + spec/features/admin/valuator_groups_spec.rb | 66 +++++++++++++++++++ 15 files changed, 188 insertions(+) create mode 100644 app/controllers/admin/valuator_groups_controller.rb create mode 100644 app/models/valuator_group.rb create mode 100644 app/views/admin/valuator_groups/_group.html.erb create mode 100644 app/views/admin/valuator_groups/edit.html.erb create mode 100644 app/views/admin/valuator_groups/index.html.erb create mode 100644 app/views/admin/valuator_groups/new.html.erb create mode 100644 app/views/admin/valuator_groups/show.html.erb create mode 100644 config/locales/en/user_groups.yml create mode 100644 config/locales/es/user_groups.yml create mode 100644 db/migrate/20180208151658_create_valuator_groups.rb create mode 100644 spec/features/admin/valuator_groups_spec.rb diff --git a/app/controllers/admin/valuator_groups_controller.rb b/app/controllers/admin/valuator_groups_controller.rb new file mode 100644 index 000000000..876900ac1 --- /dev/null +++ b/app/controllers/admin/valuator_groups_controller.rb @@ -0,0 +1,52 @@ +class Admin::ValuatorGroupsController < Admin::BaseController + + def index + @groups = ValuatorGroup.all + end + + def show + @group = ValuatorGroup.find(params[:id]) + end + + def new + @group = ValuatorGroup.new + end + + def edit + @group = ValuatorGroup.find(params[:id]) + end + + def create + @group = ValuatorGroup.new(group_params) + if @group.save + notice = "User group created successfully" + redirect_to [:admin, @group], notice: notice + else + render :new + end + end + + def update + @group = ValuatorGroup.find(params[:id]) + if @group.update(group_params) + notice = "User group updated successfully" + redirect_to [:admin, @group], notice: notice + else + render :edit + end + end + + def destroy + @group = ValuatorGroup.find(params[:id]) + @group.destroy + notice = "User group destroyed successfully" + redirect_to admin_valuator_groups_path, notice: notice + end + + private + + def group_params + params.require(:valuator_group).permit(:name) + end + +end \ No newline at end of file diff --git a/app/models/valuator_group.rb b/app/models/valuator_group.rb new file mode 100644 index 000000000..d230bd686 --- /dev/null +++ b/app/models/valuator_group.rb @@ -0,0 +1,2 @@ +class ValuatorGroup < ActiveRecord::Base +end \ No newline at end of file diff --git a/app/views/admin/valuator_groups/_group.html.erb b/app/views/admin/valuator_groups/_group.html.erb new file mode 100644 index 000000000..e47de79da --- /dev/null +++ b/app/views/admin/valuator_groups/_group.html.erb @@ -0,0 +1,18 @@ +
+ Name: <%= group.name %> +
+ +
+ Members: +
+ +
+ Edit: + <%= link_to "Edit", edit_admin_valuator_group_path(group) %> +
+ +
+ Destoy: + <%= link_to "Destroy", admin_valuator_group_path(group), method: :delete %> +
+
\ No newline at end of file diff --git a/app/views/admin/valuator_groups/edit.html.erb b/app/views/admin/valuator_groups/edit.html.erb new file mode 100644 index 000000000..5e0d135c5 --- /dev/null +++ b/app/views/admin/valuator_groups/edit.html.erb @@ -0,0 +1,4 @@ +<%= form_for [:admin, @group] do |f| %> + <%= f.text_field :name %> + <%= f.submit %> +<% end %> \ No newline at end of file diff --git a/app/views/admin/valuator_groups/index.html.erb b/app/views/admin/valuator_groups/index.html.erb new file mode 100644 index 000000000..b92987c08 --- /dev/null +++ b/app/views/admin/valuator_groups/index.html.erb @@ -0,0 +1,4 @@ +<%= render partial: 'group', collection: @groups %> + +There are <%= @groups.count %> groups of users +<%= link_to "Nuevo", new_admin_valuator_group_path %> \ No newline at end of file diff --git a/app/views/admin/valuator_groups/new.html.erb b/app/views/admin/valuator_groups/new.html.erb new file mode 100644 index 000000000..5e0d135c5 --- /dev/null +++ b/app/views/admin/valuator_groups/new.html.erb @@ -0,0 +1,4 @@ +<%= form_for [:admin, @group] do |f| %> + <%= f.text_field :name %> + <%= f.submit %> +<% end %> \ No newline at end of file diff --git a/app/views/admin/valuator_groups/show.html.erb b/app/views/admin/valuator_groups/show.html.erb new file mode 100644 index 000000000..e4151040c --- /dev/null +++ b/app/views/admin/valuator_groups/show.html.erb @@ -0,0 +1,4 @@ +Hey there I'm group <%= @group.name %> + +
+<%= link_to "Ver todos los grupos", admin_valuator_groups_path %> diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index dfb93ed80..c0a11addb 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -2,6 +2,8 @@ <%= render "admin/shared/user_search", url: search_admin_valuators_path %> +<%= link_to "Grupos de evaluadores", admin_valuator_groups_path %> +
<% if @valuators.any? %>

<%= page_entries_info @valuators %>

diff --git a/config/locales/en/user_groups.yml b/config/locales/en/user_groups.yml new file mode 100644 index 000000000..2761145c3 --- /dev/null +++ b/config/locales/en/user_groups.yml @@ -0,0 +1,6 @@ +en: + user_group: + zero: There are 0 groups of valuators + one: There is 1 group de valuators + other: There are '%{count}' groups of valuators + diff --git a/config/locales/es/user_groups.yml b/config/locales/es/user_groups.yml new file mode 100644 index 000000000..eaaba5fc7 --- /dev/null +++ b/config/locales/es/user_groups.yml @@ -0,0 +1,6 @@ +es: + user_group: + zero: Hay 0 grupos de evaluadores + one: Hay 1 grupo de evaluadores + other: Hay '%{count}' grupos de evaluadores + diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 384fb685c..703227679 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -84,6 +84,7 @@ namespace :admin do get :search, on: :collection get :summary, on: :collection end + resources :valuator_groups resources :managers, only: [:index, :create, :destroy] do get :search, on: :collection diff --git a/db/migrate/20180208151658_create_valuator_groups.rb b/db/migrate/20180208151658_create_valuator_groups.rb new file mode 100644 index 000000000..441478cc5 --- /dev/null +++ b/db/migrate/20180208151658_create_valuator_groups.rb @@ -0,0 +1,7 @@ +class CreateValuatorGroups < ActiveRecord::Migration + def change + create_table :valuator_groups do |t| + t.string :name + end + end +end diff --git a/db/schema.rb b/db/schema.rb index a85b3a0dc..ab703cb52 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1053,6 +1053,11 @@ ActiveRecord::Schema.define(version: 20180320104823) do add_index "topics", ["community_id"], name: "index_topics_on_community_id", using: :btree add_index "topics", ["hidden_at"], name: "index_topics_on_hidden_at", using: :btree + create_table "user_groups", force: :cascade do |t| + t.string "name" + t.string "kind" + end + create_table "users", force: :cascade do |t| t.string "email", default: "" t.string "encrypted_password", default: "", null: false @@ -1128,6 +1133,10 @@ ActiveRecord::Schema.define(version: 20180320104823) do t.datetime "updated_at", null: false end + create_table "valuator_groups", force: :cascade do |t| + t.string "name" + end + create_table "valuators", force: :cascade do |t| t.integer "user_id" t.string "description" diff --git a/spec/factories.rb b/spec/factories.rb index 2f9cc4acc..186d37515 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -61,6 +61,9 @@ FactoryBot.define do end end + factory :valuator_group, class: ValuatorGroup do + end + factory :identity do user nil provider "Twitter" diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb new file mode 100644 index 000000000..8f179b024 --- /dev/null +++ b/spec/features/admin/valuator_groups_spec.rb @@ -0,0 +1,66 @@ +require 'rails_helper' + +feature "Valuator groups", :focus do + + let(:admin) { create(:administrator).user } + + background do + login_as(admin) + end + + scenario "Index" do + group1 = create(:valuator_group) + group2 = create(:valuator_group) + + visit admin_valuator_groups_path + + expect(page).to have_content group1.name + expect(page).to have_content group2.name + end + + scenario "Show" do + group = create(:valuator_group) + + visit admin_valuator_group_path(group) + + expect(page).to have_content group.name + end + + scenario "Create" do + visit admin_valuators_path + + click_link "Grupos de evaluadores" + click_link "Nuevo" + + fill_in "valuator_group_name", with: "Health" + click_button "Create Valuator group" + + expect(page).to have_content "User group created successfully" + #expect(page).to have_content "There are 1 groups of valuators" + expect(page).to have_content "Health" + end + + scenario "Update" do + group = create(:valuator_group, name: "Health") + + visit admin_valuator_groups_path + click_link "Edit" + + fill_in "valuator_group_name", with: "Health and Sports" + click_button "Update Valuator group" + + expect(page).to have_content "User group updated successfully" + expect(page).to have_content "Health and Sports" + end + + scenario "Destroy" do + group = create(:valuator_group) + + visit admin_valuator_groups_path + click_link "Destroy" + + expect(page).to have_content "User group destroyed successfully" + expect(page).to have_content "There are 0 groups of users" + end + +end \ No newline at end of file From 1dbbe331c90004a64704ba171929c684f21e61b7 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 8 Feb 2018 20:47:47 +0100 Subject: [PATCH 02/17] Assign valuators to groups --- app/controllers/admin/valuators_controller.rb | 25 ++++++- app/models/abilities/administrator.rb | 2 +- app/models/valuator.rb | 2 + app/models/valuator_group.rb | 1 + app/views/admin/valuator_groups/new.html.erb | 4 +- app/views/admin/valuators/edit.html.erb | 9 +++ app/views/admin/valuators/index.html.erb | 7 ++ app/views/admin/valuators/show.html.erb | 7 ++ config/routes/admin.rb | 2 +- ...8163135_add_valuator_group_to_valuators.rb | 5 ++ db/schema.rb | 1 + spec/features/admin/valuator_groups_spec.rb | 4 +- spec/features/admin/valuators_spec.rb | 68 ++++++++++++++++++- spec/models/valuator_spec.rb | 4 ++ 14 files changed, 132 insertions(+), 9 deletions(-) create mode 100644 app/views/admin/valuators/edit.html.erb create mode 100644 app/views/admin/valuators/show.html.erb create mode 100644 db/migrate/20180208163135_add_valuator_group_to_valuators.rb diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb index 8b454a1a2..5b881c96a 100644 --- a/app/controllers/admin/valuators_controller.rb +++ b/app/controllers/admin/valuators_controller.rb @@ -1,6 +1,10 @@ class Admin::ValuatorsController < Admin::BaseController load_and_authorize_resource + def show + @valuator = Valuator.find(params[:id]) + end + def index @valuators = @valuators.page(params[:page]) end @@ -13,12 +17,27 @@ class Admin::ValuatorsController < Admin::BaseController end def create - @valuator = Valuator.new(create_params) + @valuator = Valuator.new(valuator_params) @valuator.save redirect_to admin_valuators_path end + def edit + @valuator = Valuator.find(params[:id]) + @valuator_groups = ValuatorGroup.all + end + + def update + @valuator = Valuator.find(params[:id]) + if @valuator.update(valuator_params) + notice = "Valuator updated successfully" + redirect_to [:admin, @valuator], notice: notice + else + render :edit + end + end + def destroy @valuator.destroy redirect_to admin_valuators_path @@ -30,9 +49,9 @@ class Admin::ValuatorsController < Admin::BaseController private - def create_params + def valuator_params params[:valuator][:description] = nil if params[:valuator][:description].blank? - params.require(:valuator).permit(:user_id, :description) + params.require(:valuator).permit(:user_id, :description, :valuator_group_id) end end diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 07c9d158d..6f8a70b5e 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -43,7 +43,7 @@ module Abilities can [:search, :create, :index, :destroy], ::Administrator can [:search, :create, :index, :destroy], ::Moderator - can [:search, :create, :index, :destroy, :summary], ::Valuator + can [:search, :show, :edit, :update, :create, :index, :destroy, :summary], ::Valuator can [:search, :create, :index, :destroy], ::Manager can [:search, :index], ::User diff --git a/app/models/valuator.rb b/app/models/valuator.rb index 5df6ea030..85f199adb 100644 --- a/app/models/valuator.rb +++ b/app/models/valuator.rb @@ -1,5 +1,7 @@ class Valuator < ActiveRecord::Base belongs_to :user, touch: true + belongs_to :valuator_group + delegate :name, :email, :name_and_email, to: :user has_many :valuation_assignments, dependent: :destroy diff --git a/app/models/valuator_group.rb b/app/models/valuator_group.rb index d230bd686..ba7fc5edc 100644 --- a/app/models/valuator_group.rb +++ b/app/models/valuator_group.rb @@ -1,2 +1,3 @@ class ValuatorGroup < ActiveRecord::Base + has_many :valuators end \ No newline at end of file diff --git a/app/views/admin/valuator_groups/new.html.erb b/app/views/admin/valuator_groups/new.html.erb index 5e0d135c5..917cb9760 100644 --- a/app/views/admin/valuator_groups/new.html.erb +++ b/app/views/admin/valuator_groups/new.html.erb @@ -1,4 +1,6 @@ <%= form_for [:admin, @group] do |f| %> <%= f.text_field :name %> <%= f.submit %> -<% end %> \ No newline at end of file +<% end %> + +<%= link_to "Go back", admin_valuator_groups_path %> \ No newline at end of file diff --git a/app/views/admin/valuators/edit.html.erb b/app/views/admin/valuators/edit.html.erb new file mode 100644 index 000000000..2915114e6 --- /dev/null +++ b/app/views/admin/valuators/edit.html.erb @@ -0,0 +1,9 @@ +<%= form_for [:admin, @valuator] do |f| %> + <%= f.text_field :description %> + <%= f.select :valuator_group_id, + @valuator_groups.map {|group| [group.name, group.id] }, + { include_blank: true } %> + <%= f.submit %> +<% end %> + +<%= link_to "Go back", admin_valuator_path(@valuator) %> \ No newline at end of file diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index c0a11addb..15cc66235 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -13,6 +13,7 @@ <%= t("admin.valuators.index.name") %> <%= t("admin.valuators.index.email") %> <%= t("admin.valuators.index.description") %> + Grupo <%= t("admin.actions.actions") %> @@ -28,6 +29,12 @@ <% end %> + <%= valuator.valuator_group.try(:name) %> + + + <%= link_to "Edit", + edit_admin_valuator_path(valuator), + class: "button hollow expanded" %> <%= link_to t("admin.valuators.valuator.delete"), admin_valuator_path(valuator), method: :delete, diff --git a/app/views/admin/valuators/show.html.erb b/app/views/admin/valuators/show.html.erb new file mode 100644 index 000000000..eff8fad2a --- /dev/null +++ b/app/views/admin/valuators/show.html.erb @@ -0,0 +1,7 @@ +
Name: <%= @valuator.name %>
+
Description <%= @valuator.description %>
+
Email: <%= @valuator.email %>
+
Group: <%= @valuator.valuator_group.try(:name) %>
+ +<%= link_to "See all evaluators", admin_valuators_path %> +<%= link_to "Edit", edit_admin_valuator_path(@valuator) %> \ No newline at end of file diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 703227679..6bf380f0c 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -80,7 +80,7 @@ namespace :admin do get :search, on: :collection end - resources :valuators, only: [:index, :create, :destroy] do + resources :valuators, only: [:show, :index, :edit, :update, :create, :destroy] do get :search, on: :collection get :summary, on: :collection end diff --git a/db/migrate/20180208163135_add_valuator_group_to_valuators.rb b/db/migrate/20180208163135_add_valuator_group_to_valuators.rb new file mode 100644 index 000000000..93ec65e17 --- /dev/null +++ b/db/migrate/20180208163135_add_valuator_group_to_valuators.rb @@ -0,0 +1,5 @@ +class AddValuatorGroupToValuators < ActiveRecord::Migration + def change + add_column :valuators, :valuator_group_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index ab703cb52..154ced3d7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1142,6 +1142,7 @@ ActiveRecord::Schema.define(version: 20180320104823) do t.string "description" t.integer "spending_proposals_count", default: 0 t.integer "budget_investments_count", default: 0 + t.integer "valuator_group_id" end add_index "valuators", ["user_id"], name: "index_valuators_on_user_id", using: :btree diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb index 8f179b024..391bb441b 100644 --- a/spec/features/admin/valuator_groups_spec.rb +++ b/spec/features/admin/valuator_groups_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature "Valuator groups", :focus do +feature "Valuator groups" do let(:admin) { create(:administrator).user } @@ -63,4 +63,6 @@ feature "Valuator groups", :focus do expect(page).to have_content "There are 0 groups of users" end + pending "When we change the group of a Valuator we should also change the valuator_assignments" + end \ No newline at end of file diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index 25ae57a12..25f8eb3fb 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -9,13 +9,21 @@ feature 'Admin valuators' do visit admin_valuators_path end + scenario "Show", :focus do + visit admin_valuator_path(@valuator) + + expect(page).to have_content @valuator.name + expect(page).to have_content @valuator.description + expect(page).to have_content @valuator.email + end + scenario 'Index' do expect(page).to have_content(@valuator.name) expect(page).to have_content(@valuator.email) expect(page).not_to have_content(@user.name) end - scenario 'Create Valuator', :js do + scenario 'Create', :js do fill_in 'name_or_email', with: @user.email click_button 'Search' @@ -29,7 +37,19 @@ feature 'Admin valuators' do end end - scenario 'Delete Valuator' do + scenario "Edit", :focus do + visit edit_admin_valuator_path(@valuator) + + fill_in 'name_or_email', with: "john@valuators.org" + fill_in 'valuator_description', with: 'Valuator for health' + click_link "Update valuator" + + expect(page).to have_content "Valuator updated successfully" + expect(page).to have_content "john@valuators.org" + expect(page).to have_content "Valuator for health" + end + + scenario 'Destroy' do click_link 'Delete' within('#valuators') do @@ -85,4 +105,48 @@ feature 'Admin valuators' do end end + context "Valuator Group", :focus do + + scenario "Add a valuator to a group" do + valuator = create(:valuator) + group = create(:valuator_group, name: "Health") + + visit edit_admin_valuator_path(valuator) + + select "Health", from: "valuator_valuator_group_id" + click_button "Update Evaluador" + + expect(page).to have_content "Valuator updated successfully" + expect(page).to have_content "Health" + end + + scenario "Update a valuator's group" do + valuator = create(:valuator) + group1 = create(:valuator_group, name: "Health") + group2 = create(:valuator_group, name: "Economy") + member = create(:valuator_group_member, valuator: valuator, valuator_group: group1) + + visit edit_admin_valuator_path(valuator) + select "Economy", from: "valuator_valuator_group_id" + click_button "Update Evaluador" + + expect(page).to have_content "Valuator updated successfully" + expect(page).to have_content "Economy" + end + + scenario "Remove a valuator from a group" do + valuator = create(:valuator) + group1 = create(:valuator_group, name: "Health") + member = create(:valuator_group_member, valuator: valuator, valuator_group: group1) + + visit edit_admin_valuator_path(valuator) + select "", from: "valuator_valuator_group_id" + click_button "Update Evaluador" + + expect(page).to have_content "Valuator updated successfully" + expect(page).to_not have_content "Health" + end + + end + end diff --git a/spec/models/valuator_spec.rb b/spec/models/valuator_spec.rb index c905bd376..c9387a150 100644 --- a/spec/models/valuator_spec.rb +++ b/spec/models/valuator_spec.rb @@ -15,4 +15,8 @@ describe Valuator do expect(valuator.description_or_email).to eq(valuator.email) end end + + describe "Group" do + pending "should reasign investments when the group changes" + end end From ab498d6d9387ab2bacd135446181e83f6dc4500e Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 8 Feb 2018 22:26:02 +0100 Subject: [PATCH 03/17] Assign groups to investments --- .../admin/budget_investments_controller.rb | 3 ++- app/models/budget/investment.rb | 3 +++ .../budget/valuator_group_assignment.rb | 6 +++++ .../admin/budget_investments/edit.html.erb | 11 +++++++- .../admin/budget_investments/show.html.erb | 9 +++++++ ...create_budget_valuator_group_assignment.rb | 8 ++++++ db/schema.rb | 5 ++++ .../features/admin/budget_investments_spec.rb | 27 +++++++++++++++++++ spec/features/admin/valuator_groups_spec.rb | 2 +- spec/features/admin/valuators_spec.rb | 15 +++++------ 10 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 app/models/budget/valuator_group_assignment.rb create mode 100644 db/migrate/20180208200659_create_budget_valuator_group_assignment.rb diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb index 9f885f474..31eb0f24b 100644 --- a/app/controllers/admin/budget_investments_controller.rb +++ b/app/controllers/admin/budget_investments_controller.rb @@ -33,6 +33,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController load_admins load_valuators load_tags + @valuator_groups = ValuatorGroup.all end def update @@ -93,7 +94,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController def budget_investment_params params.require(:budget_investment) .permit(:title, :description, :external_url, :heading_id, :administrator_id, :tag_list, - :valuation_tag_list, :incompatible, :selected, valuator_ids: []) + :valuation_tag_list, :incompatible, :selected, valuator_ids: [], valuator_group_ids: []) end def load_budget diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 53d27a741..993d7e505 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -35,6 +35,9 @@ class Budget has_many :valuator_assignments, dependent: :destroy has_many :valuators, through: :valuator_assignments + has_many :valuator_group_assignments, dependent: :destroy + has_many :valuator_groups, through: :valuator_group_assignments + has_many :comments, -> {where(valuation: false)}, as: :commentable, class_name: 'Comment' has_many :valuations, -> {where(valuation: true)}, as: :commentable, class_name: 'Comment' diff --git a/app/models/budget/valuator_group_assignment.rb b/app/models/budget/valuator_group_assignment.rb new file mode 100644 index 000000000..1aa4331fc --- /dev/null +++ b/app/models/budget/valuator_group_assignment.rb @@ -0,0 +1,6 @@ +class Budget + class ValuatorGroupAssignment < ActiveRecord::Base + belongs_to :valuator_group + belongs_to :investment + end +end \ No newline at end of file diff --git a/app/views/admin/budget_investments/edit.html.erb b/app/views/admin/budget_investments/edit.html.erb index f750c021b..533053530 100644 --- a/app/views/admin/budget_investments/edit.html.erb +++ b/app/views/admin/budget_investments/edit.html.erb @@ -59,6 +59,16 @@ class: 'js-tag-list' %>
+

Groups

+
+ <%= f.label :valuator_ids, "Groups assigned" %> + <%= f.collection_check_boxes :valuator_group_ids, @valuator_groups, :id, :name do |group| %> + + <%= group.label(title: group.object.name) { group.check_box + truncate(group.object.name, length: 60) } %> + <% end %> +
+ +

Valuators

<%= f.label :valuator_ids, t("admin.budget_investments.edit.assigned_valuators") %> @@ -68,7 +78,6 @@
-
<% if @investment.incompatible? || @investment.winner? %>
diff --git a/app/views/admin/budget_investments/show.html.erb b/app/views/admin/budget_investments/show.html.erb index 939830aff..8f11333b4 100644 --- a/app/views/admin/budget_investments/show.html.erb +++ b/app/views/admin/budget_investments/show.html.erb @@ -22,6 +22,15 @@ <%= @investment.tags_on(:valuation).pluck(:name).sort.join(', ') %>

+

+ Valuator Groups: + <% if @investment.valuator_groups.any? %> + <%= @investment.valuator_groups.collect(&:name).join(', ') %> + <% else %> + <%= t("admin.budget_investments.show.undefined") %> + <% end %> +

+

<%= t("admin.budget_investments.show.assigned_valuators") %>: <% if @investment.valuators.any? %> diff --git a/db/migrate/20180208200659_create_budget_valuator_group_assignment.rb b/db/migrate/20180208200659_create_budget_valuator_group_assignment.rb new file mode 100644 index 000000000..916ed298e --- /dev/null +++ b/db/migrate/20180208200659_create_budget_valuator_group_assignment.rb @@ -0,0 +1,8 @@ +class CreateBudgetValuatorGroupAssignment < ActiveRecord::Migration + def change + create_table :budget_valuator_group_assignments do |t| + t.integer :valuator_group_id + t.integer :investment_id + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 154ced3d7..45deca085 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -203,6 +203,11 @@ ActiveRecord::Schema.define(version: 20180320104823) do add_index "budget_valuator_assignments", ["investment_id"], name: "index_budget_valuator_assignments_on_investment_id", using: :btree + create_table "budget_valuator_group_assignments", force: :cascade do |t| + t.integer "valuator_group_id" + t.integer "investment_id" + end + create_table "budgets", force: :cascade do |t| t.string "name", limit: 80 t.string "currency_symbol", limit: 10 diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 9eb548c30..983f1ed8a 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -579,6 +579,33 @@ feature 'Admin budget investments' do end end + scenario "Add valuator group" do + budget_investment = create(:budget_investment) + + health_group = create(:valuator_group, name: "Health") + economy_group = create(:valuator_group, name: "Economy") + culture_group = create(:valuator_group, name: "Culture") + + visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment) + click_link 'Edit classification' + + check "budget_investment_valuator_group_ids_#{health_group.id}" + check "budget_investment_valuator_group_ids_#{culture_group.id}" + + click_button 'Update' + + expect(page).to have_content 'Investment project updated succesfully.' + + within('#assigned_valuator_groups') do + expect(page).to have_content('Health') + expect(page).to have_content('Culture') + expect(page).not_to have_content('Undefined') + expect(page).not_to have_content('Economy') + end + end + + pending "Do not display valuators of an assigned group" + scenario "Adds existing valuation tags", :js do budget_investment1 = create(:budget_investment) budget_investment1.set_tag_list_on(:valuation, 'Education, Health') diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb index 391bb441b..6ac10e59c 100644 --- a/spec/features/admin/valuator_groups_spec.rb +++ b/spec/features/admin/valuator_groups_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature "Valuator groups" do +feature "Valuator groups", :focus do let(:admin) { create(:administrator).user } diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index 25f8eb3fb..bac000c6d 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature 'Admin valuators' do +feature 'Admin valuators', :focus do background do @admin = create(:administrator) @user = create(:user, username: 'Jose Luis Balbin') @@ -37,15 +37,14 @@ feature 'Admin valuators' do end end - scenario "Edit", :focus do + scenario "Edit" do visit edit_admin_valuator_path(@valuator) - fill_in 'name_or_email', with: "john@valuators.org" fill_in 'valuator_description', with: 'Valuator for health' - click_link "Update valuator" + click_button "Update Evaluador" expect(page).to have_content "Valuator updated successfully" - expect(page).to have_content "john@valuators.org" + expect(page).to have_content @valuator.email expect(page).to have_content "Valuator for health" end @@ -105,7 +104,7 @@ feature 'Admin valuators' do end end - context "Valuator Group", :focus do + context "Valuator Group" do scenario "Add a valuator to a group" do valuator = create(:valuator) @@ -124,7 +123,7 @@ feature 'Admin valuators' do valuator = create(:valuator) group1 = create(:valuator_group, name: "Health") group2 = create(:valuator_group, name: "Economy") - member = create(:valuator_group_member, valuator: valuator, valuator_group: group1) + valuator.update(valuator_group: group1) visit edit_admin_valuator_path(valuator) select "Economy", from: "valuator_valuator_group_id" @@ -137,7 +136,7 @@ feature 'Admin valuators' do scenario "Remove a valuator from a group" do valuator = create(:valuator) group1 = create(:valuator_group, name: "Health") - member = create(:valuator_group_member, valuator: valuator, valuator_group: group1) + valuator.update(valuator_group: group1) visit edit_admin_valuator_path(valuator) select "", from: "valuator_valuator_group_id" From 13d0b08cb4d8d3cba9ee500f71dcd291be12e695 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 9 Feb 2018 17:10:17 +0100 Subject: [PATCH 04/17] =?UTF-8?q?Adds=20styles=20and=20missing=20i18n=20fo?= =?UTF-8?q?r=20valuator=20groups=20=F0=9F=91=A8=F0=9F=8F=BB=E2=80=8D?= =?UTF-8?q?=F0=9F=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/valuators_controller.rb | 2 +- .../admin/budget_investments/edit.html.erb | 55 ++++++++++--------- .../admin/budget_investments/show.html.erb | 2 +- .../admin/valuator_groups/_group.html.erb | 33 ++++++----- app/views/admin/valuator_groups/edit.html.erb | 13 +++-- .../admin/valuator_groups/index.html.erb | 25 ++++++++- app/views/admin/valuator_groups/new.html.erb | 13 +++-- app/views/admin/valuator_groups/show.html.erb | 7 ++- app/views/admin/valuators/edit.html.erb | 27 ++++++--- app/views/admin/valuators/index.html.erb | 22 +++++--- app/views/admin/valuators/show.html.erb | 35 ++++++++++-- config/locales/en/admin.yml | 30 +++++++++- config/locales/es/admin.yml | 29 ++++++++++ 13 files changed, 210 insertions(+), 83 deletions(-) diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb index 5b881c96a..cb1960529 100644 --- a/app/controllers/admin/valuators_controller.rb +++ b/app/controllers/admin/valuators_controller.rb @@ -31,7 +31,7 @@ class Admin::ValuatorsController < Admin::BaseController def update @valuator = Valuator.find(params[:id]) if @valuator.update(valuator_params) - notice = "Valuator updated successfully" + notice = t("admin.valuators.form.updated") redirect_to [:admin, @valuator], notice: notice else render :edit diff --git a/app/views/admin/budget_investments/edit.html.erb b/app/views/admin/budget_investments/edit.html.erb index 533053530..fc56f88df 100644 --- a/app/views/admin/budget_investments/edit.html.erb +++ b/app/views/admin/budget_investments/edit.html.erb @@ -9,7 +9,7 @@ <%= hidden_field_tag filter_name, filter_value %> <% end %> -

+
<%= f.text_field :title, maxlength: Budget::Investment.title_max_length %>
@@ -26,22 +26,26 @@
- <%= f.text_field :external_url %> -
+
+ <%= f.text_field :external_url %> +
-
- <%= f.select :heading_id, budget_heading_select_options(@budget), include_blank: t("admin.budget_investments.edit.select_heading") %> +
+ <%= f.select :heading_id, budget_heading_select_options(@budget), include_blank: t("admin.budget_investments.edit.select_heading") %> +
-

<%= t("admin.budget_investments.edit.classification") %>

- -
+
- <%= f.select(:administrator_id, - @admins.collect{ |a| [a.name_and_email, a.id ] }, - { include_blank: t("admin.budget_investments.edit.undefined") }) %> +

<%= t("admin.budget_investments.edit.classification") %>

+ +
+ <%= f.select(:administrator_id, + @admins.collect{ |a| [a.name_and_email, a.id ] }, + { include_blank: t("admin.budget_investments.edit.undefined") }) %> +
@@ -59,26 +63,27 @@ class: 'js-tag-list' %>
-

Groups

-
- <%= f.label :valuator_ids, "Groups assigned" %> +
+ <%= f.label :valuator_ids, t("admin.budget_investments.edit.user_groups") %> +
    <%= f.collection_check_boxes :valuator_group_ids, @valuator_groups, :id, :name do |group| %> - - <%= group.label(title: group.object.name) { group.check_box + truncate(group.object.name, length: 60) } %> +
  • <%= group.label(title: group.object.name) { group.check_box + truncate(group.object.name, length: 60) } %>
    • <% end %> +
- -

Valuators

-
- <%= f.label :valuator_ids, t("admin.budget_investments.edit.assigned_valuators") %> - <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %> - <%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %> - <% end %> +
+
+ <%= f.label :valuator_ids, t("admin.budget_investments.edit.assigned_valuators") %> +
    + <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %> +
  • <%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %>
    • + <% end %> +
-
+
<% if @investment.incompatible? || @investment.winner? %>

<%= t("admin.budget_investments.edit.compatibility") %>

@@ -97,7 +102,7 @@
-
+
<%= f.submit(class: "button", value: t("admin.budget_investments.edit.submit_button")) %>
<% end %> diff --git a/app/views/admin/budget_investments/show.html.erb b/app/views/admin/budget_investments/show.html.erb index 8f11333b4..d7f905080 100644 --- a/app/views/admin/budget_investments/show.html.erb +++ b/app/views/admin/budget_investments/show.html.erb @@ -23,7 +23,7 @@

- Valuator Groups: + <%= t("admin.budget_investments.show.valuator_groups") %>: <% if @investment.valuator_groups.any? %> <%= @investment.valuator_groups.collect(&:name).join(', ') %> <% else %> diff --git a/app/views/admin/valuator_groups/_group.html.erb b/app/views/admin/valuator_groups/_group.html.erb index e47de79da..2b2df99f9 100644 --- a/app/views/admin/valuator_groups/_group.html.erb +++ b/app/views/admin/valuator_groups/_group.html.erb @@ -1,18 +1,17 @@ -

- Name: <%= group.name %> -
+ + + <%= link_to group.name, admin_valuator_group_path(group) %> + + + + + + <%= link_to t("admin.actions.delete"), + admin_valuator_group_path(group), + method: :delete, class: "button hollow alert" %> -
- Members: -
- -
- Edit: - <%= link_to "Edit", edit_admin_valuator_group_path(group) %> -
- -
- Destoy: - <%= link_to "Destroy", admin_valuator_group_path(group), method: :delete %> -
-
\ No newline at end of file + <%= link_to t("admin.actions.edit"), + edit_admin_valuator_group_path(group), + class: "button hollow" %> + + diff --git a/app/views/admin/valuator_groups/edit.html.erb b/app/views/admin/valuator_groups/edit.html.erb index 5e0d135c5..fe57117b6 100644 --- a/app/views/admin/valuator_groups/edit.html.erb +++ b/app/views/admin/valuator_groups/edit.html.erb @@ -1,4 +1,9 @@ -<%= form_for [:admin, @group] do |f| %> - <%= f.text_field :name %> - <%= f.submit %> -<% end %> \ No newline at end of file +<%= back_link_to admin_valuator_groups_path %> + +
+ <%= form_for [:admin, @group] do |f| %> + <%= f.label :name, t("admin.valuator_groups.form.name") %> + <%= f.text_field :name, label: false %> + <%= f.submit t("admin.valuator_groups.form.edit"), class: "button success" %> + <% end %> +
\ No newline at end of file diff --git a/app/views/admin/valuator_groups/index.html.erb b/app/views/admin/valuator_groups/index.html.erb index b92987c08..358fa0bc1 100644 --- a/app/views/admin/valuator_groups/index.html.erb +++ b/app/views/admin/valuator_groups/index.html.erb @@ -1,4 +1,23 @@ -<%= render partial: 'group', collection: @groups %> +

<%= t("admin.valuator_groups.index.title") %>

-There are <%= @groups.count %> groups of users -<%= link_to "Nuevo", new_admin_valuator_group_path %> \ No newline at end of file +<%= link_to t("admin.valuator_groups.index.new"), new_admin_valuator_group_path, class: "button float-right" %> + +<% if @groups.any? %> +

There are <%= @groups.count %> groups of users

+ + + + + + + + + <%= render partial: 'group', collection: @groups %> + +
<%= t("admin.valuator_groups.index.name") %><%= t("admin.valuator_groups.index.members") %><%= t("admin.shared.actions") %>
+ +<% else %> +
+ <%= t("admin.valuator_groups.index.no_groups") %> +
+<% end %> diff --git a/app/views/admin/valuator_groups/new.html.erb b/app/views/admin/valuator_groups/new.html.erb index 917cb9760..d79f22d85 100644 --- a/app/views/admin/valuator_groups/new.html.erb +++ b/app/views/admin/valuator_groups/new.html.erb @@ -1,6 +1,9 @@ -<%= form_for [:admin, @group] do |f| %> - <%= f.text_field :name %> - <%= f.submit %> -<% end %> +<%= back_link_to admin_valuator_groups_path %> -<%= link_to "Go back", admin_valuator_groups_path %> \ No newline at end of file +
+ <%= form_for [:admin, @group] do |f| %> + <%= f.label :name, t("admin.valuator_groups.form.name") %> + <%= f.text_field :name, label: false %> + <%= f.submit t("admin.valuator_groups.form.new"), class: "button success" %> + <% end %> +
diff --git a/app/views/admin/valuator_groups/show.html.erb b/app/views/admin/valuator_groups/show.html.erb index e4151040c..d8dd07843 100644 --- a/app/views/admin/valuator_groups/show.html.erb +++ b/app/views/admin/valuator_groups/show.html.erb @@ -1,4 +1,5 @@ -Hey there I'm group <%= @group.name %> +<%= back_link_to admin_valuator_groups_path %> -
-<%= link_to "Ver todos los grupos", admin_valuator_groups_path %> +

<%= t("admin.valuator_groups.show.title", group: @group.name) %>

+ + diff --git a/app/views/admin/valuators/edit.html.erb b/app/views/admin/valuators/edit.html.erb index 2915114e6..89b583d85 100644 --- a/app/views/admin/valuators/edit.html.erb +++ b/app/views/admin/valuators/edit.html.erb @@ -1,9 +1,20 @@ -<%= form_for [:admin, @valuator] do |f| %> - <%= f.text_field :description %> - <%= f.select :valuator_group_id, - @valuator_groups.map {|group| [group.name, group.id] }, - { include_blank: true } %> - <%= f.submit %> -<% end %> +<%= back_link_to admin_valuators_path %> -<%= link_to "Go back", admin_valuator_path(@valuator) %> \ No newline at end of file +

<%= t("admin.valuators.form.edit_title") %>

+ +
+ <%= @valuator.name %>
+ <%= @valuator.email %> +
+ +
+ <%= form_for [:admin, @valuator] do |f| %> + <%= f.text_field :description %> +
+ <%= f.select :valuator_group_id, + @valuator_groups.map {|group| [group.name, group.id] }, + { include_blank: true } %> +
+ <%= f.submit t("admin.valuators.form.update"), class: "button success" %> + <% end %> +
diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index 15cc66235..902067588 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -1,9 +1,9 @@ -

<%= t("admin.valuators.index.title") %>

+

<%= t("admin.valuators.index.title") %>

+ +<%= link_to t("admin.valuators.index.valuator_groups"), admin_valuator_groups_path, class: "button hollow float-right" %> <%= render "admin/shared/user_search", url: search_admin_valuators_path %> -<%= link_to "Grupos de evaluadores", admin_valuator_groups_path %> -
<% if @valuators.any? %>

<%= page_entries_info @valuators %>

@@ -13,13 +13,13 @@ <%= t("admin.valuators.index.name") %> <%= t("admin.valuators.index.email") %> <%= t("admin.valuators.index.description") %> - Grupo + <%= t("admin.valuators.index.group") %> <%= t("admin.actions.actions") %> <% @valuators.each do |valuator| %> - <%= valuator.name %> + <%= link_to valuator.name, admin_valuator_path(valuator) %> <%= valuator.email %> <% if valuator.description.present? %> @@ -29,16 +29,20 @@ <% end %> - <%= valuator.valuator_group.try(:name) %> + <% if valuator.valuator_group.present? %> + <%= valuator.valuator_group.try(:name) %> + <% else %> + <%= t("admin.valuators.index.no_group") %> + <% end %> - <%= link_to "Edit", + <%= link_to t("admin.actions.edit"), edit_admin_valuator_path(valuator), - class: "button hollow expanded" %> + class: "button hollow" %> <%= link_to t("admin.valuators.valuator.delete"), admin_valuator_path(valuator), method: :delete, - class: "button hollow alert expanded" %> + class: "button hollow alert" %> <% end %> diff --git a/app/views/admin/valuators/show.html.erb b/app/views/admin/valuators/show.html.erb index eff8fad2a..f1768c42f 100644 --- a/app/views/admin/valuators/show.html.erb +++ b/app/views/admin/valuators/show.html.erb @@ -1,7 +1,30 @@ -
Name: <%= @valuator.name %>
-
Description <%= @valuator.description %>
-
Email: <%= @valuator.email %>
-
Group: <%= @valuator.valuator_group.try(:name) %>
+<%= back_link_to admin_valuators_path %> -<%= link_to "See all evaluators", admin_valuators_path %> -<%= link_to "Edit", edit_admin_valuator_path(@valuator) %> \ No newline at end of file +<%= link_to t("admin.actions.edit"), edit_admin_valuator_path(@valuator), class: "button hollow float-right" %> + +
+ +

<%= @valuator.name %>

+ +
+

+ <%= t("admin.valuators.show.email") %>
+ <%= @valuator.email %> +

+

+ <%= t("admin.valuators.show.description") %>
+ <% if @valuator.description.present? %> + <%= @valuator.description %> + <% else %> + <%= t("admin.valuators.show.no_description") %> + <% end %> +

+

+ <%= t("admin.valuators.show.group") %>
+ <% if @valuator.valuator_group.present? %> + <%= @valuator.valuator_group.try(:name) %> + <% else %> + <%= t("admin.valuators.show.no_group") %> + <% end %> +

+
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 97d00be77..2929db58a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -13,6 +13,7 @@ en: unmark_featured: Unmark featured edit: Edit configure: Configure + delete: Delete banners: index: title: Banners @@ -176,7 +177,6 @@ en: undecided: "Undecided" selected: "Selected" select: "Select" - download_current_selection: "Download current selection" table_id: "ID" table_title: "Title" table_supports: "Supports" @@ -223,6 +223,7 @@ en: documents: "Documents" see_documents: "See documents (%{count})" no_documents: "Without documents" + valuator_groups: "Valuator Groups" edit: classification: Classification compatibility: Compatibility @@ -236,6 +237,7 @@ en: tags: Tags tags_placeholder: "Write the tags you want separated by commas (,)" undefined: Undefined + user_groups: "Groups" search_unfeasible: Search unfeasible milestones: index: @@ -581,6 +583,9 @@ en: description: Description no_description: No description no_valuators: There are no valuators. + valuator_groups: "Valuator Groups" + group: "Group" + no_group: "No group" valuator: description_placeholder: 'Description (optional)' add: Add to valuators @@ -596,6 +601,29 @@ en: in_evaluation_count: In evaluation total_count: Total cost: Cost + form: + edit_title: "Valuators: Edit valuator" + update: "Update valuator" + updated: "Valuator updated successfully" + show: + description: "Description" + email: "Email" + group: "Group" + no_description: "Without description" + no_group: "Without group" + valuator_groups: + index: + title: "Valuator groups" + new: "Create valuators group" + name: "Name" + members: "Members" + no_groups: "There are no valuator groups" + show: + title: "Valuators group: %{group}" + form: + name: "Group name" + new: "Create valuators group" + edit: "Save valuators group" poll_officers: index: title: Poll officers diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index af2ee9511..0502e2bf3 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -13,6 +13,7 @@ es: unmark_featured: Quitar destacado edit: Editar configure: Configurar + delete: Borrar banners: index: title: Banners @@ -222,6 +223,7 @@ es: documents: "Documentos" see_documents: "Ver documentos (%{count})" no_documents: "Sin documentos" + valuator_groups: "Grupos de evaluadores" edit: classification: Clasificación compatibility: Compatibilidad @@ -235,6 +237,7 @@ es: tags: Etiquetas tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)" undefined: Sin definir + user_groups: "Grupos" search_unfeasible: Buscar inviables milestones: index: @@ -580,6 +583,9 @@ es: description: Descripción no_description: Sin descripción no_valuators: No hay evaluadores. + valuator_groups: "Grupo de evaluadores" + group: "Grupo" + no_group: "Sin grupo" valuator: description_placeholder: 'Descripción (opcional)' add: Añadir como evaluador @@ -595,6 +601,29 @@ es: in_evaluation_count: En evaluación total_count: Total cost: Coste total + form: + edit_title: "Evaluadores: Editar evaluador" + update: "Actualizar evaluador" + updated: "Evaluador actualizado correctamente" + show: + description: "Descripción" + email: "Email" + group: "Grupo" + no_description: "Sin descripción" + no_group: "Sin grupo" + valuator_groups: + index: + title: "Grupos de evaluadores" + new: "Crear grupo de evaluadores" + name: "Nombre" + members: "Miembros" + no_groups: "No hay grupos de evaluadores" + show: + title: "Grupo de evaluadores: %{group}" + form: + name: "Nombre del grupo" + new: "Crear grupo de evaluadores" + edit: "Guardar grupo de evaluadores" poll_officers: index: title: Presidentes de mesa From 3163293626f1c2fca782c28ff06af80f1881945d Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 9 Feb 2018 17:16:17 +0100 Subject: [PATCH 05/17] Improves valuator groups index count --- app/controllers/admin/valuator_groups_controller.rb | 2 +- app/views/admin/valuator_groups/index.html.erb | 3 ++- config/locales/en/activerecord.yml | 7 +++++-- config/locales/es/activerecord.yml | 3 +++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/valuator_groups_controller.rb b/app/controllers/admin/valuator_groups_controller.rb index 876900ac1..327e820a1 100644 --- a/app/controllers/admin/valuator_groups_controller.rb +++ b/app/controllers/admin/valuator_groups_controller.rb @@ -1,7 +1,7 @@ class Admin::ValuatorGroupsController < Admin::BaseController def index - @groups = ValuatorGroup.all + @groups = ValuatorGroup.all.page(params[:page]) end def show diff --git a/app/views/admin/valuator_groups/index.html.erb b/app/views/admin/valuator_groups/index.html.erb index 358fa0bc1..eada85e25 100644 --- a/app/views/admin/valuator_groups/index.html.erb +++ b/app/views/admin/valuator_groups/index.html.erb @@ -3,7 +3,7 @@ <%= link_to t("admin.valuator_groups.index.new"), new_admin_valuator_group_path, class: "button float-right" %> <% if @groups.any? %> -

There are <%= @groups.count %> groups of users

+

<%= page_entries_info @groups %>

@@ -16,6 +16,7 @@
+ <%= paginate @groups %> <% else %>
<%= t("admin.valuator_groups.index.no_groups") %> diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 765f92932..2d5163cb0 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -32,8 +32,11 @@ en: one: "Administrator" other: "Administrators" valuator: - one: "Evaluador" - other: "Evaluadores" + one: "Valuator" + other: "Valuators" + valuator_group: + one: "Valuator group" + other: "Valuator groups" manager: one: "Manager" other: "Managers" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 9e195bd25..d3a0c776a 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -34,6 +34,9 @@ es: valuator: one: "Evaluador" other: "Evaluadores" + valuator_group: + one: "Grupo de Evaluadores" + other: "Grupos de Evaluadores" manager: one: "Gestor" other: "Gestores" From d7c822c61a1b8381e764b4f2374d9f54e47c14f2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 9 Feb 2018 17:21:48 +0100 Subject: [PATCH 06/17] Adds missing i18n to valuator groups notices --- app/controllers/admin/valuator_groups_controller.rb | 6 +++--- config/locales/en/user_groups.yml | 5 ++++- config/locales/es/user_groups.yml | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/valuator_groups_controller.rb b/app/controllers/admin/valuator_groups_controller.rb index 327e820a1..e3d032304 100644 --- a/app/controllers/admin/valuator_groups_controller.rb +++ b/app/controllers/admin/valuator_groups_controller.rb @@ -19,7 +19,7 @@ class Admin::ValuatorGroupsController < Admin::BaseController def create @group = ValuatorGroup.new(group_params) if @group.save - notice = "User group created successfully" + notice = t("user_group.notice.created") redirect_to [:admin, @group], notice: notice else render :new @@ -29,7 +29,7 @@ class Admin::ValuatorGroupsController < Admin::BaseController def update @group = ValuatorGroup.find(params[:id]) if @group.update(group_params) - notice = "User group updated successfully" + notice = t("user_group.notice.updated") redirect_to [:admin, @group], notice: notice else render :edit @@ -39,7 +39,7 @@ class Admin::ValuatorGroupsController < Admin::BaseController def destroy @group = ValuatorGroup.find(params[:id]) @group.destroy - notice = "User group destroyed successfully" + notice = t("user_group.notice.destroyed") redirect_to admin_valuator_groups_path, notice: notice end diff --git a/config/locales/en/user_groups.yml b/config/locales/en/user_groups.yml index 2761145c3..a3246df92 100644 --- a/config/locales/en/user_groups.yml +++ b/config/locales/en/user_groups.yml @@ -3,4 +3,7 @@ en: zero: There are 0 groups of valuators one: There is 1 group de valuators other: There are '%{count}' groups of valuators - + notice: + created: "User group created successfully" + updated: "User group updated successfully" + destroyed: "User group destroyed successfully" diff --git a/config/locales/es/user_groups.yml b/config/locales/es/user_groups.yml index eaaba5fc7..18d8114c9 100644 --- a/config/locales/es/user_groups.yml +++ b/config/locales/es/user_groups.yml @@ -3,4 +3,7 @@ es: zero: Hay 0 grupos de evaluadores one: Hay 1 grupo de evaluadores other: Hay '%{count}' grupos de evaluadores - + notice: + created: "Grupo de usuarios creado correctamente" + updated: "Grupo de usuarios actualizado correctamente" + destroyed: "Grupo de usuarios eliminado correctamente" From 573a272ff9bff0364a863c3babd2eb41c812324d Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 9 Feb 2018 17:23:20 +0100 Subject: [PATCH 07/17] Changes redirect path on create valuator group --- app/controllers/admin/valuator_groups_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/valuator_groups_controller.rb b/app/controllers/admin/valuator_groups_controller.rb index e3d032304..054fe15ce 100644 --- a/app/controllers/admin/valuator_groups_controller.rb +++ b/app/controllers/admin/valuator_groups_controller.rb @@ -20,7 +20,7 @@ class Admin::ValuatorGroupsController < Admin::BaseController @group = ValuatorGroup.new(group_params) if @group.save notice = t("user_group.notice.created") - redirect_to [:admin, @group], notice: notice + redirect_to admin_valuator_groups_path, notice: notice else render :new end From 6c68e9f8e77ba6e651bb5800039e45f247a4eb9e Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 9 Feb 2018 18:16:07 +0100 Subject: [PATCH 08/17] Fixes specs --- config/i18n-tasks.yml | 1 + config/locales/en/user_groups.yml | 5 +---- config/locales/es/user_groups.yml | 3 --- spec/features/admin/valuator_groups_spec.rb | 18 +++++++++--------- spec/features/admin/valuators_spec.rb | 8 ++++---- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index f2a7c41a3..41bf3e604 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -42,6 +42,7 @@ data: - config/locales/%{locale}/documents.yml - config/locales/%{locale}/images.yml - config/locales/%{locale}/guides.yml + - config/locales/%{locale}/user_groups.yml # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom: # `i18n-tasks normalize -p` will force move the keys according to these rules diff --git a/config/locales/en/user_groups.yml b/config/locales/en/user_groups.yml index a3246df92..6b44b5495 100644 --- a/config/locales/en/user_groups.yml +++ b/config/locales/en/user_groups.yml @@ -1,9 +1,6 @@ en: user_group: - zero: There are 0 groups of valuators - one: There is 1 group de valuators - other: There are '%{count}' groups of valuators notice: created: "User group created successfully" updated: "User group updated successfully" - destroyed: "User group destroyed successfully" + destroyed: "User group deleted successfully" diff --git a/config/locales/es/user_groups.yml b/config/locales/es/user_groups.yml index 18d8114c9..5f4d690cf 100644 --- a/config/locales/es/user_groups.yml +++ b/config/locales/es/user_groups.yml @@ -1,8 +1,5 @@ es: user_group: - zero: Hay 0 grupos de evaluadores - one: Hay 1 grupo de evaluadores - other: Hay '%{count}' grupos de evaluadores notice: created: "Grupo de usuarios creado correctamente" updated: "Grupo de usuarios actualizado correctamente" diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb index 6ac10e59c..9b888dfc8 100644 --- a/spec/features/admin/valuator_groups_spec.rb +++ b/spec/features/admin/valuator_groups_spec.rb @@ -29,14 +29,14 @@ feature "Valuator groups", :focus do scenario "Create" do visit admin_valuators_path - click_link "Grupos de evaluadores" - click_link "Nuevo" + click_link "Valuator Groups" + click_link "Create valuators group" fill_in "valuator_group_name", with: "Health" - click_button "Create Valuator group" + click_button "Create valuators group" expect(page).to have_content "User group created successfully" - #expect(page).to have_content "There are 1 groups of valuators" + expect(page).to have_content "There is 1 valuator group" expect(page).to have_content "Health" end @@ -47,20 +47,20 @@ feature "Valuator groups", :focus do click_link "Edit" fill_in "valuator_group_name", with: "Health and Sports" - click_button "Update Valuator group" + click_button "Save valuators group" expect(page).to have_content "User group updated successfully" expect(page).to have_content "Health and Sports" end - scenario "Destroy" do + scenario "Delete" do group = create(:valuator_group) visit admin_valuator_groups_path - click_link "Destroy" + click_link "Delete" - expect(page).to have_content "User group destroyed successfully" - expect(page).to have_content "There are 0 groups of users" + expect(page).to have_content "User group deleted successfully" + expect(page).to have_content "There are no valuator groups" end pending "When we change the group of a Valuator we should also change the valuator_assignments" diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index bac000c6d..47ee1c255 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -41,7 +41,7 @@ feature 'Admin valuators', :focus do visit edit_admin_valuator_path(@valuator) fill_in 'valuator_description', with: 'Valuator for health' - click_button "Update Evaluador" + click_button "Update valuator" expect(page).to have_content "Valuator updated successfully" expect(page).to have_content @valuator.email @@ -113,7 +113,7 @@ feature 'Admin valuators', :focus do visit edit_admin_valuator_path(valuator) select "Health", from: "valuator_valuator_group_id" - click_button "Update Evaluador" + click_button "Update valuator" expect(page).to have_content "Valuator updated successfully" expect(page).to have_content "Health" @@ -127,7 +127,7 @@ feature 'Admin valuators', :focus do visit edit_admin_valuator_path(valuator) select "Economy", from: "valuator_valuator_group_id" - click_button "Update Evaluador" + click_button "Update valuator" expect(page).to have_content "Valuator updated successfully" expect(page).to have_content "Economy" @@ -140,7 +140,7 @@ feature 'Admin valuators', :focus do visit edit_admin_valuator_path(valuator) select "", from: "valuator_valuator_group_id" - click_button "Update Evaluador" + click_button "Update valuator" expect(page).to have_content "Valuator updated successfully" expect(page).to_not have_content "Health" From bb82d533a338e35406f2da4096935b6c7618fb4f Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 9 Feb 2018 20:42:40 +0100 Subject: [PATCH 09/17] Display valuators on valuator group's show --- app/views/admin/valuator_groups/show.html.erb | 9 ++++++++- spec/features/admin/valuator_groups_spec.rb | 12 ++++++++++-- spec/features/admin/valuators_spec.rb | 4 ++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/views/admin/valuator_groups/show.html.erb b/app/views/admin/valuator_groups/show.html.erb index d8dd07843..2cd295a3f 100644 --- a/app/views/admin/valuator_groups/show.html.erb +++ b/app/views/admin/valuator_groups/show.html.erb @@ -2,4 +2,11 @@

<%= t("admin.valuator_groups.show.title", group: @group.name) %>

- +
    + <% @group.valuators.each do |valuator| %> +
  • + <%= link_to valuator.description_or_email, + admin_valuator_path(valuator) %> +
    • + <% end %> +
diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb index 9b888dfc8..29bd338d9 100644 --- a/spec/features/admin/valuator_groups_spec.rb +++ b/spec/features/admin/valuator_groups_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature "Valuator groups", :focus do +feature "Valuator groups" do let(:admin) { create(:administrator).user } @@ -18,12 +18,20 @@ feature "Valuator groups", :focus do expect(page).to have_content group2.name end - scenario "Show" do + scenario "Show", :focus do group = create(:valuator_group) + valuator1 = create(:valuator, valuator_group: group) + valuator2 = create(:valuator, valuator_group: group) + valuator3 = create(:valuator, valuator_group: nil) visit admin_valuator_group_path(group) expect(page).to have_content group.name + + within("#valuators") do + expect(page).to have_link(valuator1.email, href: admin_valuator_path(valuator1)) + expect(page).to have_link(valuator2.email, href: admin_valuator_path(valuator2)) + end end scenario "Create" do diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index 47ee1c255..df9b91abb 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature 'Admin valuators', :focus do +feature 'Admin valuators' do background do @admin = create(:administrator) @user = create(:user, username: 'Jose Luis Balbin') @@ -9,7 +9,7 @@ feature 'Admin valuators', :focus do visit admin_valuators_path end - scenario "Show", :focus do + scenario "Show" do visit admin_valuator_path(@valuator) expect(page).to have_content @valuator.name From 7e839e78153aa12e95e8582ea1f4d1306ff1516d Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 9 Feb 2018 21:01:56 +0100 Subject: [PATCH 10/17] Filter by valuator group --- .../admin/budget_investments_controller.rb | 6 +++- app/helpers/valuation_helper.rb | 10 ++++++ app/models/budget/investment.rb | 28 ++++++++-------- .../admin/budget_investments/index.html.erb | 8 +++++ config/locales/en/admin.yml | 2 ++ config/locales/es/admin.yml | 2 ++ .../features/admin/budget_investments_spec.rb | 33 +++++++++++++++++++ 7 files changed, 75 insertions(+), 14 deletions(-) diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb index 31eb0f24b..63fd316a6 100644 --- a/app/controllers/admin/budget_investments_controller.rb +++ b/app/controllers/admin/budget_investments_controller.rb @@ -32,8 +32,8 @@ class Admin::BudgetInvestmentsController < Admin::BaseController def edit load_admins load_valuators + load_valuator_groups load_tags - @valuator_groups = ValuatorGroup.all end def update @@ -113,6 +113,10 @@ class Admin::BudgetInvestmentsController < Admin::BaseController @valuators = Valuator.includes(:user).all.order(description: :asc).order("users.email ASC") end + def load_valuator_groups + @valuator_groups = ValuatorGroup.all.order(name: :asc) + end + def load_tags @tags = Budget::Investment.tags_on(:valuation).order(:name).uniq end diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb index cc6a8e741..3a7e3dba7 100644 --- a/app/helpers/valuation_helper.rb +++ b/app/helpers/valuation_helper.rb @@ -10,6 +10,16 @@ module ValuationHelper end end + def valuator_group_select_options(group = nil) + if group.present? + ValuatorGroup.where.not(id: group.id).order("name ASC") + .collect { |g| [ g.name, g.id ] } + .prepend([valuator.name, valuator.id]) + else + ValuatorGroup.order("name ASC").collect { |g| [ g.name, g.id ] } + end + end + def assigned_valuators_info(valuators) case valuators.size when 0 diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 993d7e505..34565a7d4 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -79,12 +79,13 @@ class Budget scope :unselected, -> { not_unfeasible.where(selected: false) } scope :last_week, -> { where("created_at >= ?", 7.days.ago)} - scope :by_group, ->(group_id) { where(group_id: group_id) } - scope :by_heading, ->(heading_id) { where(heading_id: heading_id) } - scope :by_admin, ->(admin_id) { where(administrator_id: admin_id) } - scope :by_tag, ->(tag_name) { tagged_with(tag_name) } - scope :by_valuator, ->(valuator_id) { where("budget_valuator_assignments.valuator_id = ?", valuator_id).joins(:valuator_assignments) } - scope :by_budget, ->(budget) { where(budget: budget) } + scope :by_budget, ->(budget) { where(budget: budget) } + scope :by_group, ->(group_id) { where(group_id: group_id) } + scope :by_heading, ->(heading_id) { where(heading_id: heading_id) } + scope :by_admin, ->(admin_id) { where(administrator_id: admin_id) } + scope :by_tag, ->(tag_name) { tagged_with(tag_name) } + scope :by_valuator, ->(valuator_id) { where("budget_valuator_assignments.valuator_id = ?", valuator_id).joins(:valuator_assignments) } + scope :by_valuator_group, ->(valuator_group_id) { where("budget_valuator_group_assignments.valuator_group_id = ?", valuator_group_id).joins(:valuator_group_assignments) } scope :for_render, -> { includes(:heading) } @@ -109,13 +110,14 @@ class Budget budget = Budget.find_by(slug: params[:budget_id]) || Budget.find_by(id: params[:budget_id]) results = Investment.by_budget(budget) - results = limit_results(budget, params, results) if params[:max_per_heading].present? - results = results.where(group_id: params[:group_id]) if params[:group_id].present? - results = results.by_tag(params[:tag_name]) if params[:tag_name].present? - results = results.by_heading(params[:heading_id]) if params[:heading_id].present? - results = results.by_valuator(params[:valuator_id]) if params[:valuator_id].present? - results = results.by_admin(params[:administrator_id]) if params[:administrator_id].present? - results = advanced_filters(params, results) if params[:advanced_filters].present? + results = limit_results(budget, params, results) if params[:max_per_heading].present? + results = results.where(group_id: params[:group_id]) if params[:group_id].present? + results = results.by_tag(params[:tag_name]) if params[:tag_name].present? + results = results.by_heading(params[:heading_id]) if params[:heading_id].present? + results = results.by_valuator(params[:valuator_id]) if params[:valuator_id].present? + results = results.by_valuator_group(params[:valuator_group_id]) if params[:valuator_group_id].present? + results = results.by_admin(params[:administrator_id]) if params[:administrator_id].present? + results = advanced_filters(params, results) if params[:advanced_filters].present? results = results.send(current_filter) if current_filter.present? results.includes(:heading, :group, :budget, administrator: :user, valuators: :user) diff --git a/app/views/admin/budget_investments/index.html.erb b/app/views/admin/budget_investments/index.html.erb index 73a06a402..c7417be45 100644 --- a/app/views/admin/budget_investments/index.html.erb +++ b/app/views/admin/budget_investments/index.html.erb @@ -19,6 +19,14 @@ class: "js-submit-on-change" } %>
+
+ <%= select_tag :valuator_group_id, + options_for_select(valuator_group_select_options, params[:valuator_group_id]), + { prompt: t("admin.budget_investments.index.valuator_group_filter_all"), + label: false, + class: "js-submit-on-change" } %> +
+
<%= select_tag :heading_id, options_for_select(budget_heading_select_options(@budget), params[:heading_id]), diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 2929db58a..1f05da8b8 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -140,6 +140,7 @@ en: heading_filter_all: All headings administrator_filter_all: All administrators valuator_filter_all: All valuators + valuator_group_filter_all: All groups tags_filter_all: All tags advanced_filters: Advanced filters placeholder: Search projects @@ -956,6 +957,7 @@ en: geozone_filter_all: All zones administrator_filter_all: All administrators valuator_filter_all: All valuators + valuator_group_filter_all: All groups tags_filter_all: All tags filters: valuation_open: Open diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 0502e2bf3..27053b934 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -140,6 +140,7 @@ es: heading_filter_all: Todas las partidas administrator_filter_all: Todos los administradores valuator_filter_all: Todos los evaluadores + valuator_group_filter_all: Todos los grupos tags_filter_all: Todas las etiquetas advanced_filters: Filtros avanzados placeholder: Buscar proyectos @@ -956,6 +957,7 @@ es: geozone_filter_all: Todos los ámbitos de actuación administrator_filter_all: Todos los administradores valuator_filter_all: Todos los evaluadores + valuator_group_filter_all: Todos los grupos tags_filter_all: Todas las etiquetas filters: valuation_open: Abiertas diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 983f1ed8a..d6de2dbb5 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -189,6 +189,39 @@ feature 'Admin budget investments' do expect(page).to have_link("Realocate visitors") end + scenario "Filtering by valuator group", :js, :focus do + user = create(:user) + health_group = create(:valuator_group, name: "Health") + culture_group = create(:valuator_group, name: "Culture") + + budget_investment1 = create(:budget_investment, title: "Build a hospital", budget: @budget) + budget_investment1.valuator_groups << health_group + + budget_investment2 = create(:budget_investment, title: "Build a theatre", budget: @budget) + budget_investment2.valuator_groups << culture_group + + visit admin_budget_budget_investments_path(budget_id: @budget.id) + expect(page).to have_link("Build a hospital") + expect(page).to have_link("Build a theatre") + + select "Health", from: "valuator_group_id" + + expect(page).to have_content('There is 1 investment') + expect(page).to have_link("Build a hospital") + expect(page).not_to have_link("Build a theatre") + + select "All groups", from: "valuator_group_id" + + expect(page).to have_content('There are 2 investments') + expect(page).to have_link("Build a hospital") + expect(page).to have_link("Build a theatre") + + select "Culture", from: "valuator_group_id" + expect(page).to have_content('There is 1 investment') + expect(page).to have_link("Build a theatre") + expect(page).not_to have_link("Build a hospital") + end + scenario "Current filter is properly highlighted" do filters_links = { 'all' => 'All', 'without_admin' => 'Without assigned admin', From fcb377c9e556e69d5e7ed69c38b804bc3e54eb2a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 9 Feb 2018 21:13:14 +0100 Subject: [PATCH 11/17] Remove description when creating valuator from index --- app/views/admin/valuators/search.html.erb | 6 ++---- spec/features/admin/budget_investments_spec.rb | 2 +- spec/features/admin/valuator_groups_spec.rb | 2 +- spec/features/admin/valuators_spec.rb | 2 -- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb index b383e554d..3a2f48be7 100644 --- a/app/views/admin/valuators/search.html.erb +++ b/app/views/admin/valuators/search.html.erb @@ -36,11 +36,9 @@ class: "button hollow alert expanded" %> <% else %> <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %> - <%= f.text_field :description, - label: false, - placeholder: t("admin.valuators.valuator.description_placeholder") %> <%= f.hidden_field :user_id %> - <%= f.submit t("admin.valuators.valuator.add"), class: "button success expanded" %> + <%= f.submit t("admin.valuators.valuator.add"), + class: "button success expanded" %> <% end %> <% end %> diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index d6de2dbb5..4f0685944 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -189,7 +189,7 @@ feature 'Admin budget investments' do expect(page).to have_link("Realocate visitors") end - scenario "Filtering by valuator group", :js, :focus do + scenario "Filtering by valuator group", :js do user = create(:user) health_group = create(:valuator_group, name: "Health") culture_group = create(:valuator_group, name: "Culture") diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb index 29bd338d9..32e33b7c5 100644 --- a/spec/features/admin/valuator_groups_spec.rb +++ b/spec/features/admin/valuator_groups_spec.rb @@ -18,7 +18,7 @@ feature "Valuator groups" do expect(page).to have_content group2.name end - scenario "Show", :focus do + scenario "Show" do group = create(:valuator_group) valuator1 = create(:valuator, valuator_group: group) valuator2 = create(:valuator, valuator_group: group) diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index df9b91abb..1e1de562c 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -28,12 +28,10 @@ feature 'Admin valuators' do click_button 'Search' expect(page).to have_content(@user.name) - fill_in 'valuator_description', with: 'environmental expert' click_button 'Add to valuators' within('#valuators') do expect(page).to have_content(@user.name) - expect(page).to have_content('environmental expert') end end From 1152f95965a6676f548574417f1ae11c1d423df2 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 9 Feb 2018 21:34:57 +0100 Subject: [PATCH 12/17] Display valuator group assignments --- .../budget_investments/_investments.html.erb | 8 +++++ config/locales/en/admin.yml | 3 ++ config/locales/en/valuation.yml | 1 + config/locales/es/admin.yml | 3 ++ config/locales/es/valuation.yml | 1 + .../features/admin/budget_investments_spec.rb | 29 ++++++++++++++++++- 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb index 4522ce48e..33ae48d36 100644 --- a/app/views/admin/budget_investments/_investments.html.erb +++ b/app/views/admin/budget_investments/_investments.html.erb @@ -24,6 +24,7 @@ <%= t("admin.budget_investments.index.table_supports") %> <%= t("admin.budget_investments.index.table_admin") %> <%= t("admin.budget_investments.index.table_valuator") %> + <%= t("admin.budget_investments.index.table_valuator_group") %> <%= t("admin.budget_investments.index.table_geozone") %> <%= t("admin.budget_investments.index.table_feasibility") %> <%= t("admin.budget_investments.index.table_valuation_finished") %> @@ -66,6 +67,13 @@ <%= investment.valuators.collect(&:description_or_name).join(", ") %> <% end %> + + <% if investment.valuator_groups.size.zero? %> + <%= t("admin.budget_investments.index.no_valuator_groups_assigned") %> + <% else %> + <%= investment.valuator_groups.collect(&:name).join(", ") %> + <% end %> + <%= investment.heading.name %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 1f05da8b8..70f326d6b 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -172,6 +172,7 @@ en: assigned_admin: Assigned administrator no_admin_assigned: No admin assigned no_valuators_assigned: No valuators assigned + no_valuator_groups_assigned: No valuator groups assigned feasibility: feasible: "Feasible (%{price})" unfeasible: "Unfeasible" @@ -183,6 +184,7 @@ en: table_supports: "Supports" table_admin: "Administrator" table_valuator: "Valuator" + table_valuator_group: "Valuator group" table_geozone: "Scope of operation" table_feasibility: "Feasibility" table_valuation_finished: "Val. Fin." @@ -970,6 +972,7 @@ en: assigned_admin: Assigned administrator no_admin_assigned: No admin assigned no_valuators_assigned: No valuators assigned + no_valuator_groups_assigned: No valuator groups assigned summary_link: "Investment project summary" valuator_summary_link: "Valuator summary" feasibility: diff --git a/config/locales/en/valuation.yml b/config/locales/en/valuation.yml index 18fb6ab87..18587e772 100644 --- a/config/locales/en/valuation.yml +++ b/config/locales/en/valuation.yml @@ -31,6 +31,7 @@ en: one: Assigned valuator other: "%{count} valuators assigned" no_valuators_assigned: No valuators assigned + no_valuator_groups_assigned: No valuator groups assigned table_id: ID table_title: Title table_heading_name: Heading name diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 27053b934..0840479bd 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -172,6 +172,7 @@ es: assigned_admin: Administrador asignado no_admin_assigned: Sin admin asignado no_valuators_assigned: Sin evaluador + no_valuator_groups_assigned: Sin grupo evaluador feasibility: feasible: "Viable (%{price})" unfeasible: "Inviable" @@ -183,6 +184,7 @@ es: table_supports: "Apoyos" table_admin: "Administrador" table_valuator: "Evaluador" + table_valuator_group: "Grupo Evaluador" table_geozone: "Ámbito de actuación" table_feasibility: "Viabilidad" table_valuation_finished: "Ev. Fin." @@ -970,6 +972,7 @@ es: assigned_admin: Administrador asignado no_admin_assigned: Sin admin asignado no_valuators_assigned: Sin evaluador + no_valuator_groups_assigned: Sin grupo evaluador summary_link: "Resumen de propuestas" valuator_summary_link: "Resumen de evaluadores" feasibility: diff --git a/config/locales/es/valuation.yml b/config/locales/es/valuation.yml index 48fb68846..fa7748524 100644 --- a/config/locales/es/valuation.yml +++ b/config/locales/es/valuation.yml @@ -31,6 +31,7 @@ es: one: Evaluador asignado other: "%{count} evaluadores asignados" no_valuators_assigned: Sin evaluador + no_valuator_groups_assigned: Sin grupo evaluador table_id: ID table_title: Título table_heading_name: Nombre de la partida diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 4f0685944..3d4351b6c 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -54,7 +54,7 @@ feature 'Admin budget investments' do end end - scenario 'Displaying assignments info' do + scenario 'Display admin and valuator assignments' do budget_investment1 = create(:budget_investment, budget: budget) budget_investment2 = create(:budget_investment, budget: budget) budget_investment3 = create(:budget_investment, budget: budget) @@ -86,6 +86,33 @@ feature 'Admin budget investments' do end end + scenario 'Display valuator group assignments' do + budget_investment1 = create(:budget_investment, budget: @budget) + budget_investment2 = create(:budget_investment, budget: @budget) + budget_investment3 = create(:budget_investment, budget: @budget) + + health_group = create(:valuator_group, name: "Health") + culture_group = create(:valuator_group, name: "Culture") + + budget_investment1.valuator_groups << health_group + budget_investment2.valuator_group_ids = [health_group.id, culture_group.id] + + visit admin_budget_budget_investments_path(budget_id: @budget.id) + + within("#budget_investment_#{budget_investment1.id}") do + expect(page).to have_content("Health") + end + + within("#budget_investment_#{budget_investment2.id}") do + expect(page).to have_content("Health") + expect(page).to have_content("Culture") + end + + within("#budget_investment_#{budget_investment3.id}") do + expect(page).to have_content("No valuator groups assigned") + end + end + scenario "Filtering by budget heading", :js do group1 = create(:budget_group, name: "Streets", budget: budget) group2 = create(:budget_group, name: "Parks", budget: budget) From 7a017451881b4f76af303c38ad1fc20c8fe56746 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 9 Feb 2018 21:52:17 +0100 Subject: [PATCH 13/17] Add valuation permissions to groups --- app/models/abilities/valuator.rb | 4 ++-- app/models/valuator_group.rb | 2 ++ spec/models/abilities/valuator_spec.rb | 9 +++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/models/abilities/valuator.rb b/app/models/abilities/valuator.rb index 3c12f2089..8ea8d71cf 100644 --- a/app/models/abilities/valuator.rb +++ b/app/models/abilities/valuator.rb @@ -5,8 +5,8 @@ module Abilities def initialize(user) valuator = user.valuator can [:read, :update, :valuate], SpendingProposal - can [:read, :update, :comment_valuation], Budget::Investment, id: valuator.investment_ids - can [:valuate], Budget::Investment, { id: valuator.investment_ids, valuation_finished: false } + can [:read, :update, :comment_valuation], Budget::Investment, id: valuator.investment_ids + valuator.valuator_group.investment_ids + can [:valuate], Budget::Investment, { id: valuator.investment_ids + valuator.valuator_group.investment_ids, valuation_finished: false } cannot [:update, :valuate, :comment_valuation], Budget::Investment, budget: { phase: 'finished' } end end diff --git a/app/models/valuator_group.rb b/app/models/valuator_group.rb index ba7fc5edc..c5bf8d29b 100644 --- a/app/models/valuator_group.rb +++ b/app/models/valuator_group.rb @@ -1,3 +1,5 @@ class ValuatorGroup < ActiveRecord::Base has_many :valuators + has_many :valuator_group_assignments, dependent: :destroy, class_name: 'Budget::ValuatorGroupAssignment' + has_many :investments, through: :valuator_group_assignments, class_name: 'Budget::Investment' end \ No newline at end of file diff --git a/spec/models/abilities/valuator_spec.rb b/spec/models/abilities/valuator_spec.rb index 41c885421..3b40457b8 100644 --- a/spec/models/abilities/valuator_spec.rb +++ b/spec/models/abilities/valuator_spec.rb @@ -6,12 +6,18 @@ describe Abilities::Valuator do let(:user) { valuator.user } let(:valuator) { create(:valuator) } + let(:group) { create(:valuator_group) } let(:non_assigned_investment) { create(:budget_investment) } let(:assigned_investment) { create(:budget_investment, budget: create(:budget, phase: 'valuating')) } + let(:group_assigned_investment) { create(:budget_investment, budget: create(:budget, phase: 'valuating')) } let(:finished_assigned_investment) { create(:budget_investment, budget: create(:budget, phase: 'finished')) } before do assigned_investment.valuators << valuator + + group_assigned_investment.valuator_groups << group + valuator.update(valuator_group: group) + finished_assigned_investment.valuators << valuator end @@ -31,6 +37,9 @@ describe Abilities::Valuator do it { should be_able_to(:update, assigned_investment) } it { should be_able_to(:valuate, assigned_investment) } + it { should be_able_to(:update, group_assigned_investment) } + it { should be_able_to(:valuate, group_assigned_investment) } + it { should_not be_able_to(:update, finished_assigned_investment) } it { should_not be_able_to(:valuate, finished_assigned_investment) } end From 2d3c4e1fbdbc52e3783b22a581b8b8df3987bf75 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 9 Feb 2018 22:00:04 +0100 Subject: [PATCH 14/17] Add group member count --- app/views/admin/valuator_groups/_group.html.erb | 4 ++-- spec/features/admin/valuator_groups_spec.rb | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/views/admin/valuator_groups/_group.html.erb b/app/views/admin/valuator_groups/_group.html.erb index 2b2df99f9..ea69515f7 100644 --- a/app/views/admin/valuator_groups/_group.html.erb +++ b/app/views/admin/valuator_groups/_group.html.erb @@ -1,9 +1,9 @@ - + <%= link_to group.name, admin_valuator_group_path(group) %> - + <%= group.valuators.count %> <%= link_to t("admin.actions.delete"), diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb index 32e33b7c5..014a6f863 100644 --- a/spec/features/admin/valuator_groups_spec.rb +++ b/spec/features/admin/valuator_groups_spec.rb @@ -11,11 +11,19 @@ feature "Valuator groups" do scenario "Index" do group1 = create(:valuator_group) group2 = create(:valuator_group) + 3.times { create(:valuator, valuator_group: group1) } visit admin_valuator_groups_path - expect(page).to have_content group1.name - expect(page).to have_content group2.name + within("#valuator_group_#{group1.id}") do + expect(page).to have_content group1.name + expect(page).to have_content 3 + end + + within("#valuator_group_#{group2.id}") do + expect(page).to have_content group2.name + expect(page).to have_content 0 + end end scenario "Show" do From 00c965b715952778a65118c9112c7979628e2507 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 9 Feb 2018 22:08:52 +0100 Subject: [PATCH 15/17] Clean up --- .../admin/budget_investments_controller.rb | 16 +++++- .../admin/valuator_groups_controller.rb | 10 ++-- app/helpers/valuation_helper.rb | 30 ++++++----- app/models/abilities/valuator.rb | 1 + app/models/budget/investment.rb | 4 +- .../budget/valuator_group_assignment.rb | 4 +- app/models/valuator.rb | 5 ++ .../budget_investments/_investments.html.erb | 12 +---- .../admin/budget_investments/index.html.erb | 12 +---- .../admin/valuator_groups/_valuator.html.erb | 4 ++ app/views/admin/valuator_groups/show.html.erb | 11 ++-- app/views/admin/valuators/search.html.erb | 4 ++ config/locales/en/admin.yml | 7 +-- config/locales/en/responders.yml | 3 ++ config/locales/en/user_groups.yml | 6 --- config/locales/en/valuation.yml | 1 - config/locales/es/admin.yml | 7 +-- config/locales/es/responders.yml | 3 ++ config/locales/es/user_groups.yml | 6 --- config/locales/es/valuation.yml | 1 - config/locales/fr/admin.yml | 1 - config/locales/he/admin.yml | 1 - config/locales/nl/admin.yml | 1 - config/locales/val/admin.yml | 1 - ...get_valuator_group_assignments_counters.rb | 6 +++ db/schema.rb | 49 ++++++++++-------- .../features/admin/budget_investments_spec.rb | 14 +++--- spec/features/admin/valuator_groups_spec.rb | 50 +++++++++++++++++-- spec/features/admin/valuators_spec.rb | 45 +---------------- spec/models/budget/investment_spec.rb | 14 ++++++ spec/models/valuator_spec.rb | 35 ++++++++++++- 31 files changed, 206 insertions(+), 158 deletions(-) create mode 100644 app/views/admin/valuator_groups/_valuator.html.erb delete mode 100644 config/locales/en/user_groups.yml delete mode 100644 config/locales/es/user_groups.yml create mode 100644 db/migrate/20180211182635_add_budget_valuator_group_assignments_counters.rb diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb index 63fd316a6..416799535 100644 --- a/app/controllers/admin/budget_investments_controller.rb +++ b/app/controllers/admin/budget_investments_controller.rb @@ -7,11 +7,12 @@ class Admin::BudgetInvestmentsController < Admin::BaseController has_orders %w{oldest}, only: [:show, :edit] has_filters(%w{all without_admin without_valuator under_valuation valuation_finished winners}, - only: [:index, :toggle_selection]) + only: [:index, :toggle_selection]) before_action :load_budget before_action :load_investment, only: [:show, :edit, :update, :toggle_selection] before_action :load_ballot, only: [:show, :index] + before_action :parse_valuation_filters before_action :load_investments, only: [:index, :toggle_selection] def index @@ -46,6 +47,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController else load_admins load_valuators + load_valuator_groups load_tags render :edit end @@ -131,4 +133,16 @@ class Admin::BudgetInvestmentsController < Admin::BaseController params[:budget_investment] = params[:budget_investment].except(:valuation_tag_list) end + def parse_valuation_filters + if params[:valuator_or_group_id] + model, id = params[:valuator_or_group_id].split("_") + + if model == "group" + params[:valuator_group_id] = id + else + params[:valuator_id] = id + end + end + end + end diff --git a/app/controllers/admin/valuator_groups_controller.rb b/app/controllers/admin/valuator_groups_controller.rb index 054fe15ce..6e8930122 100644 --- a/app/controllers/admin/valuator_groups_controller.rb +++ b/app/controllers/admin/valuator_groups_controller.rb @@ -19,8 +19,8 @@ class Admin::ValuatorGroupsController < Admin::BaseController def create @group = ValuatorGroup.new(group_params) if @group.save - notice = t("user_group.notice.created") - redirect_to admin_valuator_groups_path, notice: notice + notice = t("flash.actions.create.valuator_group") + redirect_to [:admin, :valuator_groups], notice: notice else render :new end @@ -29,7 +29,7 @@ class Admin::ValuatorGroupsController < Admin::BaseController def update @group = ValuatorGroup.find(params[:id]) if @group.update(group_params) - notice = t("user_group.notice.updated") + notice = t("flash.actions.update.valuator_group") redirect_to [:admin, @group], notice: notice else render :edit @@ -39,8 +39,8 @@ class Admin::ValuatorGroupsController < Admin::BaseController def destroy @group = ValuatorGroup.find(params[:id]) @group.destroy - notice = t("user_group.notice.destroyed") - redirect_to admin_valuator_groups_path, notice: notice + notice = t("flash.actions.destroy.valuator_group") + redirect_to [:admin, :valuator_groups], notice: notice end private diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb index 3a7e3dba7..311f8e6ec 100644 --- a/app/helpers/valuation_helper.rb +++ b/app/helpers/valuation_helper.rb @@ -1,23 +1,21 @@ module ValuationHelper - def valuator_select_options(valuator = nil) - if valuator.present? - Valuator.where.not(id: valuator.id).order("description ASC").order("users.email ASC") - .includes(:user).collect { |v| [ v.description_or_email, v.id ] } - .prepend([valuator.description_or_email, valuator.id]) - else - Valuator.all.order("description ASC").order("users.email ASC").includes(:user).collect { |v| [ v.description_or_email, v.id ] } - end + def valuator_or_group_select_options + valuator_group_select_options + valuator_select_options end - def valuator_group_select_options(group = nil) - if group.present? - ValuatorGroup.where.not(id: group.id).order("name ASC") - .collect { |g| [ g.name, g.id ] } - .prepend([valuator.name, valuator.id]) - else - ValuatorGroup.order("name ASC").collect { |g| [ g.name, g.id ] } - end + def valuator_select_options + Valuator.order("description ASC").order("users.email ASC").includes(:user). + collect { |v| [ v.description_or_email, "valuator_#{v.id}"] } + end + + def valuator_group_select_options + ValuatorGroup.order("name ASC").collect { |g| [ g.name, "group_#{g.id}"] } + end + + def assigned_valuators(investment) + [investment.valuator_groups.collect(&:name) + + investment.valuators.collect(&:description_or_name)].flatten.join(', ') end def assigned_valuators_info(valuators) diff --git a/app/models/abilities/valuator.rb b/app/models/abilities/valuator.rb index 8ea8d71cf..cec3e5f1d 100644 --- a/app/models/abilities/valuator.rb +++ b/app/models/abilities/valuator.rb @@ -4,6 +4,7 @@ module Abilities def initialize(user) valuator = user.valuator + can [:read, :update, :valuate], SpendingProposal can [:read, :update, :comment_valuation], Budget::Investment, id: valuator.investment_ids + valuator.valuator_group.investment_ids can [:valuate], Budget::Investment, { id: valuator.investment_ids + valuator.valuator_group.investment_ids, valuation_finished: false } diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 34565a7d4..c8c12e0f8 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -62,9 +62,9 @@ class Budget scope :valuation_open, -> { where(valuation_finished: false) } scope :without_admin, -> { valuation_open.where(administrator_id: nil) } scope :without_valuator, -> { valuation_open.where(valuator_assignments_count: 0) } - scope :under_valuation, -> { valuation_open.where("valuator_assignments_count > 0 AND administrator_id IS NOT ?", nil) } + scope :under_valuation, -> { valuation_open.valuating.where("administrator_id IS NOT ?", nil) } scope :managed, -> { valuation_open.where(valuator_assignments_count: 0).where("administrator_id IS NOT ?", nil) } - scope :valuating, -> { valuation_open.where("valuator_assignments_count > 0") } + scope :valuating, -> { valuation_open.where("valuator_assignments_count > 0 OR valuator_group_assignments_count > 0" ) } scope :valuation_finished, -> { where(valuation_finished: true) } scope :valuation_finished_feasible, -> { where(valuation_finished: true, feasibility: "feasible") } scope :feasible, -> { where(feasibility: "feasible") } diff --git a/app/models/budget/valuator_group_assignment.rb b/app/models/budget/valuator_group_assignment.rb index 1aa4331fc..88a04ae1a 100644 --- a/app/models/budget/valuator_group_assignment.rb +++ b/app/models/budget/valuator_group_assignment.rb @@ -1,6 +1,6 @@ class Budget class ValuatorGroupAssignment < ActiveRecord::Base - belongs_to :valuator_group - belongs_to :investment + belongs_to :valuator_group, counter_cache: :budget_investments_count + belongs_to :investment, counter_cache: true end end \ No newline at end of file diff --git a/app/models/valuator.rb b/app/models/valuator.rb index 85f199adb..30b171823 100644 --- a/app/models/valuator.rb +++ b/app/models/valuator.rb @@ -18,4 +18,9 @@ class Valuator < ActiveRecord::Base def description_or_name description.present? ? description : name end + + def assigned_investment_ids + investment_ids + [valuator_group.try(:investment_ids)].flatten + end + end diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb index 33ae48d36..9d52f78d6 100644 --- a/app/views/admin/budget_investments/_investments.html.erb +++ b/app/views/admin/budget_investments/_investments.html.erb @@ -24,7 +24,6 @@ <%= t("admin.budget_investments.index.table_supports") %> <%= t("admin.budget_investments.index.table_admin") %> <%= t("admin.budget_investments.index.table_valuator") %> - <%= t("admin.budget_investments.index.table_valuator_group") %> <%= t("admin.budget_investments.index.table_geozone") %> <%= t("admin.budget_investments.index.table_feasibility") %> <%= t("admin.budget_investments.index.table_valuation_finished") %> @@ -61,17 +60,10 @@ <% end %> - <% if investment.valuators.size.zero? %> + <% if investment.valuators.size == 0 && investment.valuator_groups.size == 0 %> <%= t("admin.budget_investments.index.no_valuators_assigned") %> <% else %> - <%= investment.valuators.collect(&:description_or_name).join(", ") %> - <% end %> - - - <% if investment.valuator_groups.size.zero? %> - <%= t("admin.budget_investments.index.no_valuator_groups_assigned") %> - <% else %> - <%= investment.valuator_groups.collect(&:name).join(", ") %> + <%= assigned_valuators(investment) %> <% end %> diff --git a/app/views/admin/budget_investments/index.html.erb b/app/views/admin/budget_investments/index.html.erb index c7417be45..4548e47c0 100644 --- a/app/views/admin/budget_investments/index.html.erb +++ b/app/views/admin/budget_investments/index.html.erb @@ -12,21 +12,13 @@
- <%= select_tag :valuator_id, - options_for_select(valuator_select_options, params[:valuator_id]), + <%= select_tag :valuator_or_group_id, + options_for_select(valuator_or_group_select_options, params[:valuator_or_group_id]), { prompt: t("admin.budget_investments.index.valuator_filter_all"), label: false, class: "js-submit-on-change" } %>
-
- <%= select_tag :valuator_group_id, - options_for_select(valuator_group_select_options, params[:valuator_group_id]), - { prompt: t("admin.budget_investments.index.valuator_group_filter_all"), - label: false, - class: "js-submit-on-change" } %> -
-
<%= select_tag :heading_id, options_for_select(budget_heading_select_options(@budget), params[:heading_id]), diff --git a/app/views/admin/valuator_groups/_valuator.html.erb b/app/views/admin/valuator_groups/_valuator.html.erb new file mode 100644 index 000000000..8f98a8173 --- /dev/null +++ b/app/views/admin/valuator_groups/_valuator.html.erb @@ -0,0 +1,4 @@ +
  • + <%= link_to valuator.description_or_email, + admin_valuator_path(valuator) %> +
    • \ No newline at end of file diff --git a/app/views/admin/valuator_groups/show.html.erb b/app/views/admin/valuator_groups/show.html.erb index 2cd295a3f..f75490c1b 100644 --- a/app/views/admin/valuator_groups/show.html.erb +++ b/app/views/admin/valuator_groups/show.html.erb @@ -3,10 +3,11 @@

    <%= t("admin.valuator_groups.show.title", group: @group.name) %>

      - <% @group.valuators.each do |valuator| %> -
    • - <%= link_to valuator.description_or_email, - admin_valuator_path(valuator) %> -
      • + <% if @group.valuators.any? %> + <%= render partial: 'valuator', collection: @group.valuators %> + <% else %> +
      + <%= t("admin.valuator_groups.show.no_valuators") %> +
      <% end %>
    diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb index 3a2f48be7..93907ceb9 100644 --- a/app/views/admin/valuators/search.html.erb +++ b/app/views/admin/valuators/search.html.erb @@ -30,6 +30,10 @@ <% end %> <% if user.valuator? %> + <%= link_to t("admin.actions.edit"), + edit_admin_valuator_path(user.valuator), + class: "button hollow" %> + <%= link_to t("admin.valuators.valuator.delete"), admin_valuator_path(user), method: :delete, diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 70f326d6b..f85d6a8c8 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -140,7 +140,6 @@ en: heading_filter_all: All headings administrator_filter_all: All administrators valuator_filter_all: All valuators - valuator_group_filter_all: All groups tags_filter_all: All tags advanced_filters: Advanced filters placeholder: Search projects @@ -172,7 +171,6 @@ en: assigned_admin: Assigned administrator no_admin_assigned: No admin assigned no_valuators_assigned: No valuators assigned - no_valuator_groups_assigned: No valuator groups assigned feasibility: feasible: "Feasible (%{price})" unfeasible: "Unfeasible" @@ -184,7 +182,6 @@ en: table_supports: "Supports" table_admin: "Administrator" table_valuator: "Valuator" - table_valuator_group: "Valuator group" table_geozone: "Scope of operation" table_feasibility: "Feasibility" table_valuation_finished: "Val. Fin." @@ -590,7 +587,6 @@ en: group: "Group" no_group: "No group" valuator: - description_placeholder: 'Description (optional)' add: Add to valuators delete: Delete search: @@ -623,6 +619,7 @@ en: no_groups: "There are no valuator groups" show: title: "Valuators group: %{group}" + no_valuators: "There are no valuators assigned to this group" form: name: "Group name" new: "Create valuators group" @@ -959,7 +956,6 @@ en: geozone_filter_all: All zones administrator_filter_all: All administrators valuator_filter_all: All valuators - valuator_group_filter_all: All groups tags_filter_all: All tags filters: valuation_open: Open @@ -972,7 +968,6 @@ en: assigned_admin: Assigned administrator no_admin_assigned: No admin assigned no_valuators_assigned: No valuators assigned - no_valuator_groups_assigned: No valuator groups assigned summary_link: "Investment project summary" valuator_summary_link: "Valuator summary" feasibility: diff --git a/config/locales/en/responders.yml b/config/locales/en/responders.yml index cc6d58bb0..f91cb807c 100644 --- a/config/locales/en/responders.yml +++ b/config/locales/en/responders.yml @@ -16,6 +16,7 @@ en: budget_investment: "Budget Investment created successfully." signature_sheet: "Signature sheet created successfully" topic: "Topic created successfully." + valuator_group: "Valuator group created successfully" save_changes: notice: Changes saved update: @@ -27,9 +28,11 @@ en: spending_proposal: "Investment project updated succesfully." budget_investment: "Investment project updated succesfully." topic: "Topic updated successfully." + valuator_group: "Valuator group updated successfully" destroy: spending_proposal: "Spending proposal deleted succesfully." budget_investment: "Investment project deleted succesfully." error: "Could not delete" topic: "Topic deleted successfully." poll_question_answer_video: "Answer video deleted successfully." + valuator_group: "Valuator group deleted successfully" diff --git a/config/locales/en/user_groups.yml b/config/locales/en/user_groups.yml deleted file mode 100644 index 6b44b5495..000000000 --- a/config/locales/en/user_groups.yml +++ /dev/null @@ -1,6 +0,0 @@ -en: - user_group: - notice: - created: "User group created successfully" - updated: "User group updated successfully" - destroyed: "User group deleted successfully" diff --git a/config/locales/en/valuation.yml b/config/locales/en/valuation.yml index 18587e772..18fb6ab87 100644 --- a/config/locales/en/valuation.yml +++ b/config/locales/en/valuation.yml @@ -31,7 +31,6 @@ en: one: Assigned valuator other: "%{count} valuators assigned" no_valuators_assigned: No valuators assigned - no_valuator_groups_assigned: No valuator groups assigned table_id: ID table_title: Title table_heading_name: Heading name diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 0840479bd..64e7dafd0 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -140,7 +140,6 @@ es: heading_filter_all: Todas las partidas administrator_filter_all: Todos los administradores valuator_filter_all: Todos los evaluadores - valuator_group_filter_all: Todos los grupos tags_filter_all: Todas las etiquetas advanced_filters: Filtros avanzados placeholder: Buscar proyectos @@ -172,7 +171,6 @@ es: assigned_admin: Administrador asignado no_admin_assigned: Sin admin asignado no_valuators_assigned: Sin evaluador - no_valuator_groups_assigned: Sin grupo evaluador feasibility: feasible: "Viable (%{price})" unfeasible: "Inviable" @@ -184,7 +182,6 @@ es: table_supports: "Apoyos" table_admin: "Administrador" table_valuator: "Evaluador" - table_valuator_group: "Grupo Evaluador" table_geozone: "Ámbito de actuación" table_feasibility: "Viabilidad" table_valuation_finished: "Ev. Fin." @@ -590,7 +587,6 @@ es: group: "Grupo" no_group: "Sin grupo" valuator: - description_placeholder: 'Descripción (opcional)' add: Añadir como evaluador delete: Borrar search: @@ -623,6 +619,7 @@ es: no_groups: "No hay grupos de evaluadores" show: title: "Grupo de evaluadores: %{group}" + no_valuators: "No hay evaluadores asigandos a este grupo" form: name: "Nombre del grupo" new: "Crear grupo de evaluadores" @@ -959,7 +956,6 @@ es: geozone_filter_all: Todos los ámbitos de actuación administrator_filter_all: Todos los administradores valuator_filter_all: Todos los evaluadores - valuator_group_filter_all: Todos los grupos tags_filter_all: Todas las etiquetas filters: valuation_open: Abiertas @@ -972,7 +968,6 @@ es: assigned_admin: Administrador asignado no_admin_assigned: Sin admin asignado no_valuators_assigned: Sin evaluador - no_valuator_groups_assigned: Sin grupo evaluador summary_link: "Resumen de propuestas" valuator_summary_link: "Resumen de evaluadores" feasibility: diff --git a/config/locales/es/responders.yml b/config/locales/es/responders.yml index 006bcab2d..3674a0290 100644 --- a/config/locales/es/responders.yml +++ b/config/locales/es/responders.yml @@ -16,6 +16,7 @@ es: budget_investment: "Proyecto de gasto creado correctamente." signature_sheet: "Hoja de firmas creada correctamente" topic: "Tema creado correctamente." + valuator_group: "Grupo de evaluadores creado correctamente" save_changes: notice: Cambios guardados update: @@ -27,9 +28,11 @@ es: spending_proposal: "Propuesta de inversión actualizada correctamente." budget_investment: "Proyecto de gasto actualizado correctamente" topic: "Tema actualizado correctamente." + valuator_group: "Grupo de evaluadores actualizado correctamente" destroy: spending_proposal: "Propuesta de inversión eliminada." budget_investment: "Proyecto de gasto eliminado." error: "No se pudo borrar" topic: "Tema eliminado." poll_question_answer_video: "Vídeo de respuesta eliminado." + valuator_group: "Grupo de evaluadores eliminado correctamente" diff --git a/config/locales/es/user_groups.yml b/config/locales/es/user_groups.yml deleted file mode 100644 index 5f4d690cf..000000000 --- a/config/locales/es/user_groups.yml +++ /dev/null @@ -1,6 +0,0 @@ -es: - user_group: - notice: - created: "Grupo de usuarios creado correctamente" - updated: "Grupo de usuarios actualizado correctamente" - destroyed: "Grupo de usuarios eliminado correctamente" diff --git a/config/locales/es/valuation.yml b/config/locales/es/valuation.yml index fa7748524..48fb68846 100644 --- a/config/locales/es/valuation.yml +++ b/config/locales/es/valuation.yml @@ -31,7 +31,6 @@ es: one: Evaluador asignado other: "%{count} evaluadores asignados" no_valuators_assigned: Sin evaluador - no_valuator_groups_assigned: Sin grupo evaluador table_id: ID table_title: Título table_heading_name: Nombre de la partida diff --git a/config/locales/fr/admin.yml b/config/locales/fr/admin.yml index b9cdfcfd3..7c2d63e03 100644 --- a/config/locales/fr/admin.yml +++ b/config/locales/fr/admin.yml @@ -246,7 +246,6 @@ fr: index: title: Évaluateurs valuator: - description_placeholder: 'Description (optionnel)' user_found: Utilisateur trouvé add: Ajouter un évaluateur search: diff --git a/config/locales/he/admin.yml b/config/locales/he/admin.yml index 35700ec03..c5cbdf9ac 100644 --- a/config/locales/he/admin.yml +++ b/config/locales/he/admin.yml @@ -179,7 +179,6 @@ he: index: title: Valuators valuator: - description_placeholder: 'Description (optional)' add: Add to valuators summary: title: Valuator summary for investment projects diff --git a/config/locales/nl/admin.yml b/config/locales/nl/admin.yml index 8a30b0d21..5dcb86fe6 100644 --- a/config/locales/nl/admin.yml +++ b/config/locales/nl/admin.yml @@ -246,7 +246,6 @@ nl: index: title: Valuators valuator: - description_placeholder: 'Description (optional)' user_found: User found add: Add to valuators search: diff --git a/config/locales/val/admin.yml b/config/locales/val/admin.yml index 2b64276f4..3e3a09f6e 100644 --- a/config/locales/val/admin.yml +++ b/config/locales/val/admin.yml @@ -494,7 +494,6 @@ val: no_description: Sense descripció no_valuators: No hi ha avaluadors. valuator: - description_placeholder: 'Descripció (opcional)' add: Afegir com a avaluador delete: Borrar search: diff --git a/db/migrate/20180211182635_add_budget_valuator_group_assignments_counters.rb b/db/migrate/20180211182635_add_budget_valuator_group_assignments_counters.rb new file mode 100644 index 000000000..93619a5a9 --- /dev/null +++ b/db/migrate/20180211182635_add_budget_valuator_group_assignments_counters.rb @@ -0,0 +1,6 @@ +class AddBudgetValuatorGroupAssignmentsCounters < ActiveRecord::Migration + def change + add_column :budget_investments, :valuator_group_assignments_count, :integer, default: 0 + add_column :valuator_groups, :budget_investments_count, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 45deca085..6336dd302 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -133,35 +133,38 @@ ActiveRecord::Schema.define(version: 20180320104823) do t.string "title" t.text "description" t.string "external_url" - t.integer "price", limit: 8 - t.string "feasibility", limit: 15, default: "undecided" + t.integer "price", limit: 8 + t.string "feasibility", limit: 15, default: "undecided" t.text "price_explanation" t.text "unfeasibility_explanation" - t.boolean "valuation_finished", default: false - t.integer "valuator_assignments_count", default: 0 - t.integer "price_first_year", limit: 8 + t.text "internal_comments" + t.boolean "valuation_finished", default: false + t.integer "valuator_assignments_count", default: 0 + t.integer "price_first_year", limit: 8 t.string "duration" t.datetime "hidden_at" - t.integer "cached_votes_up", default: 0 - t.integer "comments_count", default: 0 - t.integer "confidence_score", default: 0, null: false - t.integer "physical_votes", default: 0 + t.integer "cached_votes_up", default: 0 + t.integer "comments_count", default: 0 + t.integer "confidence_score", default: 0, null: false + t.integer "physical_votes", default: 0 t.tsvector "tsv" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "heading_id" t.string "responsible_name" t.integer "budget_id" t.integer "group_id" - t.boolean "selected", default: false + t.boolean "selected", default: false t.string "location" t.string "organization_name" t.datetime "unfeasible_email_sent_at" t.integer "ballot_lines_count", default: 0 t.integer "previous_heading_id" - t.boolean "winner", default: false - t.boolean "incompatible", default: false + t.integer "ballot_lines_count", default: 0 + t.boolean "winner", default: false + t.boolean "incompatible", default: false t.integer "community_id" + t.integer "valuator_group_assignments_count", default: 0 end add_index "budget_investments", ["administrator_id"], name: "index_budget_investments_on_administrator_id", using: :btree @@ -186,6 +189,16 @@ ActiveRecord::Schema.define(version: 20180320104823) do add_index "budget_phases", ["next_phase_id"], name: "index_budget_phases_on_next_phase_id", using: :btree add_index "budget_phases", ["starts_at"], name: "index_budget_phases_on_starts_at", using: :btree + create_table "budget_polls", force: :cascade do |t| + t.string "name" + t.string "email" + t.string "preferred_subject" + t.boolean "collective" + t.boolean "public_worker" + t.boolean "proposal_author" + t.boolean "selected_proposal_author" + end + create_table "budget_reclassified_votes", force: :cascade do |t| t.integer "user_id" t.integer "investment_id" @@ -1058,11 +1071,6 @@ ActiveRecord::Schema.define(version: 20180320104823) do add_index "topics", ["community_id"], name: "index_topics_on_community_id", using: :btree add_index "topics", ["hidden_at"], name: "index_topics_on_hidden_at", using: :btree - create_table "user_groups", force: :cascade do |t| - t.string "name" - t.string "kind" - end - create_table "users", force: :cascade do |t| t.string "email", default: "" t.string "encrypted_password", default: "", null: false @@ -1139,7 +1147,8 @@ ActiveRecord::Schema.define(version: 20180320104823) do end create_table "valuator_groups", force: :cascade do |t| - t.string "name" + t.string "name" + t.integer "budget_investments_count", default: 0 end create_table "valuators", force: :cascade do |t| diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 3d4351b6c..cd802486e 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -109,7 +109,7 @@ feature 'Admin budget investments' do end within("#budget_investment_#{budget_investment3.id}") do - expect(page).to have_content("No valuator groups assigned") + expect(page).to have_content("No valuators assigned") end end @@ -198,19 +198,19 @@ feature 'Admin budget investments' do expect(page).to have_link("Realocate visitors") expect(page).to have_link("Destroy the city") - select "Valuator 1", from: "valuator_id" + select "Valuator 1", from: "valuator_or_group_id" expect(page).to have_content('There is 1 investment') expect(page).not_to have_link("Destroy the city") expect(page).to have_link("Realocate visitors") - select "All valuators", from: "valuator_id" + select "All valuators", from: "valuator_or_group_id" expect(page).to have_content('There are 2 investments') expect(page).to have_link("Destroy the city") expect(page).to have_link("Realocate visitors") - select "Valuator 1", from: "valuator_id" + select "Valuator 1", from: "valuator_or_group_id" expect(page).to have_content('There is 1 investment') expect(page).not_to have_link("Destroy the city") expect(page).to have_link("Realocate visitors") @@ -231,19 +231,19 @@ feature 'Admin budget investments' do expect(page).to have_link("Build a hospital") expect(page).to have_link("Build a theatre") - select "Health", from: "valuator_group_id" + select "Health", from: "valuator_or_group_id" expect(page).to have_content('There is 1 investment') expect(page).to have_link("Build a hospital") expect(page).not_to have_link("Build a theatre") - select "All groups", from: "valuator_group_id" + select "All valuators", from: "valuator_or_group_id" expect(page).to have_content('There are 2 investments') expect(page).to have_link("Build a hospital") expect(page).to have_link("Build a theatre") - select "Culture", from: "valuator_group_id" + select "Culture", from: "valuator_or_group_id" expect(page).to have_content('There is 1 investment') expect(page).to have_link("Build a theatre") expect(page).not_to have_link("Build a hospital") diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb index 014a6f863..c939922a4 100644 --- a/spec/features/admin/valuator_groups_spec.rb +++ b/spec/features/admin/valuator_groups_spec.rb @@ -51,7 +51,7 @@ feature "Valuator groups" do fill_in "valuator_group_name", with: "Health" click_button "Create valuators group" - expect(page).to have_content "User group created successfully" + expect(page).to have_content "Valuator group created successfully" expect(page).to have_content "There is 1 valuator group" expect(page).to have_content "Health" end @@ -65,7 +65,7 @@ feature "Valuator groups" do fill_in "valuator_group_name", with: "Health and Sports" click_button "Save valuators group" - expect(page).to have_content "User group updated successfully" + expect(page).to have_content "Valuator group updated successfully" expect(page).to have_content "Health and Sports" end @@ -75,10 +75,52 @@ feature "Valuator groups" do visit admin_valuator_groups_path click_link "Delete" - expect(page).to have_content "User group deleted successfully" + expect(page).to have_content "Valuator group deleted successfully" expect(page).to have_content "There are no valuator groups" end - pending "When we change the group of a Valuator we should also change the valuator_assignments" + context "Assign valuators to groups" do + + scenario "Add a valuator to a group" do + valuator = create(:valuator) + group = create(:valuator_group, name: "Health") + + visit edit_admin_valuator_path(valuator) + + select "Health", from: "valuator_valuator_group_id" + click_button "Update valuator" + + expect(page).to have_content "Valuator updated successfully" + expect(page).to have_content "Health" + end + + scenario "Update a valuator's group" do + valuator = create(:valuator) + group1 = create(:valuator_group, name: "Health") + group2 = create(:valuator_group, name: "Economy") + valuator.update(valuator_group: group1) + + visit edit_admin_valuator_path(valuator) + select "Economy", from: "valuator_valuator_group_id" + click_button "Update valuator" + + expect(page).to have_content "Valuator updated successfully" + expect(page).to have_content "Economy" + end + + scenario "Remove a valuator from a group" do + valuator = create(:valuator) + group1 = create(:valuator_group, name: "Health") + valuator.update(valuator_group: group1) + + visit edit_admin_valuator_path(valuator) + select "", from: "valuator_valuator_group_id" + click_button "Update valuator" + + expect(page).to have_content "Valuator updated successfully" + expect(page).to_not have_content "Health" + end + + end end \ No newline at end of file diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index 1e1de562c..ba6792b49 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -1,6 +1,7 @@ require 'rails_helper' feature 'Admin valuators' do + background do @admin = create(:administrator) @user = create(:user, username: 'Jose Luis Balbin') @@ -102,48 +103,4 @@ feature 'Admin valuators' do end end - context "Valuator Group" do - - scenario "Add a valuator to a group" do - valuator = create(:valuator) - group = create(:valuator_group, name: "Health") - - visit edit_admin_valuator_path(valuator) - - select "Health", from: "valuator_valuator_group_id" - click_button "Update valuator" - - expect(page).to have_content "Valuator updated successfully" - expect(page).to have_content "Health" - end - - scenario "Update a valuator's group" do - valuator = create(:valuator) - group1 = create(:valuator_group, name: "Health") - group2 = create(:valuator_group, name: "Economy") - valuator.update(valuator_group: group1) - - visit edit_admin_valuator_path(valuator) - select "Economy", from: "valuator_valuator_group_id" - click_button "Update valuator" - - expect(page).to have_content "Valuator updated successfully" - expect(page).to have_content "Economy" - end - - scenario "Remove a valuator from a group" do - valuator = create(:valuator) - group1 = create(:valuator_group, name: "Health") - valuator.update(valuator_group: group1) - - visit edit_admin_valuator_path(valuator) - select "", from: "valuator_valuator_group_id" - click_button "Update valuator" - - expect(page).to have_content "Valuator updated successfully" - expect(page).to_not have_content "Health" - end - - end - end diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb index cdee81087..5e0a24487 100644 --- a/spec/models/budget/investment_spec.rb +++ b/spec/models/budget/investment_spec.rb @@ -349,6 +349,20 @@ describe Budget::Investment do expect(valuating.size).to eq(1) expect(valuating.first).to eq(investment2) end + + it "returns all investments with assigned valuator groups but valuation not finished" do + investment1 = create(:budget_investment) + investment2 = create(:budget_investment) + investment3 = create(:budget_investment, valuation_finished: true) + + investment2.valuator_groups << create(:valuator_group) + investment3.valuator_groups << create(:valuator_group) + + valuating = described_class.valuating + + expect(valuating.size).to eq(1) + expect(valuating.first).to eq(investment2) + end end describe "valuation_finished" do diff --git a/spec/models/valuator_spec.rb b/spec/models/valuator_spec.rb index c9387a150..7f2ffecfa 100644 --- a/spec/models/valuator_spec.rb +++ b/spec/models/valuator_spec.rb @@ -16,7 +16,38 @@ describe Valuator do end end - describe "Group" do - pending "should reasign investments when the group changes" + describe "#assigned_investment_ids" do + + it "returns investments assigned to a valuator" do + valuator = create(:valuator) + investment1 = create(:budget_investment) + investment2 = create(:budget_investment) + investment3 = create(:budget_investment) + + investment1.valuators << valuator + investment2.valuators << valuator + + assigned_investment_ids = valuator.assigned_investment_ids + expect(assigned_investment_ids).to include investment1.id + expect(assigned_investment_ids).to include investment2.id + expect(assigned_investment_ids).to_not include investment3.id + end + + it "returns investments assigned to a valuator group" do + group = create(:valuator_group) + valuator = create(:valuator, valuator_group: group) + + investment1 = create(:budget_investment) + investment2 = create(:budget_investment) + investment3 = create(:budget_investment) + + investment1.valuator_groups << group + investment2.valuator_groups << group + + assigned_investment_ids = valuator.assigned_investment_ids + expect(assigned_investment_ids).to include investment1.id + expect(assigned_investment_ids).to include investment2.id + expect(assigned_investment_ids).to_not include investment3.id + end end end From 8bb4dde6ac937062663a20c5311821c231a83d64 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 3 Apr 2018 22:01:03 +0200 Subject: [PATCH 16/17] Fix conflicts with fork --- db/schema.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 6336dd302..5a83bebe6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -137,7 +137,6 @@ ActiveRecord::Schema.define(version: 20180320104823) do t.string "feasibility", limit: 15, default: "undecided" t.text "price_explanation" t.text "unfeasibility_explanation" - t.text "internal_comments" t.boolean "valuation_finished", default: false t.integer "valuator_assignments_count", default: 0 t.integer "price_first_year", limit: 8 @@ -158,9 +157,8 @@ ActiveRecord::Schema.define(version: 20180320104823) do t.string "location" t.string "organization_name" t.datetime "unfeasible_email_sent_at" - t.integer "ballot_lines_count", default: 0 - t.integer "previous_heading_id" t.integer "ballot_lines_count", default: 0 + t.integer "previous_heading_id" t.boolean "winner", default: false t.boolean "incompatible", default: false t.integer "community_id" @@ -189,16 +187,6 @@ ActiveRecord::Schema.define(version: 20180320104823) do add_index "budget_phases", ["next_phase_id"], name: "index_budget_phases_on_next_phase_id", using: :btree add_index "budget_phases", ["starts_at"], name: "index_budget_phases_on_starts_at", using: :btree - create_table "budget_polls", force: :cascade do |t| - t.string "name" - t.string "email" - t.string "preferred_subject" - t.boolean "collective" - t.boolean "public_worker" - t.boolean "proposal_author" - t.boolean "selected_proposal_author" - end - create_table "budget_reclassified_votes", force: :cascade do |t| t.integer "user_id" t.integer "investment_id" From 7386a39f2d6d5cda56ee7b32dfc08756dcdba197 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 3 Apr 2018 22:01:10 +0200 Subject: [PATCH 17/17] Fix specs --- app/models/abilities/valuator.rb | 4 ++-- spec/features/admin/budget_investments_spec.rb | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models/abilities/valuator.rb b/app/models/abilities/valuator.rb index cec3e5f1d..ade0a42b7 100644 --- a/app/models/abilities/valuator.rb +++ b/app/models/abilities/valuator.rb @@ -6,8 +6,8 @@ module Abilities valuator = user.valuator can [:read, :update, :valuate], SpendingProposal - can [:read, :update, :comment_valuation], Budget::Investment, id: valuator.investment_ids + valuator.valuator_group.investment_ids - can [:valuate], Budget::Investment, { id: valuator.investment_ids + valuator.valuator_group.investment_ids, valuation_finished: false } + can [:read, :update, :comment_valuation], Budget::Investment, id: valuator.assigned_investment_ids + can [:valuate], Budget::Investment, { id: valuator.assigned_investment_ids, valuation_finished: false } cannot [:update, :valuate, :comment_valuation], Budget::Investment, budget: { phase: 'finished' } end end diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index cd802486e..9a44249b4 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -87,9 +87,9 @@ feature 'Admin budget investments' do end scenario 'Display valuator group assignments' do - budget_investment1 = create(:budget_investment, budget: @budget) - budget_investment2 = create(:budget_investment, budget: @budget) - budget_investment3 = create(:budget_investment, budget: @budget) + budget_investment1 = create(:budget_investment, budget: budget) + budget_investment2 = create(:budget_investment, budget: budget) + budget_investment3 = create(:budget_investment, budget: budget) health_group = create(:valuator_group, name: "Health") culture_group = create(:valuator_group, name: "Culture") @@ -97,7 +97,7 @@ feature 'Admin budget investments' do budget_investment1.valuator_groups << health_group budget_investment2.valuator_group_ids = [health_group.id, culture_group.id] - visit admin_budget_budget_investments_path(budget_id: @budget.id) + visit admin_budget_budget_investments_path(budget_id: budget) within("#budget_investment_#{budget_investment1.id}") do expect(page).to have_content("Health") @@ -221,13 +221,13 @@ feature 'Admin budget investments' do health_group = create(:valuator_group, name: "Health") culture_group = create(:valuator_group, name: "Culture") - budget_investment1 = create(:budget_investment, title: "Build a hospital", budget: @budget) + budget_investment1 = create(:budget_investment, title: "Build a hospital", budget: budget) budget_investment1.valuator_groups << health_group - budget_investment2 = create(:budget_investment, title: "Build a theatre", budget: @budget) + budget_investment2 = create(:budget_investment, title: "Build a theatre", budget: budget) budget_investment2.valuator_groups << culture_group - visit admin_budget_budget_investments_path(budget_id: @budget.id) + visit admin_budget_budget_investments_path(budget_id: budget) expect(page).to have_link("Build a hospital") expect(page).to have_link("Build a theatre")