Force a specific ordering of entries

memopol/views/representative_detail.py

@@ -59,8 +59,9 @@ class RepresentativeDetail(RepresentativeViewMixin, generic.DetailView):
 
         c['votes'] = c['object'].votes.all()
         c['mandates'] = c['object'].mandates.all()
-        c['positions'] = c['object'].positions.filter(
-            published=True).prefetch_related('tags')
+        c['positions'] = c['object'].positions.filter(published=True) \
+            .prefetch_related('tags') \
+            .order_by('-datetime', 'pk')
 
         c['position_form'] = PositionForm(
             initial={'representative': self.object.pk})

memopol/views/representative_mixin.py

@@ -20,9 +20,9 @@ class RepresentativeViewMixin(object):
         """
         Prefetch Mandates with their Group and Constituency with Country.
         """
-        mandates = Mandate.objects.order_by(
-            '-end_date').select_related('constituency__country', 'group',
-            'group__chamber')
+        mandates = Mandate.objects.order_by('-end_date', '-begin_date',
+            'group__kind', 'group__name').select_related('group',
+            'group__chamber', 'constituency__country')
         return queryset.prefetch_related(
             models.Prefetch('mandates', queryset=mandates))