Enabled correct time sorting and reporting for interim meetings on /group/{{acronym}}/meetings/, and tweaked the date format. Fixes issue #2145.

- Legacy-Id: 12669

ietf/meeting/utils.py

@@ -13,22 +13,18 @@ from ietf.group.utils import can_manage_materials
 def group_sessions(sessions):
 
     def sort_key(session):
-        if session.meeting.type.slug=='ietf':
-            official_sessions = session.timeslotassignments.filter(schedule=session.meeting.agenda)
-            if official_sessions:
-                return official_sessions.first().timeslot.time
-            elif session.meeting.date:
-                return datetime.datetime.combine(session.meeting.date,datetime.datetime.min.time())
-            else:
-                return session.requested
-        else:
-            # TODO: use timeslots for interims once they have them
+        official_sessions = session.timeslotassignments.filter(schedule=session.meeting.agenda)
+        if official_sessions:
+            return official_sessions.first().timeslot.time
+        elif session.meeting.date:
             return datetime.datetime.combine(session.meeting.date,datetime.datetime.min.time())
+        else:
+            return session.requested
 
     for s in sessions:
         s.time=sort_key(s)
 
-    sessions = sorted(sessions,key=lambda s:s.time,reverse=True)
+    sessions = sorted(sessions,key=lambda s:s.time)
 
     today = datetime.date.today()
     future = []
@@ -42,6 +38,10 @@ def group_sessions(sessions):
         else:
             past.append(s)
 
+    # List future and in_progress meetings with ascending time, but past
+    # meetings with descending time
+    past.reverse()
+
     return future, in_progress, past
 
 def get_upcoming_manageable_sessions(user):

ietf/templates/group/meetings-row.html

@@ -24,7 +24,7 @@
          <td class="text-right">
            {% if s.name %}{{ s.name }}<br>{% endif %}
            {% if s.status.slug == "sched" %}
-	     {{s.time|date:"D M d, Y"}}
+	   {{s.time|date:"D"}} &nbsp; {{s.time|date:"Y-m-d"}}
           {% else %}
             {{s.status}}
           {% endif %}