New feature: couple countdown with list of speakers
'Begin speach' button starts countdown, 'end speach' button stops countdown.
This commit is contained in:
parent
563f40a889
commit
40af20cedb
@ -11,6 +11,7 @@
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from time import time
|
||||||
|
|
||||||
from django.contrib.auth.models import AnonymousUser
|
from django.contrib.auth.models import AnonymousUser
|
||||||
from django.contrib.contenttypes import generic
|
from django.contrib.contenttypes import generic
|
||||||
@ -22,7 +23,9 @@ from django.utils.translation import ugettext_lazy, ugettext_noop
|
|||||||
from mptt.models import MPTTModel, TreeForeignKey
|
from mptt.models import MPTTModel, TreeForeignKey
|
||||||
|
|
||||||
from openslides.projector.api import (get_active_slide, update_projector,
|
from openslides.projector.api import (get_active_slide, update_projector,
|
||||||
update_projector_overlay)
|
update_projector_overlay,
|
||||||
|
start_countdown,
|
||||||
|
stop_countdown)
|
||||||
from openslides.projector.models import SlideMixin
|
from openslides.projector.models import SlideMixin
|
||||||
from openslides.utils.exceptions import OpenSlidesError
|
from openslides.utils.exceptions import OpenSlidesError
|
||||||
from openslides.utils.person.models import PersonField
|
from openslides.utils.person.models import PersonField
|
||||||
@ -378,6 +381,9 @@ class Speaker(models.Model):
|
|||||||
self.weight = None
|
self.weight = None
|
||||||
self.begin_time = datetime.now()
|
self.begin_time = datetime.now()
|
||||||
self.save()
|
self.save()
|
||||||
|
# start countdown
|
||||||
|
if config['agenda_couple_countdown_and_speakers']:
|
||||||
|
start_countdown()
|
||||||
|
|
||||||
def end_speach(self):
|
def end_speach(self):
|
||||||
"""
|
"""
|
||||||
@ -385,3 +391,6 @@ class Speaker(models.Model):
|
|||||||
"""
|
"""
|
||||||
self.end_time = datetime.now()
|
self.end_time = datetime.now()
|
||||||
self.save()
|
self.save()
|
||||||
|
# stop countdown
|
||||||
|
if config['agenda_couple_countdown_and_speakers']:
|
||||||
|
stop_countdown()
|
||||||
|
@ -62,6 +62,14 @@ def setup_agenda_config_page(sender, **kwargs):
|
|||||||
min_value=0,
|
min_value=0,
|
||||||
label=ugettext_lazy('Number of last speakers to be shown on the projector')))
|
label=ugettext_lazy('Number of last speakers to be shown on the projector')))
|
||||||
|
|
||||||
|
agenda_couple_countdown_and_speakers = ConfigVariable(
|
||||||
|
name='agenda_couple_countdown_and_speakers',
|
||||||
|
default_value=False,
|
||||||
|
form_field=forms.BooleanField(
|
||||||
|
label=ugettext_lazy('Couple countdown with the list of speakers'),
|
||||||
|
help_text=ugettext_lazy('[Begin speach] starts the countdown, [End speach] stops the countdown.'),
|
||||||
|
required=False))
|
||||||
|
|
||||||
extra_stylefiles = ['styles/timepicker.css', 'styles/jquery-ui/jquery-ui.custom.min.css']
|
extra_stylefiles = ['styles/timepicker.css', 'styles/jquery-ui/jquery-ui.custom.min.css']
|
||||||
extra_javascript = ['javascript/jquery-ui.custom.min.js',
|
extra_javascript = ['javascript/jquery-ui.custom.min.js',
|
||||||
'javascript/jquery-ui-timepicker-addon.min.js',
|
'javascript/jquery-ui-timepicker-addon.min.js',
|
||||||
@ -72,7 +80,9 @@ def setup_agenda_config_page(sender, **kwargs):
|
|||||||
url='agenda',
|
url='agenda',
|
||||||
required_permission='config.can_manage',
|
required_permission='config.can_manage',
|
||||||
weight=20,
|
weight=20,
|
||||||
variables=(agenda_start_event_date_time, agenda_show_last_speakers),
|
variables=(agenda_start_event_date_time,
|
||||||
|
agenda_show_last_speakers,
|
||||||
|
agenda_couple_countdown_and_speakers),
|
||||||
extra_context={'extra_stylefiles': extra_stylefiles,
|
extra_context={'extra_stylefiles': extra_stylefiles,
|
||||||
'extra_javascript': extra_javascript})
|
'extra_javascript': extra_javascript})
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
from time import time
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.template.loader import render_to_string
|
from django.template.loader import render_to_string
|
||||||
@ -208,3 +209,39 @@ def get_all_widgets(request, session=False):
|
|||||||
if not session or session_widgets.get(widget.get_name(), True):
|
if not session or session_widgets.get(widget.get_name(), True):
|
||||||
widgets[widget.get_name()] = widget
|
widgets[widget.get_name()] = widget
|
||||||
return widgets
|
return widgets
|
||||||
|
|
||||||
|
|
||||||
|
def start_countdown():
|
||||||
|
"""
|
||||||
|
Starts the countdown
|
||||||
|
"""
|
||||||
|
# if we had stopped the countdown resume were we left of
|
||||||
|
if config['countdown_state'] == 'paused':
|
||||||
|
start_stamp = config['countdown_start_stamp']
|
||||||
|
pause_stamp = config['countdown_pause_stamp']
|
||||||
|
now = time()
|
||||||
|
config['countdown_start_stamp'] = now - \
|
||||||
|
(pause_stamp - start_stamp)
|
||||||
|
else:
|
||||||
|
config['countdown_start_stamp'] = time()
|
||||||
|
|
||||||
|
config['countdown_state'] = 'active'
|
||||||
|
config['countdown_pause_stamp'] = 0
|
||||||
|
|
||||||
|
|
||||||
|
def stop_countdown():
|
||||||
|
"""
|
||||||
|
Stops the countdown
|
||||||
|
"""
|
||||||
|
if config['countdown_state'] == 'active':
|
||||||
|
config['countdown_state'] = 'paused'
|
||||||
|
config['countdown_pause_stamp'] = time()
|
||||||
|
|
||||||
|
|
||||||
|
def reset_countdown():
|
||||||
|
"""
|
||||||
|
Resets the countdown
|
||||||
|
"""
|
||||||
|
config['countdown_start_stamp'] = time()
|
||||||
|
config['countdown_pause_stamp'] = 0
|
||||||
|
config['countdown_state'] = 'inactive'
|
||||||
|
@ -26,7 +26,7 @@ from openslides.utils.views import (AjaxMixin, CreateView, DeleteView,
|
|||||||
|
|
||||||
from .api import (get_active_slide, get_all_widgets, get_overlays,
|
from .api import (get_active_slide, get_all_widgets, get_overlays,
|
||||||
get_projector_content, get_projector_overlays,
|
get_projector_content, get_projector_overlays,
|
||||||
get_projector_overlays_js, set_active_slide,
|
get_projector_overlays_js, set_active_slide, start_countdown, stop_countdown, reset_countdown,
|
||||||
update_projector_overlay)
|
update_projector_overlay)
|
||||||
from .forms import SelectWidgetsForm
|
from .forms import SelectWidgetsForm
|
||||||
from .models import ProjectorSlide
|
from .models import ProjectorSlide
|
||||||
@ -169,31 +169,12 @@ class CountdownEdit(RedirectView):
|
|||||||
|
|
||||||
def pre_redirect(self, request, *args, **kwargs):
|
def pre_redirect(self, request, *args, **kwargs):
|
||||||
command = kwargs['command']
|
command = kwargs['command']
|
||||||
# countdown_state is one of 'inactive', 'paused' and 'active', 'expired'
|
|
||||||
if command in ['reset', 'start', 'stop']:
|
|
||||||
config['countdown_time'] = config['countdown_time']
|
|
||||||
|
|
||||||
if command == 'reset':
|
if command == 'reset':
|
||||||
config['countdown_start_stamp'] = time()
|
reset_countdown()
|
||||||
config['countdown_pause_stamp'] = 0
|
|
||||||
config['countdown_state'] = 'inactive'
|
|
||||||
elif command == 'start':
|
elif command == 'start':
|
||||||
# if we had stopped the countdown resume were we left of
|
start_countdown()
|
||||||
if config['countdown_state'] == 'paused':
|
|
||||||
start_stamp = config['countdown_start_stamp']
|
|
||||||
pause_stamp = config['countdown_pause_stamp']
|
|
||||||
now = time()
|
|
||||||
config['countdown_start_stamp'] = now - \
|
|
||||||
(pause_stamp - start_stamp)
|
|
||||||
else:
|
|
||||||
config['countdown_start_stamp'] = time()
|
|
||||||
|
|
||||||
config['countdown_state'] = 'active'
|
|
||||||
config['countdown_pause_stamp'] = 0
|
|
||||||
elif command == 'stop':
|
elif command == 'stop':
|
||||||
if config['countdown_state'] == 'active':
|
stop_countdown()
|
||||||
config['countdown_pause_stamp'] = time()
|
|
||||||
config['countdown_state'] = 'paused'
|
|
||||||
elif command == 'set-default':
|
elif command == 'set-default':
|
||||||
try:
|
try:
|
||||||
config['countdown_time'] = \
|
config['countdown_time'] = \
|
||||||
|
Loading…
Reference in New Issue
Block a user