Display valuator group assignments

app/views/admin/budget_investments/_investments.html.erb

@@ -24,6 +24,7 @@
         <th><%= t("admin.budget_investments.index.table_supports") %></th>
         <th><%= t("admin.budget_investments.index.table_admin") %></th>
         <th><%= t("admin.budget_investments.index.table_valuator") %></th>
+        <th><%= t("admin.budget_investments.index.table_valuator_group") %></th>
         <th><%= t("admin.budget_investments.index.table_geozone") %></th>
         <th><%= t("admin.budget_investments.index.table_feasibility") %></th>
         <th class="text-center"><%= t("admin.budget_investments.index.table_valuation_finished") %></th>
@@ -66,6 +67,13 @@
               <%= investment.valuators.collect(&:description_or_name).join(", ") %>
             <% end %>
           </td>
+          <td class="small">
+            <% if investment.valuator_groups.size.zero? %>
+              <%= t("admin.budget_investments.index.no_valuator_groups_assigned") %>
+            <% else %>
+              <%= investment.valuator_groups.collect(&:name).join(", ") %>
+            <% end %>
+          </td>
           <td class="small">
             <%= investment.heading.name %>
           </td>

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:

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

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:

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

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)