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

refactors investment filters

Browse Source
This commit is contained in:
rgarcia
2017-05-06 03:37:29 +02:00
parent fa825185f5
commit c0488c3b3c
12 changed files with 85 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/budgets/groups/show.html.erb
View File

@@ -7,13 +7,13 @@
</div>
</div>
<% if params[:unfeasible] %>
<% if @current_filter == "unfeasible" %>
<div class="row margin-top">
<div class="small-12 column">
<h3><%= t("budgets.groups.show.unfeasible_title") %></h3>
</div>
</div>
<% elsif params[:unselected] %>
<% elsif @current_filter == "unselected" %>
<div class="row margin-top">
<div class="small-12 column">
<h3><%= t("budgets.groups.show.unselected_title") %></h3>
@@ -31,8 +31,7 @@
class="<%= css_for_ballot_heading(heading) %>">
<%= link_to heading.name,
budget_investments_path(heading_id: heading.id,
unfeasible: params[:unfeasible],
unselected: params[:unselected]),
filter: @current_filter),
data: { no_turbolink: true } %><br>
</span>
<% end %>
@@ -46,20 +45,24 @@
</div>
</div>
<% if params[:unfeasible].blank? %>
<% unless @current_filter == "unfeasible" %>
<div class="row">
<div class="small-12 column">
<small><%= link_to t("budgets.groups.show.unfeasible"),
budget_path(@budget, unfeasible: 1) %></small>
<small>
<%= link_to t("budgets.groups.show.unfeasible"),
budget_path(@budget, filter: "unfeasible") %>
</small>
</div>
</div>
<% end %>
<% if params[:unselected].blank? %>
<% unless @current_filter == "unselected" %>
<div class="row">
<div class="small-12 column">
<small><%= link_to t("budgets.groups.show.unselected"),
budget_path(@budget, unselected: 1) %></small>
<small>
<%= link_to t("budgets.groups.show.unselected"),
budget_path(@budget, filter: "unselected") %>
</small>
</div>
</div>
<% end %>

4
app/views/budgets/investments/index.html.erb
View File

@@ -16,7 +16,7 @@
<div class="small-12 search-results margin-bottom">
<% if params[:unfeasible].present? %>
<% if @current_filter == "unfeasible" %>
<h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2>
<div class="callout primary margin">
<%= t("budgets.investments.index.unfeasible_text",
@@ -34,7 +34,7 @@
<% end %>
</div>
<%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless params[:unfeasible].present? %>
<%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %>
<% @investments.each do |investment| %>
<%= render partial: '/budgets/investments/investment', locals: {

26
app/views/budgets/show.html.erb
View File

@@ -37,9 +37,9 @@
<div class="row margin">
<div class="small-12 medium-9 column">
<% if params[:unfeasible] %>
<% if @current_filter == "unfeasible" %>
<h3 class="margin-bottom"><%= t("budgets.show.unfeasible_title") %></h3>
<% elsif params[:unselected] %>
<% elsif @current_filter == "unselected" %>
<h3 class="margin-bottom"><%= t("budgets.show.unselected_title") %></h3>
<% end %>
<table class="table-fixed">
@@ -54,14 +54,12 @@
<%= link_to group.name,
budget_investments_path(@budget,
heading_id: group.headings.first.id,
unfeasible: params[:unfeasible],
unselected: params[:unselected]),
filter: @current_filter),
data: { no_turbolink: true } %>
<% else %>
<%= link_to group.name,
budget_group_path(@budget, group,
unfeasible: params[:unfeasible],
unselected: params[:unselected]) %>
filter: @current_filter) %>
<% end %>
<br>
</td>
@@ -72,20 +70,24 @@
</div>
</div>
<% unless params[:unfeasible] %>
<% unless @current_filter == "unfeasible" %>
<div class="row">
<div class="small-12 column">
<small><%= link_to t("budgets.show.unfeasible"),
budget_path(@budget, unfeasible: 1) %></small>
<small>
<%= link_to t("budgets.show.unfeasible"),
budget_path(@budget, filter: "unfeasible") %>
</small>
</div>
</div>
<% end %>
<% unless params[:unselected] %>
<% unless @current_filter == "unselected" %>
<div class="row">
<div class="small-12 column">
<small><%= link_to t("budgets.show.unselected"),
budget_path(@budget, unselected: 1) %></small>
<small>
<%= link_to t("budgets.show.unselected"),
budget_path(@budget, filter: "unselected") %>
</small>
</div>
</div>
<% end %>