use visit number to get future visits

smash/web/models/visit.py

@@ -47,15 +47,13 @@ class Visit(models.Model):
         default=1
     )
 
-    #I'm not sure about how to get the next_visit and the future_visits. If based on visit_number or datetime_begin (or both)
-
     @property
     def next_visit(self):
         return Visit.objects.filter(subject=self.subject, visit_number=self.visit_number+1).order_by('datetime_begin','datetime_end').first()
     
     @property
     def future_visits(self):
-        return Visit.objects.filter(subject=self.subject).filter(datetime_begin__gt=self.datetime_begin).order_by('datetime_begin','datetime_end')
+        return Visit.objects.filter(subject=self.subject).filter(visit_number__gt=self.visit_number).order_by('datetime_begin','datetime_end')
 
     def __unicode__(self):
         return "%s %s" % (self.subject.subject.first_name, self.subject.subject.last_name)