Show motion identifier in (current) list of speakers

This commit is contained in:
FinnStutzenstein 2017-10-13 08:02:55 +02:00 committed by Emanuel Schütze
parent 73407133bd
commit 39bd6653f0
4 changed files with 20 additions and 1 deletions

View File

@ -44,6 +44,7 @@ Motions:
- Added support for pinning personal notes to the window [#3360].
- Clear identifier on state reset [#3356].
- New config options to hide reason and recommendation on projector [#3432].
- Show motion identifier in (current) list of speakers [#3442]
Elections:
- Added pagination for list view [#3393].

View File

@ -54,6 +54,7 @@ class ListOfSpeakersSlide(ProjectorElement):
pass
else:
yield item
yield item.content_object
for speaker in item.speakers.filter(end_time=None):
# Yield current speaker and next speakers
yield speaker.user
@ -96,6 +97,7 @@ class CurrentListOfSpeakersSlide(ProjectorElement):
items = self.get_agenda_items(reference_projector)
for item in items:
yield item
yield item.content_object
for speaker in item.speakers.filter(end_time=None):
yield speaker.user
query = (item.speakers.exclude(end_time=None)

View File

@ -618,8 +618,10 @@ angular.module('OpenSlidesApp.agenda.site', [
'Config',
'CurrentListOfSpeakersItem',
'CurrentListOfSpeakersSlide',
'gettextCatalog',
'WebpageTitle',
function($scope, $http, $filter, Projector, ProjectionDefault, Agenda, Config,
CurrentListOfSpeakersItem, CurrentListOfSpeakersSlide) {
CurrentListOfSpeakersItem, CurrentListOfSpeakersSlide, gettextCatalog, WebpageTitle) {
$scope.alert = {};
$scope.currentListOfSpeakers = CurrentListOfSpeakersSlide;
@ -667,6 +669,12 @@ angular.module('OpenSlidesApp.agenda.site', [
$scope.currentSpeaker = void 0;
$scope.lastSpeakers = void 0;
}
if ($scope.item) {
WebpageTitle.updateTitle(gettextCatalog.getString('Current list of speakers') + ' ' +
gettextCatalog.getString('of') + ' ' + $scope.item.getTitle());
} else {
WebpageTitle.updateTitle(gettextCatalog.getString('Current list of speakers'));
}
};
// Set the current overlay status

View File

@ -235,6 +235,14 @@ angular.module('OpenSlidesApp.motions', [
getTitle: function (versionId) {
return this.getVersion(versionId).title;
},
getAgendaTitle: function () {
var title = '';
if (this.identifier) {
title = gettextCatalog.getString('Motion') + ' ' + this.identifier + ': ';
}
title += this.getTitle();
return title;
},
getText: function (versionId) {
return this.getVersion(versionId).text;
},