From 23fec417f8a553eb62d6a4fc59d06a306907b6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Tue, 11 Apr 2017 11:57:15 +0200
Subject: [PATCH] Fixed sorting of last speakers.

---
 CHANGELOG                                  | 12 ++++++++----
 openslides/agenda/static/js/agenda/site.js |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 689a82eb0..f77a452b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,13 +7,17 @@ https://openslides.org/
 Version 2.2 (unreleased)
 ==========================
 
-Motions:
-- New export dialog.
-- Fixed issue when creating/deleting motion comment fields in the settings.
+Agenda:
+- Fixed wrong sorting of last speakers [#3193].
 
+Motions:
+- New export dialog [#3185].
+- Fixed issue when creating/deleting motion comment fields in the
+  settings [#3187].
 
 Core:
-- No reload on logoff. OpenSlides is now a full single page application.
+- No reload on logoff. OpenSlides is now a full single page
+  application [#3172].
 
 
 Version 2.1.1 (2017-04-05)
diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js
index e5c144628..d7698fd13 100644
--- a/openslides/agenda/static/js/agenda/site.js
+++ b/openslides/agenda/static/js/agenda/site.js
@@ -412,6 +412,7 @@ angular.module('OpenSlidesApp.agenda.site', [
             $scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null});
             // last speakers
             $scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'});
+            $scope.lastSpeakers = $filter('orderBy')($scope.lastSpeakers, 'begin_time');
         });
         $scope.$watch(function () {
             return Projector.lastModified();
@@ -665,6 +666,7 @@ angular.module('OpenSlidesApp.agenda.site', [
                 $scope.currentSpeaker = $filter('filter')($scope.speakers, {'begin_time': '!!', 'end_time': null});
                 // last speakers
                 $scope.lastSpeakers = $filter('filter')($scope.speakers, {'end_time': '!!'});
+                $scope.lastSpeakers = $filter('orderBy')($scope.lastSpeakers, 'begin_time');
             } else {
                 $scope.speakers = void 0;
                 $scope.nextSpeakers = void 0;