Fixed occurrence generation in day views for events with multiple days

bitlabstudio · Sep 5, 2016 · cabe69e · cabe69e
1 parent 9e6b6af
commit cabe69e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/calendarium/models.py b/calendarium/models.py
@@ -217,11 +217,14 @@ def _get_occurrence_gen(self, start, end):
                     start - length, self.end)
 
                 # chosing the first item from the generator to initiate
-                occ_start = next(occ_start_gen)
-                while not end or (end and occ_start <= end):
-                    occ_end = occ_start + length
-                    yield self._create_occurrence(occ_start, occ_end)
+                try:
                     occ_start = next(occ_start_gen)
+                    while not end or (end and occ_start <= end):
+                        occ_end = occ_start + length
+                        yield self._create_occurrence(occ_start, occ_end)
+                        occ_start = next(occ_start_gen)
+                except StopIteration:
+                    pass
 
     def get_occurrences(self, start, end=None):
         """Returns all occurrences from start to end."""

diff --git a/calendarium/views.py b/calendarium/views.py
@@ -232,7 +232,13 @@ def get_context_data(self, **kwargs):
         ctx = self.get_category_context()
         occurrences = Event.objects.get_occurrences(
             self.date, self.date, ctx.get('current_category'))
-        ctx.update({'date': self.date, 'occurrences': occurrences})
+        ctx.update({
+            'date': self.date,
+            'occurrences': filter(
+                lambda occ, date=self.date: occ.start.replace(
+                    hour=0, minute=0, second=0, microsecond=0) == self.date,
+                occurrences),
+        })
         return ctx