X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=app%2Fjs%2Fcontrollers.js;h=f336b513ef78d078039c3d31ee450d785406025c;hb=1e9833fc37565e466ab85d3d16be4cf7d777b896;hp=977758c2ea316f19087a1cd95037f2a1ede87060;hpb=bc28d47dd7733ef8ef9cbcb24e9ade21b8c6acc3;p=angular-drzb

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 977758c..f336b51 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -2,22 +2,31 @@
 
 /* Controllers */
 
-function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $route, Organizations, RegistrationState) {
+function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $route, View, ValidStates) {
 
 	$scope.$routeParams = $routeParams;
 	$scope.$location = $location;
 	$scope.organizations = [];
-	Organizations.getArrayPromise().then(function(data) {
-		$scope.organizations = data;
-		$log.info('organizations promise ', $scope.organizations);
+	View.getPromise('organizations?group=true;format=key_array').then(function(data) {
+		if ( angular.isArray(data.rows) ) {
+			$scope.organizations = data.rows;
+			$log.info('organizations promise ', $scope.organizations);
+		} else {
+			$log.info('no rows in', data);
+		}
 	});
-	$scope.RegistrationState = RegistrationState();
+	$scope.ValidStates = ValidStates();
 
 	$scope.info = { message: '', css_class: '' } ; // alert box
 
 	$scope.update = function(registration, state, info_message) {
 
-		registration.state = state;
+		if ( $scope.ValidStates.indexOf( state ) > $scope.ValidStates.indexOf( registration.state ) ) {
+			registration.state = state;
+			$log.info( 'registration.state updated to ',state);
+		} else {
+			$log.info('registration.state NOT changed');
+		}
 
 		if ( ! $scope.has_work && registration.work ) {
 			delete( registration.work );
@@ -27,7 +36,8 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $
 		registration.$save( function(registration) {
 			$log.info('id =', registration.id, 'state = ', registration.state);
 			if ( registration.id && registration.state ) {
-				if ( ! info_message ) {
+				$log.info( 'have id && state', $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' };
@@ -73,6 +83,14 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $
 			$scope.user.registration_type == 'symposium' ||
 			$scope.user.registration_type == 'round'
 		) {
+			if ( angular.isUndefined( $scope.registration.work ) ) {
+				$log.info('create empty work');
+				$scope.registration.work = { persons: [ $scope.user ] };
+				if ( angular.isUndefined( $scope.work ) )
+					$scope.work = $scope.registration.work;
+			}
+
+
 			$scope.work.type = $scope.user.registration_type;
 			$scope.has_work = true;
 			$log.info( $scope.user.registration_type, " type updated");
@@ -157,11 +175,25 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $
 		$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', 'Registration', '$routeParams', '$location', '$route', 'Organizations', 'RegistrationState' ];
+RegistrationCtrl.$inject = [ '$scope', '$log', 'Registration', '$routeParams', '$location', '$route', 'View', 'ValidStates' ];
 
-function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, RegistrationState ) {
+function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, ValidStates ) {
 
 	$scope.list = [];
 	$scope.list_results = 0;
@@ -169,11 +201,19 @@ function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, Regist
 		page: 1,
 		limit: 10,
 		results: 1,
-		last_page: 1
+		last_page: 1,
+		show_all: false
 	};
 	$scope.search = {};
 	$scope.ready = false;
-	$scope.filters = [ 'student', 'hpd_member', 'reception', 'dinner' ];
+	$scope.filters = [
+		{ select: 'user.student', label: 'student', name: 'filter_student' },
+		{ select: 'user.hpd_member', label: 'HPD', name: 'filter_hpd' },
+		{ select: 'user.reception', label: 'reception', name: 'filter_reception' },
+		{ select: 'user.dinner', label: 'dinner', name: 'filter_dinner' },
+		{ select: 'payment.received', label: 'payment', name: 'filter_payment' },
+		{ select: 'user.org_member', label: 'organisation', name: 'filter_org' }
+	];
 	$scope.show = {
 		registration_type: true,
 		filters: true,
@@ -181,7 +221,7 @@ function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, Regist
 		states: true,
 		pager_numeric: false
 	};
-	$scope.RegistrationState = RegistrationState();
+	$scope.ValidStates = ValidStates();
 
 	$scope.create_counts = function( array ) {
 		$log.info('create_counts', array.length );
@@ -202,23 +242,29 @@ function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, Regist
 			var type = value.user.registration_type;
 			inc_count( type );
 			inc_count( '' ); // total
-			angular.forEach( $scope.filters, function(subtype) {
-				var v = value.user[subtype];
+			angular.forEach( $scope.filters, function(filter) {
+				var s = filter.select.split(/\./);
+				var v = value[s[0]];
+				if ( angular.isDefined( v ) ) {
+					v = v[s[1]];
+				}
 				if ( v === 'yes' || v === true ) {
-					inc_count( subtype );
-					inc_count( type + '+' + subtype );
-					inc_count( '+' + subtype ); // total
+					inc_count( filter.name );
+					inc_count( type + '+' + filter.name );
+					inc_count( '+' + filter.name ); // total
+					value[filter.name] = true;
+				} else {
+					value[filter.name] = false;
 				}
 			});
 
 			// 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;
-			});
 
-//			$log.info( key, value, Counts[type]  );
+			// count registration state
+			inc_count( 'state+' + value.state );
+
+//			$log.info( key, value );
 		});
 		$log.info('Counts', Counts);
 		$scope.Counts = Counts;
@@ -250,7 +296,7 @@ function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, Regist
 		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 ) {
+			if ( k >= from && k < from + $scope.pager.limit || $scope.pager.show_all ) {
 				v.nr = k + 1;
 				this.push(v);
 			}
@@ -269,7 +315,44 @@ function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, Regist
 		$log.info('reset', $scope.search );
 		$scope.pager.page = 1;
 	}
+
+	$scope.print = {
+		layout: false,
+		center: '',
+		bold: '',
+		toggle: function(v) {
+			$log.info('print_hide', v);
+			$scope.print.layout = ! $scope.print.layout;
+			if ( v ) {
+				$scope.print.center = 'print-center';
+				$scope.print.bold = 'print-bold';
+			} else {
+				$scope.print.center = '';
+				$scope.print.bold = '';
+			}
+		}
+	}
+}
+
+ListCtrl.$inject = [ '$scope', '$log', 'Registration', 'RegistrationTypes', '$filter', 'ValidStates' ];
+
+
+function AuthorsCtrl($scope, $log, View ) {
+	$scope.message = 'Loading data...';
+	$scope.ready = false;
+	View.getPromise('authors?format=key_distinct').then(function(data) {
+		if ( angular.isArray(data.rows) ) {
+			$scope.data = data;
+			$scope.authors = $scope.data.rows;
+			$scope.ready = true;
+			$log.info('authors promise ', data);
+		} else {
+			$log.info('no rows in', data);
+			$scope.message = 'No rows found';
+		}
+	});
 }
 
-ListCtrl.$inject = [ '$scope', '$log', 'Registration', 'RegistrationTypes', '$filter', 'RegistrationState' ];
+AuthorsCtrl.$inject = [ '$scope', '$log', 'View' ];
+