X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=app%2Fjs%2Fcontrollers.js;h=4ddca47c4f37fc02f661e32004042170543ad171;hb=7dfbd7031b7ca284c8551f65dcd8b0a2ba0a5594;hp=9454ff9c7c774f954d172f4ced232cf84a87c918;hpb=fa2a64e09da2f2844e8e54e60fe951b6c558818f;p=angular-drzb

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 9454ff9..4ddca47 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -2,14 +2,20 @@
 
 /* Controllers */
 
-
-function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $route, View) {
+function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $route, Organizations, ValidStates) {
 
 	$scope.$routeParams = $routeParams;
 	$scope.$location = $location;
 	$scope.organizations = [];
+	Organizations.getArrayPromise().then(function(data) {
+		$scope.organizations = data;
+		$log.info('organizations promise ', $scope.organizations);
+	});
+	$scope.ValidStates = ValidStates();
 
-	$scope.update = function(registration, state) {
+	$scope.info = { message: '', css_class: '' } ; // alert box
+
+	$scope.update = function(registration, state, info_message) {
 
 		registration.state = state;
 
@@ -19,10 +25,14 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $
 		}
 
 		registration.$save( function(registration) {
-			$log.info("saved", registration);
 			$log.info('id =', registration.id, 'state = ', registration.state);
 			if ( registration.id && registration.state ) {
-				$location.path( '/' + registration.state + '/' + registration.id );
+				$log.error( $location.path(), registration.state, $routeParams );
+				if ( $location.path().split(/\//)[1] != registration.state ) {
+					$location.path( '/' + registration.state + '/' + registration.id );
+				} else {
+					$scope.info = { message: info_message, css_class: 'alert-success' };
+				}
 			} else {
 				$log.error("can't find id in ", registration);
 			}
@@ -47,26 +57,7 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $
 
 		$log.info( $routeParams.registrationId );
 
-		$scope.view = new View();
-if(0){//FIXME
-		$scope.view.$get({ view: 'organizations' }, function(result) {
-			$log.info('View organizations', result);
-			angular.forEach( result.rows, function(value, key) {
-				this.push( value.key ); // name of organization
-			}, $scope.organizations );
-			$log.info('organizations', $scope.organizations);
-		});
-}else{//FIXME
-		$scope.view.$key_array({ view: 'organizations' }, function(result) {
-			$log.info('key_array', result);
-//			$scope.organizations = result.rows; // FIXME doesn't refresh bs-typeahead
-			angular.forEach( result.rows, function(o) {
-				this.push( o );
-			}, $scope.organizations );
-			$log.info('organizations', $scope.organizations);
-		});
 	}
-}//FIXME
 
 	$scope.$watch('user.registration_type', function( oldValue, newValue ) {
 		$log.info("registration_type watch", oldValue, newValue );
@@ -150,59 +141,154 @@ if(0){//FIXME
 	}
 
 	$scope.abstract_class = function(work) {
+		if ( work === undefined ) return;
 		var abstract = work.abstract;
 		return angular.isString(abstract) && abstract.length <= 2000 ? 'ok' : 'ng-invalid';
 	}
 	$scope.abstract_length = function(work) {
+		if ( work === undefined ) return;
 		var abstract = work.abstract;
 		if ( ! abstract ) return 0;
 		return abstract.length <= 2000 ? abstract.length : 2000 - abstract.length;
 	}
 
+	$scope.change_state = function(new_state) {
+		if ( new_state == $scope.registration.state ) return;
+		$scope.info = { css_class: 'alert-warning', message: 'Changed state from "'+$scope.registration.state+'" to "'+new_state+'"' };
+		$scope.registration.state = new_state;
+	}
+
+	$scope.show_submission_type = function() {
+		// FIXME check if all submission are allowed by date and allow them!
+		if ( angular.isUndefined( $scope.user ) || angular.isUndefined( $scope.registration ) ) return false;
+		return (
+			angular.isUndefined( $scope.user.registration_type ) // new registration
+			|| angular.isUndefined( $scope.registration.state ) // not saved yet
+			|| $scope.registration.state == 'draft'
+			|| $scope.registration.state == 'confirmation'
+		) ? false : true;
+	}
+	$scope.show_registration_type = function() {
+		return true;
+	}
+
 	$scope.reset();
 }
-//RegistrationCtrl.$inject = [ '$scope', '$log' ];
+RegistrationCtrl.$inject = [ '$scope', '$log', 'Registration', '$routeParams', '$location', '$route', 'Organizations', 'ValidStates' ];
 
-function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter) {
+function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, ValidStates ) {
 
 	$scope.list = [];
+	$scope.list_results = 0;
+	$scope.pager = {
+		page: 1,
+		limit: 10,
+		results: 1,
+		last_page: 1,
+		show_all: false
+	};
 	$scope.search = {};
 	$scope.ready = false;
+	$scope.filters = [ 'student', 'hpd_member', 'reception', 'dinner' ];
+	$scope.show = {
+		registration_type: true,
+		filters: true,
+		search: true,
+		states: true,
+		pager_numeric: false
+	};
+	$scope.ValidStates = ValidStates();
 
-	$scope.all_registrations = Registration.query( function() {
-		var RegistrationTypeCount = { '': 0 };
-		angular.forEach( $scope.all_registrations, function(value, key) {
-			var type = value.user.registration_type;
-			if ( ! angular.isNumber( RegistrationTypeCount[type] ) ) {
-				RegistrationTypeCount[type] = 1;
+	$scope.create_counts = function( array ) {
+		$log.info('create_counts', array.length );
+		var Counts = {};
+		var inc_count = function(type) {
+			if ( ! angular.isNumber( Counts[type] ) ) {
+				Counts[type] = 1;
 			} else {
-				RegistrationTypeCount[type]++;
+				Counts[type]++;
+			}
+		};
+		angular.forEach( array, function(value, key) {
+			if ( ! value.user ) {
+				$log.error("create_counts user corrupted for registration", key, value);
+				return;
 			}
-			RegistrationTypeCount['']++;
 
-			value.registration_type = type; // for search
-			
-//			$log.info( key, value.user.registration_type, RegistrationTypeCount[type]  );
+			var type = value.user.registration_type;
+			inc_count( type );
+			inc_count( '' ); // total
+			angular.forEach( $scope.filters, function(subtype) {
+				var v = value.user[subtype];
+				if ( v === 'yes' || v === true ) {
+					inc_count( subtype );
+					inc_count( type + '+' + subtype );
+					inc_count( '+' + subtype ); // total
+				}
+			});
+
+			// for filter
+			value.registration_type = type;
+			angular.forEach( $scope.filters, function(f) {
+				var v = value.user[f];
+				value[f] = v == true || v == 'yes' ? true : false;
+			});
+
+			// count registration state
+			inc_count( 'state+' + value.state );
+
+//			$log.info( key, value, Counts[type]  );
 		});
-		$log.info('RegistrationTypeCount', RegistrationTypeCount);
-		$scope.RegistrationTypeCount = RegistrationTypeCount;
+		$log.info('Counts', Counts);
+		$scope.Counts = Counts;
+		return Counts;
+	};
 
-//		$scope.list = $scope.all_registrations; // FIXME show all registrations on page load
+	$scope.all_registrations = Registration.query( function(result) {
 		$scope.ready = true;
+		$log.info('Reqistration.query callback', result);
+		$scope.reset();
 	});
 
 	$scope.filter_list = function(newVal, oldVal) {
-		$scope.list = $filter('filter')($scope.all_registrations, $scope.search);
-		$log.info('filter_list', newVal, oldVal, 'search', $scope.search, 'results', $scope.list);
+		if ( newVal == oldVal ) return;
+		$log.info('filter_list', newVal, oldVal, 'search', $scope.search);
+		var filtered =
+			$filter('filter')($scope.all_registrations, $scope.search);
+
+		$scope.create_counts( filtered );
+
+		$log.info('pager before apply', $scope.pager);
+
+		$scope.pager.results = filtered.length;
+		$scope.pager.last_page = Math.ceil( $scope.pager.results / $scope.pager.limit );
+		if ( $scope.pager.page < 1 ) $scope.pager.page = 1;
+		if ( $scope.pager.page > $scope.pager.last_page ) $scope.pager.page = $scope.pager.last_page;
+		$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 || $scope.pager.show_all ) {
+				v.nr = k + 1;
+				this.push(v);
+			}
+		}, $scope.list );
+		$log.info('list length=', $scope.list.length, "offset=", from);
 	};
-	$scope.$watch('search.registration_type', $scope.filter_list);
-	$scope.$watch('search.$', $scope.filter_list); // $ is skipped by search watch!!
+	$scope.$watch('search', $scope.filter_list, true);
+	$scope.$watch('search.$', $scope.filter_list); // FIXME not included in search true because of $
+	$scope.$watch('pager', $scope.filter_list, true);
 
 	$scope.RegistrationTypes = RegistrationTypes;
 	$log.info( "RegistrationTypes", RegistrationTypes );
+
+	$scope.reset = function() {
+		$scope.search = { registration_type: '' };
+		$log.info('reset', $scope.search );
+		$scope.pager.page = 1;
+	}
 }
 
+ListCtrl.$inject = [ '$scope', '$log', 'Registration', 'RegistrationTypes', '$filter', 'ValidStates' ];
 
-function MyCtrl2() {
-}
-MyCtrl2.$inject = [];