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

Merge pull request #2858 from emanuelschuetze/issue2142

Browse Source 
Assignment list: Used number of candidates, removed number of needed …
This commit is contained in:
Norman Jäckel 2017-01-14 15:11:21 +01:00 committed by GitHub
commit 3600dd58f0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,19 +208,21 @@
| MultiselectFilter: filter.multiselectFilters.tag : getItemId.tag | MultiselectFilter: filter.multiselectFilters.tag : getItemId.tag
| MultiselectFilter: filter.multiselectFilters.phase : getItemId.phase | MultiselectFilter: filter.multiselectFilters.phase : getItemId.phase
| orderBy: sort.column : sort.reverse)"> | orderBy: sort.column : sort.reverse)">
<!-- select column --> <!-- select column -->
<div ng-show="isSelectMode" os-perms="assignments.can_manage" class="col-xs-1 centered"> <div ng-show="isSelectMode" os-perms="assignments.can_manage" class="col-xs-1 centered">
<i class="fa text-danger pointer" ng-click="assignment.selected=!assignment.selected" <i class="fa text-danger pointer" ng-click="assignment.selected=!assignment.selected"
ng-class="assignment.selected ? 'fa-check-square-o' : 'fa-square-o'"></i> ng-class="assignment.selected ? 'fa-check-square-o' : 'fa-square-o'"></i>
</div> </div>
<!-- projector column --> <!-- projector column -->
<div class="col-xs-1 centered projector" os-perms="core.can_manage_projector"> <div class="col-xs-1 centered projector" os-perms="core.can_manage_projector">
<projector-button model="assignment", default-projector-id="defaultProjectorId"> <projector-button model="assignment", default-projector-id="defaultProjectorId">
</projector-button> </projector-button>
</div> </div>
<div class="no-projector-spacer" os-perms="!core.can_manage_projector"></div> <div class="no-projector-spacer" os-perms="!core.can_manage_projector"></div>
<!-- main contant column -->
<!-- main content column -->
<div class="col-xs-6 content"> <div class="col-xs-6 content">
<div class="title-col"> <div class="title-col">
<!-- title and phase --> <!-- title and phase -->
@ -307,8 +309,7 @@
<div style="width: 20%;" class="pull-right nobr optional centered"> <div style="width: 20%;" class="pull-right nobr optional centered">
<span class="badge" <span class="badge"
uib-tooltip="{{ assignment.assignment_related_users.length }} {{ 'Candidates' | translate }} uib-tooltip="{{ assignment.assignment_related_users.length }} {{ 'Candidates' | translate }}"
{{ (assignment.open_posts - assignment.assignment_related_users.length) > 0 ? '(' + (assignment.open_posts - assignment.assignment_related_users.length) + ' ' + ('needed' | translate) + ')' : '' }}"
tooltip-class="nobr" tooltip-class="nobr"
ng-class="{'badge-info': assignment.assignment_related_users.length < assignment.open_posts}"> ng-class="{'badge-info': assignment.assignment_related_users.length < assignment.open_posts}">
{{ assignment.assignment_related_users.length }} {{ assignment.assignment_related_users.length }}