Updated stats on talks to return total slots available and in the

future.

app/controllers/stats_controller.rb

@@ -4,7 +4,7 @@ class StatsController < ActionController::Base
   def talks
 
     @talks = Talk.find_attendee_talks.count
-    @slots_free = Slot.find_available.count
+    @slots_free = Slot.find_all_available_upcoming.count
 
     result = {:talks => @talks, :slots_free => @slots_free}
     render :json => result.to_json

app/models/slot.rb

@@ -44,21 +44,57 @@ def self.find_empty
     return @slots
   end
 
-  # Empty and unlocked
-  def self.find_available
+  # Empty and in the future (but not necessarily available)
+  def self.find_empty_upcoming
+    @slots = Array.new()
 
-    empty_slots = Slot.find_empty
+    upcoming_timeslots = Timeslot.upcoming
+    empty_slots.find_empty.each do | slot |
+      if (upcoming_timeslots.include?(slot.timeslot))
+        @slots << slot
+      end
+    end
+    return @slots
+
+  end
+
+  # Empty and unlocked (but not necessarily in the future)
+  def self.find_all_available
+    self.find_available(Slot.all)
+  end
+
+  # Empty and unlocked from set of slots provided (but not necessarily in the future)
+  def self.find_available(slots_to_check)      
 
     @slots = Array.new()
-    empty_slots.each do | slot |
-      if (!slot.locked)
+    slots_to_check.each do | slot |
+      if (!slot.locked && slot.is_empty?)
         @slots << slot
       end
     end
 
     return @slots
   end
 
+  # Available and in the future
+  def self.find_all_available_upcoming
+    Slot.find_available_upcoming(Slot.all)    
+  end
+
+  # Available and in the future
+  def self.find_available_upcoming(slots_to_check)      
+
+    @slots = Array.new()
+    slots_to_check.each do | slot |
+      if (!slot.locked && slot.is_empty? && slot.timeslot.is_upcoming?)
+        @slots << slot
+      end
+    end
+
+    return @slots
+
+  end
+
   def self.find_occupied
     Slot.select {|slot| !slot.is_empty?}
   end

app/models/timeslot.rb

@@ -42,6 +42,10 @@ def on_now?
   def on_next?
     self == Timeslot.on_next
   end
+
+  def is_upcoming?
+      self.start >= Time.now
+  end
 
   # Returns the timeslot that immediately follows the current timeslot
   def next
@@ -61,7 +65,7 @@ def self.today
   # Returns all timeslots that begin during the first day of the event
   def self.first_day
     Timeslot.by_date(Timeslot.all.first.start.to_date)
-  end
+  end    
 
   # Returns all timeslots that begin during date specified
   def self.by_date(date_in)