added RegistrationStatus array

[angular-drzb] / app / js / controllers.js

diff --git a/app/js/controllers.js b/app/js/controllers.js
index df89649..0576a11 100644 (file)
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -2,7 +2,7 @@
 
 /* Controllers */
 
-function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $route, Organizations) {
+function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $route, Organizations, RegistrationStatus) {
 
        $scope.$routeParams = $routeParams;
        $scope.$location = $location;
@@ -11,6 +11,7 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $
                $scope.organizations = data;
                $log.info('organizations promise ', $scope.organizations);
        });
+       $scope.RegistrationStatus = RegistrationStatus;
 
        $scope.update = function(registration, state) {
 
@@ -216,13 +217,16 @@ function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter) {
 //             $scope.pager.page = 1;
                $scope.pager.results = filtered.length;
                $scope.pager.last_page = Math.ceil( $scope.pager.results / $scope.pager.limit );
+               if ( $scope.pager.page > $scope.pager.last_page ) {
+                       $scope.pager.page = 1;
+               }
                $log.info('pager', $scope.pager);
 
                var from = ( $scope.pager.page - 1 ) * $scope.pager.limit;
                $scope.list = [];
                angular.forEach( filtered, function(v,k) {
-                       if ( k > from && k <= from + $scope.pager.limit ) {
-                               v.nr = k;
+                       if ( k >= from && k < from + $scope.pager.limit ) {
+                               v.nr = k + 1;
                                this.push(v);
                        }
                }, $scope.list );