State counts, null-hiding

- Add method for quickly counting present, unknown and absent
participants for an activity.
- Add partial for these counts (needs css)
- Hide some null attributes in activities

app/models/activity.rb

@@ -76,6 +76,11 @@ class Activity < ApplicationRecord
     )
   end
 
+  # Query the database to determine the amount of participants that are present/absent/unknown
+  def state_counts
+    self.participants.group(:attending).count
+  end
+
   # Determine whether the passed Person may change this activity.
   def may_change?(person)
     person.is_admin ||

app/views/activities/_state_counts.html.haml

@@ -0,0 +1,13 @@
+(
+%span.state-count.present-count
+  = counts[true]
+  P
+,
+%span.state-count.unknown-count
+  = counts[nil]
+  ?
+,
+%span.state-count.absent-count
+  = counts[false]
+  A
+)

app/views/activities/show.html.erb

@@ -1,14 +1,16 @@
 <h2><%= @activity.public_name %></h2>
 
 <ul>
+  <% if @activity.secret_name %>
   <li>Secretly <%= @activity.secret_name %></li>
-  <li><%= @activity.description %></li>
-  <li><%= @activity.location %></li>
-  <li><%= @activity.start %> - <%= @activity.end %></li>
-  <li>Deadline <%= @activity.deadline %></li>
+  <% end %>
+  <li>Description:<%= @activity.description %></li>
+  <li>Location:<%= @activity.location %></li>
+  <li>Start: <%= @activity.start %> - <%= @activity.end %></li>
+  <li>Deadline: <%= @activity.deadline %></li>
 </ul>
 
-<h2>Participants (<%= @activity.participants.count %>)</h2>
+<h2>Participants (<%= @activity.participants.count %> <%= render partial: "state_counts", locals: {counts:@activity.state_counts}%>)</h2>
 <table class="table table-bordered">
   <% @activity.participants.each do |p| %>
     <tr class="<%= p.row_class %>" data-person-id="<%= p.person.id %>" data-activity-id="<%= @activity.id %>">

app/views/dashboard/home.html.haml

@@ -66,7 +66,10 @@
                 %tr
                   %td
                     = link_to group_activity_url(a.group, a) do
-                      = "#{a.public_name} (#{a.secret_name})"
+                      = a.public_name
+                      - if a.secret_name
+                        = "(#{a.secret_name})"
+                      = render partial: "activities/state_counts", locals: {counts: a.state_counts}
 
   .row
     .col-md-12