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

Clean up

Browse Source
This commit is contained in:
rgarcia
2018-02-09 22:08:52 +01:00
parent 2d3c4e1fbd
commit 00c965b715
31 changed files with 206 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@
<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>
@@ -61,17 +60,10 @@
<% end %>
</td>
<td class="small">
<% 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 %>
</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(", ") %>
<%= assigned_valuators(investment) %>
<% end %>
</td>
<td class="small">

12
app/views/admin/budget_investments/index.html.erb
View File

@@ -12,21 +12,13 @@
</div>
<div class="small-12 medium-3 column">
<%= 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" } %>
</div>
<div class="small-12 medium-3 column">
<%= 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" } %>
</div>
<div class="small-12 medium-3 column">
<%= select_tag :heading_id,
options_for_select(budget_heading_select_options(@budget), params[:heading_id]),

4
app/views/admin/valuator_groups/_valuator.html.erb Normal file
View File

@@ -0,0 +1,4 @@
<li>
<%= link_to valuator.description_or_email,
admin_valuator_path(valuator) %>
</li>

11
app/views/admin/valuator_groups/show.html.erb
View File

@@ -3,10 +3,11 @@
<h2><%= t("admin.valuator_groups.show.title", group: @group.name) %></h2>
<ul id="valuators">
<% @group.valuators.each do |valuator| %>
<li>
<%= link_to valuator.description_or_email,
admin_valuator_path(valuator) %>
</li>
<% if @group.valuators.any? %>
<%= render partial: 'valuator', collection: @group.valuators %>
<% else %>
<div class="callout primary">
<%= t("admin.valuator_groups.show.no_valuators") %>
</div>
<% end %>
</ul>

4
app/views/admin/valuators/search.html.erb
View File

@@ -30,6 +30,10 @@
<% end %>
<td>
<% 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,