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

Show only finished budgets at budget's index

Browse Source 
We only need finished budget's at budget's index "Finished budgets"
section. So we add the `finished` scope to @budgets variable, and rename
it so its clear what it contains.

Also avoid showing the "Finished budgets" section if there is none
This commit is contained in:
Bertocq
2018-01-23 23:52:42 +01:00
parent e5cff2fb60
commit e62ca48a94
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/budgets_controller.rb
View File

@@ -14,7 +14,7 @@ class BudgetsController < ApplicationController
end
def index
@budgets = @budgets.order(created_at: :desc)
@finished_budgets = @budgets.finished.order(created_at: :desc)
@budget = current_budget
@budgets_coordinates = current_budget_map_locations
end

60
app/views/budgets/index.html.erb
View File

@@ -108,44 +108,46 @@
</div>
</div>
<div class="row margin-top">
<div class="small-12 medium-9 column">
<ul class="no-bullet submenu">
<li class="inline-block">
<%= link_to "#other_budgets", class: "active" do %>
<h2>
<%= t("budgets.index.finished_budgets") %>
</h2>
<% end %>
</li>
</ul>
<% if @finished_budgets.present? %>
<div class="row margin-top">
<div class="small-12 medium-9 column">
<ul class="no-bullet submenu">
<li class="inline-block">
<%= link_to "#other_budgets", class: "active" do %>
<h2>
<%= t("budgets.index.finished_budgets") %>
</h2>
<% end %>
</li>
</ul>
<div class="budget-investments-list">
<% @budgets.each do |budget| %>
<% if budget_published?(budget) %>
<div class="budget-investment clear">
<div class="panel past-budgets">
<div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-9 column table" data-equalizer-watch>
<div class="table-cell align-middle">
<h3><%= budget.name %></h3>
<div id="finished_budgets" class="budget-investments-list">
<% @finished_budgets.each do |budget| %>
<% if budget_published?(budget) %>
<div class="budget-investment clear">
<div class="panel past-budgets">
<div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-9 column table" data-equalizer-watch>
<div class="table-cell align-middle">
<h3><%= budget.name %></h3>
</div>
</div>
</div>
<div class="small-12 medium-3 column table" data-equalizer-watch>
<div class="table-cell align-middle">
<%= link_to t("budgets.index.see_results"),
budget_results_path(budget.id),
class: "button expanded" %>
<div class="small-12 medium-3 column table" data-equalizer-watch>
<div class="table-cell align-middle">
<%= link_to t("budgets.index.see_results"),
budget_results_path(budget.id),
class: "button expanded" %>
</div>
</div>
</div>
</div>
</div>
</div>
<% end %>
<% end %>
<% end %>
</div>
</div>
</div>
</div>
<% end %>
<div class="row">
<div class="small-12 column">