add possibility to filter episodes by time

diff --git a/panikombo/forms.py b/panikombo/forms.py
index eae28b4e75dea792a381d82fae5157717d58398b..01fb013a9b0520dbf1ace95c7f2998a5c5e303af 100644 (file)
--- a/panikombo/forms.py
+++ b/panikombo/forms.py
@@ -51,7 +51,7 @@ class EpisodeCellForm(forms.ModelForm):
 class EpisodeAutoSelectionCellForm(forms.ModelForm):
     class Meta:
         model = EpisodeAutoSelectionCell
-        fields = ('title', 'tags', 'category')
+        fields = ('title', 'tags', 'category', 'period')
         widgets = {'tags': TagWidget()}
 
 

diff --git a/panikombo/migrations/0009_episodeautoselectioncell_period.py b/panikombo/migrations/0009_episodeautoselectioncell_period.py
new file mode 100644 (file)
index 0000000..fdd0c87
--- /dev/null
+++ b/panikombo/migrations/0009_episodeautoselectioncell_period.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('panikombo', '0008_topikcell'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='episodeautoselectioncell',
+            name='period',
+            field=models.PositiveSmallIntegerField(default=0, verbose_name='Period', choices=[(0, 'All'), (1, 'Future'), (2, 'Past')]),
+            preserve_default=True,
+        ),
+    ]

diff --git a/panikombo/models.py b/panikombo/models.py
index 5c294bc667bbdbd85ec8f47010ed8aeaac11d08c..38da84bea11e46c1ed284885b55b0470e08340bc 100644 (file)
--- a/panikombo/models.py
+++ b/panikombo/models.py
@@ -85,6 +85,12 @@ class EpisodeAutoSelectionCell(CellBase):
     title = models.CharField(_('Title'), max_length=50, blank=True)
     tags = TaggableManager(_('Tags'), blank=True)
     category = models.ForeignKey('emissions.Category', null=True, blank=True)
+    period = models.PositiveSmallIntegerField(
+            _('Period'), default=0,
+            choices=((0, _('All')),
+                     (1, _('Future')),
+                     (2, _('Past'))))
+
 
     class Meta:
         verbose_name = _('Automatic Episode Selection')
@@ -95,6 +101,31 @@ class EpisodeAutoSelectionCell(CellBase):
             episodes_queryset = episodes_queryset.filter(emission__categories__in=[self.category.id])
         if self.tags.count():
             episodes_queryset = episodes_queryset.filter(tags__in=self.tags.all())
+
+        if self.period == 0:
+            episodes_queryset = episodes_queryset.extra(
+                    select={ 'first_diffusion': 'emissions_diffusion.datetime', },
+                    select_params=(False, True),
+                    where=['''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
+                                           WHERE episode_id = emissions_episode.id)'''],
+                    tables=['emissions_diffusion'])
+        elif self.period == 1:
+            episodes_queryset = episodes_queryset.extra(
+                    select={ 'first_diffusion': 'emissions_diffusion.datetime', },
+                    select_params=(False, True),
+                    where=['''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
+                                           WHERE episode_id = emissions_episode.id AND
+                                                 emissions_diffusion.datetime >= CURRENT_TIMESTAMP)'''],
+                    tables=['emissions_diffusion'])
+        elif self.period == 2:
+            episodes_queryset = episodes_queryset.extra(
+                    select={ 'first_diffusion': 'emissions_diffusion.datetime', },
+                    select_params=(False, True),
+                    where=['''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
+                                           WHERE episode_id = emissions_episode.id AND
+                                                 emissions_diffusion.datetime < CURRENT_TIMESTAMP)'''],
+                    tables=['emissions_diffusion'])
+
         return episodes_queryset
 
     def render(self, context):
@@ -102,15 +133,7 @@ class EpisodeAutoSelectionCell(CellBase):
         context['title'] = self.title
 
         episodes_queryset = self.get_included_items()
-        episodes_queryset = episodes_queryset.extra(select={
-                        'first_diffusion': 'emissions_diffusion.datetime',
-                        },
-                        select_params=(False, True),
-                        where=['''datetime = (SELECT MIN(datetime)
-                                                FROM emissions_diffusion
-                                               WHERE episode_id = emissions_episode.id)'''],
-                        tables=['emissions_diffusion'],
-                    ).order_by('-first_diffusion').distinct()
+        episodes_queryset = episodes_queryset.order_by('-first_diffusion').distinct()
         context['episodes'] = episodes_queryset
         return tmpl.render(context)