+
+
diff --git a/openslides/core/static/templates/projector.html b/openslides/core/static/templates/projector.html
index 571248f35..c58bf49e0 100644
--- a/openslides/core/static/templates/projector.html
+++ b/openslides/core/static/templates/projector.html
@@ -1,6 +1,7 @@
+
OpenSlides – Projector
diff --git a/openslides/core/urls.py b/openslides/core/urls.py
index 3dbc1b614..e7478824c 100644
--- a/openslides/core/urls.py
+++ b/openslides/core/urls.py
@@ -27,9 +27,12 @@ urlpatterns = [
views.AppsJsView.as_view(),
name='core_apps_js'),
- # View for the projectors are handelt by angular.
+ # View for the projectors are handled by angular.
url(r'^projector.*$', views.ProjectorView.as_view()),
+ # Original view without resolutioncontrol for the projectors are handled by angular.
+ url(r'^real-projector.*$', views.RealProjectorView.as_view()),
+
# Main entry point for all angular pages.
# Has to be the last entry in the urls.py
url(r'^.*$', views.IndexView.as_view()),
diff --git a/openslides/core/views.py b/openslides/core/views.py
index 7c38e257d..7669a5a02 100644
--- a/openslides/core/views.py
+++ b/openslides/core/views.py
@@ -66,6 +66,20 @@ class ProjectorView(utils_views.View):
"""
The primary view for OpenSlides projector using AngularJS.
+ The projector container template is 'openslides/core/static/templates/projector-container.html'.
+ This container is for controlling the projector resolution.
+ """
+
+ def get(self, *args, **kwargs):
+ with open(finders.find('templates/projector-container.html')) as f:
+ content = f.read()
+ return HttpResponse(content)
+
+
+class RealProjectorView(utils_views.View):
+ """
+ The original view without resolutioncontrol for OpenSlides projector using AngularJS.
+
The default base template is 'openslides/core/static/templates/projector.html'.
You can override it by simply adding a custom 'templates/projector.html'
file to the custom staticfiles directory. See STATICFILES_DIRS in
@@ -168,7 +182,7 @@ class ProjectorViewSet(ReadOnlyModelViewSet):
elif self.action in ('metadata', 'list'):
result = self.request.user.has_perm('core.can_see_projector')
elif self.action in ('activate_elements', 'prune_elements', 'update_elements',
- 'deactivate_elements', 'clear_elements', 'control_view'):
+ 'deactivate_elements', 'clear_elements', 'control_view', 'set_resolution'):
result = (self.request.user.has_perm('core.can_see_projector') and
self.request.user.has_perm('core.can_manage_projector'))
else:
@@ -314,6 +328,46 @@ class ProjectorViewSet(ReadOnlyModelViewSet):
serializer.save()
return Response(serializer.data)
+ @detail_route(methods=['post'])
+ def set_resolution(self, request, pk):
+ """
+ REST API operation to set the resolution.
+
+ It is actually unused, because the resolution is currently set in the config.
+ But with the multiprojector feature this will become importent to set the
+ resolution per projector individually.
+
+ It expects a POST request to
+ /rest/core/projector//set_resolution/ with a dictionary with the width
+ and height and the values.
+
+ Example:
+
+ {
+ "width": "1024",
+ "height": "768"
+ }
+ """
+ if not isinstance(request.data, dict):
+ raise ValidationError({'detail': 'Data must be a dictionary.'})
+ if request.data.get('width') is None or request.data.get('height') is None:
+ raise ValidationError({'detail': 'A width and a height have to be given.'})
+ if not isinstance(request.data['width'], int) or not isinstance(request.data['height'], int):
+ raise ValidationError({'detail': 'Data has to be integers.'})
+ if (request.data['width'] < 800 or request.data['width'] > 3840 or
+ request.data['height'] < 600 or request.data['height'] > 2160):
+ raise ValidationError({'detail': 'The Resolution have to be between 800x600 and 3840x2160.'})
+
+ projector_instance = self.get_object()
+ projector_instance.width = request.data['width']
+ projector_instance.height = request.data['height']
+ projector_instance.save()
+
+ message = 'Changing resolution to {width}x{height} was successful.'.format(
+ width=request.data['width'],
+ height=request.data['height'])
+ return Response({'detail': message})
+
@detail_route(methods=['post'])
def control_view(self, request, pk):
"""
diff --git a/tests/integration/core/test_views.py b/tests/integration/core/test_views.py
index 49640153e..8c33e2b71 100644
--- a/tests/integration/core/test_views.py
+++ b/tests/integration/core/test_views.py
@@ -34,7 +34,9 @@ class ProjectorAPI(TestCase):
'uuid': 'aae4a07b26534cfb9af4232f361dce73',
'name': 'core/customslide'}},
'scale': 0,
- 'scroll': 0})
+ 'scroll': 0,
+ 'width': 1024,
+ 'height': 768})
def test_invalid_slide_on_default_projector(self):
self.client.login(username='admin', password='admin')
@@ -54,7 +56,9 @@ class ProjectorAPI(TestCase):
'uuid': 'fc6ef43b624043068c8e6e7a86c5a1b0',
'error': 'Projector element does not exist.'}},
'scale': 0,
- 'scroll': 0})
+ 'scroll': 0,
+ 'width': 1024,
+ 'height': 768})
class VersionView(TestCase):