diff --git a/app/views/dashboard/show.html.erb b/app/views/dashboard/show.html.erb index 6cfe1bd..4b6ca06 100644 --- a/app/views/dashboard/show.html.erb +++ b/app/views/dashboard/show.html.erb @@ -1,70 +1,118 @@
-
- - - - - - - - - - <% @members.each do |member| %> - - - - +
+
+
MemberBurden PercentBurden Amount
<%= member.name %><%= member.burden_percent * 100 %>%<%= number_to_currency(member.burden_amount) %>
+ + + + + - <% end %> - -
MemberBurden PercentBurden Amount
+ + + <% @members.each do |member| %> + + +
<%= member.name %>
+ + + + <%= member.burden_percent * 100 %>% + + + + <%= number_to_currency(member.burden_amount) %> + + + <% end %> + + +
- - - - - - - - - - - <% @incomes.each do |income| %> - - - - - +
+
MemberForAmountIncluded
<%= income.member.name %><%= income.description %><%= number_to_currency(income.amount) %><%= income.included %>
+ + + + + + - <% end %> - -
MemberForAmountIncluded
+ + + <% @incomes.each do |income| %> + + +
<%= income.member.name %>
+ + + <%= income.description %> + + + <%= number_to_currency(income.amount) %> + + + <% if income.included %> + Yes + <% else %> + No + <% end %> + + + <% end %> + + +
-
- - - - - - - - - - - - - <% @expenses.each do |expense| %> - - - - - - - +
+
+
BillPaymentPeriodMontlycredit_cardEstimated
<%= expense.description %><%= number_to_currency(expense.payment) %><%= expense.period %><%= number_to_currency(expense.monthly) %><%= expense.credit_card %><%= expense.estimated %>
+ + + + + + + + - <% end %> - -
BillPaymentPeriodMonthlyCredit CardEstimated
+ + + <% @expenses.each do |expense| %> + + +
<%= expense.description %>
+ + + <%= number_to_currency(expense.payment) %> + + + + <%= expense.period %> + + + + <%= number_to_currency(expense.monthly) %> + + + <% if expense.credit_card %> + Yes + <% else %> + No + <% end %> + + + <% if expense.estimated %> + Est. + <% else %> + Actual + <% end %> + + + <% end %> + + +