From d083309a30b24a0ed7d19a6b3ea7102a65060f66 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 18 Jan 2016 16:27:50 +0100 Subject: [PATCH] Show candidates on assignments slide. --- openslides/assignments/static/js/assignments/projector.js | 5 ++++- .../static/templates/assignments/slide_assignment.html | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/openslides/assignments/static/js/assignments/projector.js b/openslides/assignments/static/js/assignments/projector.js index ef2129404..89cb71e2d 100644 --- a/openslides/assignments/static/js/assignments/projector.js +++ b/openslides/assignments/static/js/assignments/projector.js @@ -16,13 +16,16 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment .controller('SlideAssignmentCtrl', [ '$scope', 'Assignment', - function($scope, Assignment) { + 'User', + function($scope, Assignment, User) { // Attention! Each object that is used here has to be dealt on server side. // Add it to the coresponding get_requirements method of the ProjectorElement // class. var id = $scope.element.id; Assignment.find(id); Assignment.bindOne(id, $scope, 'assignment'); + User.findAll(); + User.bindAll({}, $scope, 'users'); } ]); diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html index eb870254e..341633bcd 100644 --- a/openslides/assignments/static/templates/assignments/slide_assignment.html +++ b/openslides/assignments/static/templates/assignments/slide_assignment.html @@ -1,4 +1,12 @@

{{ assignment.title }}

{{ assignment.description }}
+ + +

Candidates

+
    +
  1. + {{ related_user.user.get_full_name() }} + +