1
0
Fork 0

Sort select inputs and display total observations in query

merge-requests/421/head
Pierros Papadeas 2017-10-15 11:21:16 +01:00
parent 54350db2f4
commit fd5cb39ad5
2 changed files with 3 additions and 2 deletions

View File

@ -174,8 +174,8 @@ class ObservationListView(ListView):
"""
context = super(ObservationListView, self).get_context_data(**kwargs)
context['satellites'] = Satellite.objects.all()
context['authors'] = User.objects.all()
context['stations'] = Station.objects.all()
context['authors'] = User.objects.all().order_by('first_name', 'last_name', 'username')
context['stations'] = Station.objects.all().order_by('id')
norad_cat_id = self.request.GET.get('norad', None)
observer = self.request.GET.get('observer', None)
station = self.request.GET.get('station', None)

View File

@ -139,6 +139,7 @@
</tbody>
</table>
{% if is_paginated %}{% load paginator %}{% paginator request 3 %}{% endif %}
Query returned {{ observations|length }} observation{{ observations|length|pluralize }}
</div>
</div>
{% include 'includes/satellite.html' %}