Fix mandate ordering

memopol/tests/response_fixtures/RepresentativeMandatesTest.test_current_mandates.content

@@ -97,12 +97,12 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation to the EU-Chile Joint Parliamentary Committee
+      Delegation for relations with Israel
     </h4>
     
     <div class="text-center desc">
-      <b>Vice-Chair</b>
-      from 13/10/2014
+      <b>Substitute</b>
+      from 08/05/2015
       to present
     </div>
   </div>
@@ -112,12 +112,12 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation to the Euro-Latin American Parliamentary Assembly
+      Delegation for relations with the United States
     </h4>
     
     <div class="text-center desc">
-      <b>Member</b>
-      from 14/07/2014
+      <b>Substitute</b>
+      from 28/10/2015
       to present
     </div>
   </div>
@@ -127,12 +127,12 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation for relations with the United States
+      Delegation to the EU-Chile Joint Parliamentary Committee
     </h4>
     
     <div class="text-center desc">
-      <b>Substitute</b>
-      from 28/10/2015
+      <b>Vice-Chair</b>
+      from 13/10/2014
       to present
     </div>
   </div>
@@ -142,12 +142,12 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation for relations with Israel
+      Delegation to the Euro-Latin American Parliamentary Assembly
     </h4>
     
     <div class="text-center desc">
-      <b>Substitute</b>
-      from 08/05/2015
+      <b>Member</b>
+      from 14/07/2014
       to present
     </div>
   </div>

memopol/tests/response_fixtures/RepresentativeMandatesTest.test_past_mandates.content

@@ -52,15 +52,15 @@
 <div class="col-sm-12 col-md-6 mandate mandate-secondary">
   <div class="thumbnail">
     
-      <span class="badge mandate-badge">PETI</span>
+      <span class="badge mandate-badge">AFET</span>
     
     <h4 class="text-center">
-      Committee on Petitions
+      Committee on Foreign Affairs
     </h4>
     
     <div class="text-center desc">
       <b>Substitute</b>
-      from 12/11/2014
+      from 01/07/2014
       to 16/11/2014
     </div>
   </div>
@@ -69,15 +69,15 @@
 <div class="col-sm-12 col-md-6 mandate mandate-secondary">
   <div class="thumbnail">
     
-      <span class="badge mandate-badge">AFET</span>
+      <span class="badge mandate-badge">PETI</span>
     
     <h4 class="text-center">
-      Committee on Foreign Affairs
+      Committee on Petitions
     </h4>
     
     <div class="text-center desc">
       <b>Substitute</b>
-      from 01/07/2014
+      from 12/11/2014
       to 16/11/2014
     </div>
   </div>
@@ -219,7 +219,7 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation to the Euro-Latin American Parliamentary Assembly
+      Delegation for relations with the countries of the Andean Community
     </h4>
     
     <div class="text-center desc">
@@ -234,11 +234,11 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation for relations with the countries of the Andean Community
+      Delegation to the ACP-EU Joint Parliamentary Assembly
     </h4>
     
     <div class="text-center desc">
-      <b>Member</b>
+      <b>Substitute</b>
       from 16/09/2009
       to 30/06/2014
     </div>
@@ -249,7 +249,7 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation to the EU-Mexico Joint Parliamentary Committee
+      Delegation to the EU-Chile Joint Parliamentary Committee
     </h4>
     
     <div class="text-center desc">
@@ -264,7 +264,7 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation to the EU-Chile Joint Parliamentary Committee
+      Delegation to the EU-Mexico Joint Parliamentary Committee
     </h4>
     
     <div class="text-center desc">
@@ -279,11 +279,11 @@
   <div class="thumbnail">
     
     <h4 class="text-center">
-      Delegation to the ACP-EU Joint Parliamentary Assembly
+      Delegation to the Euro-Latin American Parliamentary Assembly
     </h4>
     
     <div class="text-center desc">
-      <b>Substitute</b>
+      <b>Member</b>
       from 16/09/2009
       to 30/06/2014
     </div>
@@ -293,14 +293,14 @@
 <div class="col-sm-12 col-md-6 mandate mandate-secondary">
   <div class="thumbnail">
     
-      <span class="badge mandate-badge">AFET</span>
+      <span class="badge mandate-badge">LIBE</span>
     
     <h4 class="text-center">
-      Committee on Foreign Affairs
+      Committee on Civil Liberties, Justice and Home Affairs
     </h4>
     
     <div class="text-center desc">
-      <b>Substitute</b>
+      <b>Member</b>
       from 16/07/2009
       to 18/01/2012
     </div>
@@ -310,14 +310,14 @@
 <div class="col-sm-12 col-md-6 mandate mandate-secondary">
   <div class="thumbnail">
     
-      <span class="badge mandate-badge">LIBE</span>
+      <span class="badge mandate-badge">AFET</span>
     
     <h4 class="text-center">
-      Committee on Civil Liberties, Justice and Home Affairs
+      Committee on Foreign Affairs
     </h4>
     
     <div class="text-center desc">
-      <b>Member</b>
+      <b>Substitute</b>
       from 16/07/2009
       to 18/01/2012
     </div>
@@ -378,14 +378,14 @@
 <div class="col-sm-12 col-md-6 mandate mandate-secondary">
   <div class="thumbnail">
     
-      <span class="badge mandate-badge">DEVE</span>
+      <span class="badge mandate-badge">LIBE</span>
     
     <h4 class="text-center">
-      Committee on Development
+      Committee on Civil Liberties, Justice and Home Affairs
     </h4>
     
     <div class="text-center desc">
-      <b>Substitute</b>
+      <b>Member</b>
       from 12/12/2007
       to 13/07/2009
     </div>
@@ -395,15 +395,15 @@
 <div class="col-sm-12 col-md-6 mandate mandate-secondary">
   <div class="thumbnail">
     
-      <span class="badge mandate-badge">JURI</span>
+      <span class="badge mandate-badge">DEVE</span>
     
     <h4 class="text-center">
-      Committee on Legal Affairs
+      Committee on Development
     </h4>
     
     <div class="text-center desc">
       <b>Substitute</b>
-      from 22/09/2008
+      from 12/12/2007
       to 13/07/2009
     </div>
   </div>
@@ -412,15 +412,15 @@
 <div class="col-sm-12 col-md-6 mandate mandate-secondary">
   <div class="thumbnail">
     
-      <span class="badge mandate-badge">LIBE</span>
+      <span class="badge mandate-badge">JURI</span>
     
     <h4 class="text-center">
-      Committee on Civil Liberties, Justice and Home Affairs
+      Committee on Legal Affairs
     </h4>
     
     <div class="text-center desc">
-      <b>Member</b>
-      from 12/12/2007
+      <b>Substitute</b>
+      from 22/09/2008
       to 13/07/2009
     </div>
   </div>

memopol/views/representative_detail_mandates.py

@@ -24,6 +24,7 @@ class RepresentativeDetailMandates(RepresentativeDetailBase):
                 default=Value(100),
                 output_field=IntegerField()
             )
-        ).select_related('group__chamber').order_by('-end_date', 'weight')
+        ).select_related('group__chamber').order_by('-end_date', 'weight',
+                                                    'group__name')
 
         return c