Pagination for assingment list (fixes #3389)
This commit is contained in:
parent
cd637a94c8
commit
dc03a67281
@ -39,6 +39,9 @@ Motions:
|
|||||||
- Added inline Editing for motion reason [#3361].
|
- Added inline Editing for motion reason [#3361].
|
||||||
- Added multiselect filter for motion comments [#3372].
|
- Added multiselect filter for motion comments [#3372].
|
||||||
|
|
||||||
|
Elections:
|
||||||
|
- Added pagination for list view [#3393].
|
||||||
|
|
||||||
Users:
|
Users:
|
||||||
- User without permission to see users can now see agenda item speakers,
|
- User without permission to see users can now see agenda item speakers,
|
||||||
motion submitters and supporters, assignment candidates, mediafile
|
motion submitters and supporters, assignment candidates, mediafile
|
||||||
|
@ -317,6 +317,7 @@ angular.module('OpenSlidesApp.assignments.site', [
|
|||||||
tag: function (assignment) {return assignment.tags_id;},
|
tag: function (assignment) {return assignment.tags_id;},
|
||||||
phase: function (assignment) {return assignment.phase;},
|
phase: function (assignment) {return assignment.phase;},
|
||||||
};
|
};
|
||||||
|
|
||||||
// Sorting
|
// Sorting
|
||||||
$scope.sort = osTableSort.createInstance();
|
$scope.sort = osTableSort.createInstance();
|
||||||
$scope.sort.column = 'title';
|
$scope.sort.column = 'title';
|
||||||
@ -343,6 +344,15 @@ angular.module('OpenSlidesApp.assignments.site', [
|
|||||||
}
|
}
|
||||||
Assignment.save(assignment);
|
Assignment.save(assignment);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Pagination
|
||||||
|
$scope.currentPage = 1;
|
||||||
|
$scope.itemsPerPage = 25;
|
||||||
|
$scope.limitBegin = 0;
|
||||||
|
$scope.pageChanged = function() {
|
||||||
|
$scope.limitBegin = ($scope.currentPage - 1) * $scope.itemsPerPage;
|
||||||
|
};
|
||||||
|
|
||||||
// update phase
|
// update phase
|
||||||
$scope.updatePhase = function (assignment, phase_id) {
|
$scope.updatePhase = function (assignment, phase_id) {
|
||||||
assignment.phase = phase_id;
|
assignment.phase = phase_id;
|
||||||
|
@ -208,7 +208,8 @@
|
|||||||
| osFilter: filter.filterString : filter.getObjectQueryString
|
| osFilter: filter.filterString : filter.getObjectQueryString
|
||||||
| 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)
|
||||||
|
| limitTo : itemsPerPage : limitBegin">
|
||||||
|
|
||||||
<!-- 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">
|
||||||
@ -321,6 +322,19 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div> <!-- main table -->
|
</div> <!-- main table -->
|
||||||
</div> <!-- end container -->
|
|
||||||
|
|
||||||
|
<ul uib-pagination
|
||||||
|
ng-show="assignmentsFiltered.length > itemsPerPage"
|
||||||
|
total-items="assignmentsFiltered.length"
|
||||||
|
items-per-page="itemsPerPage"
|
||||||
|
ng-model="currentPage"
|
||||||
|
ng-change="pageChanged()"
|
||||||
|
class="pagination-sm"
|
||||||
|
direction-links="false"
|
||||||
|
boundary-links="true"
|
||||||
|
first-text="«"
|
||||||
|
last-text="»">
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</div> <!-- end container -->
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user