complete search page with filters, pagination, etc.

diff --git a/nonstop/forms.py b/nonstop/forms.py
index b421fc0c811a1877258b3c0db6a4172a5be3ed82..1b4b4aaf87e8ce3a3525e1c8f86b91d073f70548 100644 (file)
--- a/nonstop/forms.py
+++ b/nonstop/forms.py
@@ -10,6 +10,9 @@ def get_nonstop_zones():
 def get_optional_nonstop_zones():
     return [('', '')] + get_nonstop_zones()
 
+def get_search_nonstop_zones():
+    return [('', 'All'), ('', '--------------')] + get_nonstop_zones() + [('', '--------------'), ('none', 'None')]
+
 class UploadTracksForm(forms.Form):
     tracks = forms.FileField(widget=forms.ClearableFileInput(
         attrs={'multiple': True, 'accept': 'audio/*'}))
@@ -23,10 +26,14 @@ class TrackMetaForm(forms.ModelForm):
 
 
 class TrackSearchForm(forms.Form):
-    q = forms.CharField(label=_('Text'))
-    zone = forms.ChoiceField(label=_('Nonstop Zone'), choices=get_optional_nonstop_zones)
+    q = forms.CharField(label=_('Text'), required=False)
+    zone = forms.ChoiceField(label=_('Nonstop Zone'),
+            choices=get_search_nonstop_zones, required=False)
     order_by = forms.ChoiceField(label=_('Order'),
-            choices=[('alpha', _('Alphabetically'))])
+            required=False,
+            choices=[('title', _('Alphabetically')),
+                     ('-added_to_nonstop_timestamp', _('Newest first')),
+                     ('added_to_nonstop_timestamp', _('Oldest first'))])
 
 
 class CleanupForm(forms.Form):

diff --git a/nonstop/templates/nonstop/search.html b/nonstop/templates/nonstop/search.html
index ea3d3e4902cae85f901f5046d8a5fb7b7433af4a..1270091ecfeecc83a0cae98ee8bab4c603636c98 100644 (file)
--- a/nonstop/templates/nonstop/search.html
+++ b/nonstop/templates/nonstop/search.html
@@ -12,12 +12,65 @@
 </form>
 <hr>
 
-{% if tracks.exists %}
-<ul>
+{% if tracks %}
+<table>
   {% for track in tracks %}
-  <li><a href="{% url 'track-view' pk=track.id %}">{{track.title}}</a> — {{track.artist.name}}</li>
+  <tr><td class="track"><a href="{% url 'track-view' pk=track.id %}">{{track.title}}</a></td>
+      <td class="artist">{{track.artist.name}}</td>
+      <td class="zone">{% for zone in track.nonstop_zones.all %}{{ zone.title }}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
+      <td class="since">{% if track.added_to_nonstop_timestamp %}(since {{track.added_to_nonstop_timestamp|date:"SHORT_DATE_FORMAT" }}{% endif %}</td>
+  </tr>
   {% endfor %}
-</ul>
+</table>
+
+<div class="pagination">
+    <span class="step-links">
+        {% if tracks.has_previous %}
+            <a href="?{{ qs }}&page={{ tracks.previous_page_number }}">←</a>
+        {% endif %}
+
+        <span class="current">
+            {{ tracks.number }} / {{ tracks.paginator.num_pages }}
+        </span>
+
+        {% if tracks.has_next %}
+            <a href="?{{ qs }}&page={{ tracks.next_page_number }}">→</a>
+        {% endif %}
+    </span>
+</div>
 {% endif %}
 
+<style>
+table {
+        max-width: 100%;
+        min-width: 50em;
+}
+td {
+        padding: 0.4ex 1ex;
+}
+td.track {
+        min-width: 30em;
+}
+td.artist {
+        min-width: 20em;
+}
+td.zone {
+        min-width: 10em;
+}
+td.since {
+        min-width: 10em;
+}
+tr:nth-child(even) {
+  background: #f2f2f2;
+}
+
+.step-links a {
+        padding: 1ex;
+}
+
+div.pagination {
+        margin-top: 1em;
+}
+</style>
+
 {% endblock %}

diff --git a/nonstop/views.py b/nonstop/views.py
index 16581943c0dcdbd7ce3c0ebdf270b45f2e1c87f0..5c1bf3c33e16c06f795e9fb9bcc6f7d7a8bbbe52 100644 (file)
--- a/nonstop/views.py
+++ b/nonstop/views.py
@@ -8,6 +8,7 @@ import tempfile
 import mutagen
 
 from django.core.files.storage import default_storage
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.core.urlresolvers import reverse
 from django.contrib import messages
 from django.db.models import Q
@@ -246,7 +247,7 @@ class SearchView(TemplateView):
 
     def get_context_data(self, **kwargs):
         ctx = super(SearchView, self).get_context_data(**kwargs)
-        ctx['form'] = TrackSearchForm()
+        ctx['form'] = TrackSearchForm(self.request.GET)
         queryset = Track.objects.all()
 
         q = self.request.GET.get('q')
@@ -256,10 +257,30 @@ class SearchView(TemplateView):
         zone = self.request.GET.get('zone')
         if zone:
             from emissions.models import Nonstop
-            queryset = queryset.filter(nonstop_zones=zone)
-
-        if q or zone:
-            ctx['tracks'] = queryset.order_by('title').select_related()
+            if zone == 'none':
+                queryset = queryset.filter(nonstop_zones=None)
+            else:
+                queryset = queryset.filter(nonstop_zones=zone)
+
+        qs = self.request.GET.copy()
+        qs.pop('page', None)
+        ctx['qs'] = qs.urlencode()
+
+        order = self.request.GET.get('order_by') or 'title'
+        if order:
+            if 'added_to_nonstop_timestamp' in order:
+                queryset = queryset.filter(added_to_nonstop_timestamp__isnull=False)
+            queryset = queryset.order_by(order)
+
+        tracks = Paginator(queryset.select_related(), 20)
+
+        page = self.request.GET.get('page')
+        try:
+            ctx['tracks'] = tracks.page(page)
+        except PageNotAnInteger:
+            ctx['tracks'] = tracks.page(1)
+        except EmptyPage:
+            ctx['tracks'] = tracks.page(tracks.num_pages)
 
         return ctx