diff --git a/app/models/budget/investment/exporter.rb b/app/models/budget/investment/exporter.rb
index 03900fd7e..c7e4ce461 100644
--- a/app/models/budget/investment/exporter.rb
+++ b/app/models/budget/investment/exporter.rb
@@ -16,16 +16,18 @@ class Budget::Investment::Exporter
def headers
[
- I18n.t("admin.budget_investments.index.table_id"),
- I18n.t("admin.budget_investments.index.table_title"),
- I18n.t("admin.budget_investments.index.table_supports"),
- I18n.t("admin.budget_investments.index.table_admin"),
- I18n.t("admin.budget_investments.index.table_valuator"),
- I18n.t("admin.budget_investments.index.table_valuation_group"),
- I18n.t("admin.budget_investments.index.table_geozone"),
- I18n.t("admin.budget_investments.index.table_feasibility"),
- I18n.t("admin.budget_investments.index.table_valuation_finished"),
- I18n.t("admin.budget_investments.index.table_selection")
+ I18n.t("admin.budget_investments.index.list.id"),
+ I18n.t("admin.budget_investments.index.list.title"),
+ I18n.t("admin.budget_investments.index.list.supports"),
+ I18n.t("admin.budget_investments.index.list.admin"),
+ I18n.t("admin.budget_investments.index.list.valuator"),
+ I18n.t("admin.budget_investments.index.list.valuation_group"),
+ I18n.t("admin.budget_investments.index.list.geozone"),
+ I18n.t("admin.budget_investments.index.list.feasibility"),
+ I18n.t("admin.budget_investments.index.list.valuation_finished"),
+ I18n.t("admin.budget_investments.index.list.selected"),
+ I18n.t("admin.budget_investments.index.list.visible_to_valuators"),
+ I18n.t("admin.budget_investments.index.list.author_username")
]
end
@@ -40,7 +42,9 @@ class Budget::Investment::Exporter
investment.heading.name,
price(investment),
investment.valuation_finished? ? I18n.t('shared.yes') : I18n.t('shared.no'),
- investment.selected? ? I18n.t('shared.yes') : I18n.t('shared.no')
+ investment.selected? ? I18n.t('shared.yes') : I18n.t('shared.no'),
+ investment.visible_to_valuators? ? I18n.t('shared.yes') : I18n.t('shared.no'),
+ investment.author.username
]
end
diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb
index 17b0315b1..c5b7493c6 100644
--- a/app/views/admin/budget_investments/_investments.html.erb
+++ b/app/views/admin/budget_investments/_investments.html.erb
@@ -35,21 +35,21 @@
- | <%= t("admin.budget_investments.index.table_id") %> |
- <%= t("admin.budget_investments.index.table_title") %> |
- <%= t("admin.budget_investments.index.table_supports") %> |
- <%= t("admin.budget_investments.index.table_admin") %> |
+ <%= t("admin.budget_investments.index.list.id") %> |
+ <%= t("admin.budget_investments.index.list.title") %> |
+ <%= t("admin.budget_investments.index.list.supports") %> |
+ <%= t("admin.budget_investments.index.list.admin") %> |
- <%= t("admin.budget_investments.index.table_valuation_group") %>
- <%= t("admin.budget_investments.index.table_valuator") %>
+ <%= t("admin.budget_investments.index.list.valuation_group") %>
+ <%= t("admin.budget_investments.index.list.valuator") %>
|
- <%= t("admin.budget_investments.index.table_geozone") %> |
- <%= t("admin.budget_investments.index.table_feasibility") %> |
- <%= t("admin.budget_investments.index.table_valuation_finished") %> |
- <%= t("admin.budget_investments.index.table_evaluation") %> |
- <%= t("admin.budget_investments.index.table_selection") %> |
+ <%= t("admin.budget_investments.index.list.geozone") %> |
+ <%= t("admin.budget_investments.index.list.feasibility") %> |
+ <%= t("admin.budget_investments.index.list.valuation_finished") %> |
+ <%= t("admin.budget_investments.index.list.visible_to_valuators") %> |
+ <%= t("admin.budget_investments.index.list.selected") %> |
<% if params[:filter] == "selected" %>
- <%= t("admin.budget_investments.index.table_incompatible") %> |
+ <%= t("admin.budget_investments.index.list.incompatible") %> |
<% end %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 48ee46db6..760741453 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -186,18 +186,20 @@ en:
undecided: "Undecided"
selected: "Selected"
select: "Select"
- table_id: "ID"
- table_title: "Title"
- table_supports: "Supports"
- table_admin: "Administrator"
- table_valuator: "Valuator"
- table_valuation_group: "Valuation Group"
- table_geozone: "Scope of operation"
- table_feasibility: "Feasibility"
- table_valuation_finished: "Val. Fin."
- table_selection: "Selected"
- table_evaluation: "Show to valuators"
- table_incompatible: "Incompatible"
+ list:
+ id: ID
+ title: Title
+ supports: Supports
+ admin: Administrator
+ valuator: Valuator
+ valuation_group: Valuation Group
+ geozone: Scope of operation
+ feasibility: Feasibility
+ valuation_finished: Val. Fin.
+ selected: Selected
+ visible_to_valuators: Show to valuators
+ author_username: Author username
+ incompatible: Incompatible
cannot_calculate_winners: The budget has to stay on phase "Balloting projects", "Reviewing Ballots" or "Finished budget" in order to calculate winners projects
see_results: "See results"
show:
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 8929f9e3b..909e2509a 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -187,18 +187,20 @@ es:
undecided: "Sin decidir"
selected: "Seleccionada"
select: "Seleccionar"
- table_id: "ID"
- table_title: "Título"
- table_supports: "Apoyos"
- table_admin: "Administrador"
- table_valuator: "Evaluador"
- table_valuation_group: "Grupos evaluadores"
- table_geozone: "Ámbito de actuación"
- table_feasibility: "Viabilidad"
- table_valuation_finished: "Ev. Fin."
- table_selection: "Seleccionado"
- table_evaluation: "Mostrar a evaluadores"
- table_incompatible: "Incompatible"
+ list:
+ id: ID
+ title: Título
+ supports: Apoyos
+ admin: Administrador
+ valuator: Evaluador
+ valuation_group: Grupos evaluadores
+ geozone: Ámbito de actuación
+ feasibility: Viabilidad
+ valuation_finished: Ev. Fin.
+ selected: Seleccionado
+ visible_to_valuators: Mostrar a evaluadores
+ author_username: Usuario autor
+ incompatible: Incompatible
cannot_calculate_winners: El presupuesto debe estar en las fases "Votación final", "Votación finalizada" o "Resultados" para poder calcular las propuestas ganadoras
see_results: "Ver resultados"
show:
diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index de34f5298..fac876f17 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -1211,13 +1211,15 @@ feature 'Admin budget investments' do
cached_votes_up: 88, price: 99,
valuators: [],
valuator_groups: [valuator_group],
- administrator: admin)
+ administrator: admin,
+ visible_to_valuators: true)
second_investment = create(:budget_investment, :unfeasible, title: "Alt Investment",
budget: budget, group: budget_group,
heading: second_budget_heading,
cached_votes_up: 66, price: 88,
valuators: [valuator],
- valuator_groups: [])
+ valuator_groups: [],
+ visible_to_valuators: false)
visit admin_budget_budget_investments_path(budget)
@@ -1228,10 +1230,11 @@ feature 'Admin budget investments' do
expect(header).to match(/filename="budget_investments.csv"$/)
csv_contents = "ID,Title,Supports,Administrator,Valuator,Valuation Group,Scope of operation,"\
- "Feasibility,Val. Fin.,Selected\n#{first_investment.id},Le Investment,88,"\
- "Admin,-,Valuator Group,Budget Heading,Feasible (€99),Yes,Yes\n"\
- "#{second_investment.id},Alt Investment,66,No admin assigned,Valuator,-,"\
- "Other Heading,Unfeasible,No,No\n"
+ "Feasibility,Val. Fin.,Selected,Show to valuators,Author username\n"\
+ "#{first_investment.id},Le Investment,88,Admin,-,Valuator Group,"\
+ "Budget Heading,Feasible (€99),Yes,Yes,Yes,#{first_investment.author.username}\n#{second_investment.id},"\
+ "Alt Investment,66,No admin assigned,Valuator,-,Other Heading,"\
+ "Unfeasible,No,No,No,#{second_investment.author.username}\n"
expect(page.body).to eq(csv_contents)
end