X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=app%2Fjs%2Fcontrollers.js;h=7b47fb568d3ad2bf8b8ca6a837e3bc8291d6fac0;hb=3cab1010e9908594ae7ef55e3aa615487e6528a4;hp=f0e6d0377f023b043e533277f9de58472527f43a;hpb=5c91ba5de24753de176093fcf05db64580ad8340;p=angular-drzb diff --git a/app/js/controllers.js b/app/js/controllers.js index f0e6d03..7b47fb5 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -2,13 +2,27 @@ /* Controllers */ - -function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $route) { +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.info = { message: '', css_class: '' } ; // alert box - $scope.update = function(registration) { + $scope.update = function(registration, state, info_message) { + + 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 ); @@ -16,10 +30,14 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $ } registration.$save( function(registration) { - $log.info("saved", registration); - $log.info('id =', registration.id); - if ( registration.id ) { - $location.path( '/confirmation/' + registration.id ); + $log.info('id =', registration.id, 'state = ', registration.state); + if ( registration.id && registration.state ) { + $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' }; + } } else { $log.error("can't find id in ", registration); } @@ -43,6 +61,7 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $ } $log.info( $routeParams.registrationId ); + } $scope.$watch('user.registration_type', function( oldValue, newValue ) { @@ -60,6 +79,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"); @@ -84,7 +111,6 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $ $scope.change_student = function() { if ( $scope.user.student ) { $scope.user.hpd_member = false; - $scope.user.reception = false; $scope.user.dinner = false; } } @@ -107,50 +133,175 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $ works.push({ persons: [{}] }); } + $scope.symposium_work_remove = function(work_index) { + if ( ! angular.isNumber(work_index) ) { + $log.error("work_index", work_index); + return; + } + var works = $scope.work.symposium_works; + $log.info('symposium_work_remove', works, work_index); + var removed = works.splice( work_index, 1 ); + if ( angular.isArray(removed) && removed[0] ) { + removed = removed[0]; + removed.deleted = true; + if ( ! angular.isArray( $scope.work.symposium_works_deleted ) ) + $scope.work.symposium_works_deleted = []; + $scope.work.symposium_works_deleted.push( removed ); + $log.info("work deleted", works); + } else { + $log.warn("symposium_work_remove no work to remove", works, work); + } + } + + $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 = [];