ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1834 from normanjaeckel/Assignment

Browse Source 
Assignment
This commit is contained in:
Oskar Hahn 2016-01-12 14:58:07 +01:00
commit 4a3cefadb1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/assignments/static/js/assignments/site.js
View File

@ -288,11 +288,12 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments'])
$scope.alert = { type: 'danger', msg: data.detail, show: true }; $scope.alert = { type: 'danger', msg: data.detail, show: true };
}); });
}; };
// check if current user is already a candidate (status=1) // check if current user is already a candidate (elected==false)
$scope.isCandidate = function () { $scope.isCandidate = function () {
var check = assignment.assignment_related_users.map( function(candidate) { var check = assignment.assignment_related_users.map( function(candidate) {
if ( candidate.status == 1) if ( !candidate.elected ) {
return candidate.user_id; return candidate.user_id;
}
}).indexOf(operator.user.id); }).indexOf(operator.user.id);
if (check > -1) if (check > -1)
return true; return true;

2
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -53,7 +53,7 @@
<div class="form-group"> <div class="form-group">
<alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}"> <alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
{{alert.msg}} {{ alert.msg }}
</alert> </alert>
<div os-perms="assignments.can_nominate_other" class="input-group"> <div os-perms="assignments.can_nominate_other" class="input-group">
<ui-select ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected.id)"> <ui-select ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected.id)">

7
openslides/assignments/static/templates/assignments/assignment-list.html
View File

@ -86,7 +86,7 @@
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'"> ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i> </i>
<th ng-click="toggleSort('open_posts')" class="sortable optional"> <th ng-click="toggleSort('open_posts')" class="sortable optional">
<translate>Candidates</translate> / <translate>Posts</translate> <translate>Candidates</translate> &middot; <translate>Posts</translate>
<i class="pull-right fa" ng-show="sortColumn === 'open_posts' && header.sortable != false" <i class="pull-right fa" ng-show="sortColumn === 'open_posts' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'"> ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
</i> </i>
@ -122,7 +122,10 @@
ng-bootbox-confirm="Are you sure you want to delete <b>{{ assignment.title }}</b>?" ng-bootbox-confirm="Are you sure you want to delete <b>{{ assignment.title }}</b>?"
ng-bootbox-confirm-action="delete(assignment)" translate>Delete</a> ng-bootbox-confirm-action="delete(assignment)" translate>Delete</a>
</div> </div>
<td ng-if="!assignment.quickEdit" class="optional"><span class="badge">{{ assignment.open_posts }}</span> <td ng-if="!assignment.quickEdit" class="optional">
<span class="badge">{{ assignment.assignment_related_users.length }}</span>
/
<span class="badge">{{ assignment.open_posts }}</span>
<td ng-if="!assignment.quickEdit" class="optional"> <td ng-if="!assignment.quickEdit" class="optional">
<span class="label" ng-class="{'label-primary': assignment.phase == 0, <span class="label" ng-class="{'label-primary': assignment.phase == 0,
'label-warning': assignment.phase == 1, 'label-warning': assignment.phase == 1,