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

displays money remaining in each group

Browse Source
This commit is contained in:
rgarcia
2016-09-09 19:07:53 +02:00
parent 5aeec32704
commit 24740578ff
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/budget/ballot.rb
View File

@@ -55,7 +55,7 @@ class Budget
end
def heading_for_group(group)
self.headings.where(group: group).first.id
self.headings.where(group: group).first
end
end

4
app/views/budgets/ballot/show.html.erb
View File

@@ -29,7 +29,7 @@
<h4 class="amount-spent text-right">
<%= t("budgets.ballots.show.amount_spent") %>
<span>
<%= format_price(@budget, @ballot.amount_spent(@ballot.heading_for_group(group))) %>
<%= format_price(@budget, @ballot.amount_spent(@ballot.heading_for_group(group).id)) %>
</span>
</h4>
<% else %>
@@ -48,7 +48,7 @@
<h4>
<%= t("budgets.ballots.show.remaining",
amount_city: format_price(@budget, @ballot.amount_available(group.headings.first))).html_safe %>
amount_city: format_price(@budget, @ballot.amount_available(@ballot.heading_for_group(group)))).html_safe %>
</h4>
</div>
<% end %>

13
spec/features/budgets/ballots_spec.rb
View File

@@ -315,16 +315,15 @@ feature 'Ballots' do
context 'Showing the ballot' do
pending "Do not display heading name if there is only one heading in the group (example: group city)"
pending "Money remaining in each group (maybe integrate in an existing scenario)"
scenario 'Displaying the correct count & amount', :focus do
scenario 'Displaying the correct count & amount' do
user = create(:user, :level_two)
group1 = create(:budget_group, budget: budget)
group2 = create(:budget_group, budget: budget)
heading1 = create(:budget_heading, name: "District 1", group: group1)
heading2 = create(:budget_heading, name: "District 2", group: group2)
heading1 = create(:budget_heading, name: "District 1", group: group1, price: 100)
heading2 = create(:budget_heading, name: "District 2", group: group2, price: 50)
ballot = create(:budget_ballot, user: user, budget: budget)
@@ -349,12 +348,14 @@ feature 'Ballots' do
within("#budget_group_#{group1.id}") do
expect(page).to have_content "#{group1.name} - #{heading1.name}"
expect(page).to have_content "€20"
expect(page).to have_content "Amount spent €20"
expect(page).to have_content "You still have €80 to invest"
end
within("#budget_group_#{group2.id}") do
expect(page).to have_content "#{group2.name} - #{heading2.name}"
expect(page).to have_content "€15"
expect(page).to have_content "Amount spent €15"
expect(page).to have_content "You still have €35 to invest"
end
end