From 8bf82a030601fea36b3b765f6a07353f5868610e Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 17 Jan 2016 21:47:07 +0100 Subject: [PATCH] Added meta box in assignment detail view (Fixes #1866) --- .../assignments/static/js/assignments/site.js | 15 ++++++-- .../assignments/assignment-detail.html | 36 +++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js index db017a402..8de66d471 100644 --- a/openslides/assignments/static/js/assignments/site.js +++ b/openslides/assignments/static/js/assignments/site.js @@ -49,6 +49,9 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments']) }, users: function(User) { return User.findAll(); + }, + phases: function(Assignment) { + return Assignment.getPhases(); } } }) @@ -122,7 +125,7 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments']) key: 'open_posts', type: 'input', templateOptions: { - label: gettextCatalog.getString('Number of members to be elected'), + label: gettextCatalog.getString('Number of posts to be elected'), type: 'number', required: true } @@ -225,11 +228,14 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments']) 'Assignment', 'User', 'assignment', - function($scope, $http, gettext, ngDialog, AssignmentForm, operator, Assignment, User, assignment) { + 'phases', + function($scope, $http, gettext, ngDialog, AssignmentForm, operator, Assignment, User, assignment, phases) { User.bindAll({}, $scope, 'users'); Assignment.bindOne(assignment.id, $scope, 'assignment'); Assignment.loadRelations(assignment, 'agenda_item'); $scope.candidateSelectBox = {}; + // get all item types via OPTIONS request + $scope.phases = phases.data.actions.POST.phase.choices; $scope.alert = {}; // open edit dialog @@ -289,6 +295,11 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments']) else return false; }; + // update phase + $scope.updatePhase = function (phase_id) { + assignment.phase = phase_id; + Assignment.save(assignment); + } // create new ballot $scope.createBallot = function () { $http.post('/rest/assignments/assignment/' + assignment.id + '/create_poll/') diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html index edbc6221c..2a4c4ae95 100644 --- a/openslides/assignments/static/templates/assignments/assignment-detail.html +++ b/openslides/assignments/static/templates/assignments/assignment-detail.html @@ -39,6 +39,42 @@ +
+
+
+ + Meta information +
+
+ +
+
+
+
+
+ +

Number of posts to be elected

+ {{ assignment.open_posts }}
+
+
+ +

Phase

+ + {{ phases[assignment.phase].display_name | translate }} + +
+ +
+
+
+
+
+

Description

{{ assignment.description }}