Better sort of bofreq list

 - Legacy-Id: 19219

Author: rjsparks

ietf/doc/tests_bofreq.py

@@ -1,11 +1,13 @@
 # Copyright The IETF Trust 2021 All Rights Reserved
 
+import datetime
 import debug    # pyflakes:ignore
 import io
-import shutil
 import os
+import shutil
 
 from pyquery import PyQuery
+from random import randint
 from tempfile import NamedTemporaryFile
 
 from django.conf import settings
@@ -49,18 +51,14 @@ def test_show_bof_requests(self):
         self.assertContains(r, 'There are currently no BOF Requests', status_code=200)
         states = State.objects.filter(type_id='bofreq')
         self.assertTrue(states.count()>0)
-        reqs = BofreqFactory.create_batch(states.count())
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('#bofreqs-proposed tbody tr')), states.count())
-        for i in range(states.count()):
-            reqs[i].set_state(states[i])
+        for i in range(3*len(states)):
+           BofreqFactory(states=[('bofreq',states[i%len(states)].slug)],newrevisiondocevent__time=datetime.datetime.today()-datetime.timedelta(days=randint(0,20)))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         for state in states:
-            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 1)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3)
         self.assertFalse(q('#start_button'))
         PersonFactory(user__username='nobody')
         self.client.login(username='nobody', password='nobody+password')

ietf/doc/views_bofreq.py

@@ -30,7 +30,8 @@ def bof_requests(request):
     for req in reqs:
         req.latest_revision_event = req.latest_event(NewRevisionDocEvent)
         req.responsible = bofreq_responsible(req)
-    return render(request, 'doc/bofreq/bof_requests.html',dict(reqs=reqs))
+    sorted_reqs = sorted(sorted(reqs, key=lambda doc: doc.latest_revision_event.time, reverse=True), key=lambda doc: doc.get_state().order)
+    return render(request, 'doc/bofreq/bof_requests.html',dict(reqs=sorted_reqs))
 
 
 class BofreqUploadForm(forms.Form):

ietf/templates/doc/bofreq/bof_requests.html

@@ -10,7 +10,9 @@
   <h1>BOF Requests</h1>
 
   {% if request.user.is_authenticated %}
-    <a id="start_button" class="btn btn-primary" href="{% url 'ietf.doc.views_bofreq.new_bof_request' %}">Start New BOF Request</a>
+    <div class="buttonlist">
+      <a id="start_button" class="btn btn-primary" href="{% url 'ietf.doc.views_bofreq.new_bof_request' %}">Start New BOF Request</a>
+    </div>
   {% endif %}
   {% if not reqs %}
     <p>There are currently no BOF Requests</p>