From 9327a0307eaba6f6e5fb552852ee399eb72ea175 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Tue, 12 Mar 2013 23:35:37 +0100 Subject: [PATCH] authors table view more general usage of View factory to display CouchDB view as table --- angular-server.pl | 35 +++++++++++++++++++++++++++++- app/drzb2013.html.ep | 1 + app/js/app.js | 1 + app/js/controllers.js | 30 +++++++++++++++++++++++--- app/js/services.js.ep | 9 ++++---- app/partials/authors.html.ep | 41 ++++++++++++++++++++++++++++++++++++ test/unit/controllersSpec.js | 32 ++++++++++++++++++++++++++++ 7 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 app/partials/authors.html.ep diff --git a/angular-server.pl b/angular-server.pl index 0e38168..94c84ad 100755 --- a/angular-server.pl +++ b/angular-server.pl @@ -262,7 +262,29 @@ if ( doc.user.organization != '' ) { } }q|, reduce => q| function(keys,values,rereduce) { return sum(values); } |, - } + }, + authors => { + map => q| +function(doc) { + if ( doc.work.persons ) { + doc.work.persons.forEach( function(person) { + emit(person.surname+person.firstname , + person + ); + }); + } + if ( doc.work.symposium_works ) { + doc.work.symposium_works.forEach( function(work) { + work.persons.forEach( function(person) { + emit(person.surname+person.firstname , + person + ); + }); + }); + } +} + |, + }, } }; $json = _couchdb_get($url) @@ -271,6 +293,17 @@ if ( doc.user.organization != '' ) { if ( $format eq 'key_array' ) { # array of keys sorted by value $json->{rows} = [ map { $_->{key} } sort { $b->{value} <=> $a->{value} } @{ $json->{rows} } ]; + } elsif ( $format eq 'key_distinct' ) { + + my $found; + $json->{rows} = [ grep { $found->{ $_->{key} }++ == 1 } @{ $json->{rows} } ]; + $json->{distinct_rows} = scalar @{ $json->{rows} }; + warn "## distinct stats ", dump( $found ); + + } elsif ( $format ) { + + die "unknown format: $format"; + } $view_cache->{$url}->{time} = time(); diff --git a/app/drzb2013.html.ep b/app/drzb2013.html.ep index 9d089fb..5211c5d 100644 --- a/app/drzb2013.html.ep +++ b/app/drzb2013.html.ep @@ -47,6 +47,7 @@
diff --git a/app/js/app.js b/app/js/app.js index 661be9e..22d056f 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -10,5 +10,6 @@ angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.directives', $routeProvider.when('/verified/:registrationId', {templateUrl: 'partials/verified.html', controller: RegistrationCtrl}); $routeProvider.when('/review/:registrationId', {templateUrl: 'partials/review.html', controller: RegistrationCtrl}); $routeProvider.when('/list', {templateUrl: 'partials/list.html', controller: ListCtrl}); + $routeProvider.when('/authors', {templateUrl: 'partials/authors.html', controller: AuthorsCtrl}); $routeProvider.otherwise({redirectTo: '/registration/'}); }]); diff --git a/app/js/controllers.js b/app/js/controllers.js index c7a043c..ab41a03 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -7,9 +7,13 @@ function RegistrationCtrl($scope, $log, Registration, $routeParams, $location, $ $scope.$routeParams = $routeParams; $scope.$location = $location; $scope.organizations = []; - View.getArrayPromise('organizations?group=true;format=key_array').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.ValidStates = ValidStates(); @@ -331,3 +335,23 @@ function ListCtrl($scope, $log, Registration, RegistrationTypes, $filter, ValidS 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'; + } + }); +} + +AuthorsCtrl.$inject = [ '$scope', '$log', 'View' ]; + + diff --git a/app/js/services.js.ep b/app/js/services.js.ep index 0a94ae2..44e2a0b 100644 --- a/app/js/services.js.ep +++ b/app/js/services.js.ep @@ -46,17 +46,18 @@ angular.module('myApp.services', [ 'ngResource' ]). /* http://jsfiddle.net/asgoth/7bNAd/ */ factory('View', function($q, $http, $log) { + + var deferred = $q.defer(); + return { - getArrayPromise: function(view_url) { + getPromise: function(view_url) { var url = '/<%= $couchdb_database %>/_design/registration/_view/'+view_url+';callback=JSON_CALLBACK'; - var deferred = $q.defer(); - $log.info('defer', url); $http.jsonp(url).success(function(json) { $log.info('success', url); - deferred.resolve(json.rows); + deferred.resolve(json); }).error(function(error) { $log.error('error', url, error ); deferred.reject(error); diff --git a/app/partials/authors.html.ep b/app/partials/authors.html.ep new file mode 100644 index 0000000..d151365 --- /dev/null +++ b/app/partials/authors.html.ep @@ -0,0 +1,41 @@ + +
+{{message}} +
+ +
+ +
+ +Authors + + + + + + + +{{search}} + +{{data.total_rows}} authors +{{data.distinct_rows}} distinct + +
+ + + + + + + + +
{{author.value.surname}}{{author.value.firstname}}{{author.value.organization}}{{author.value.email}}
+ +% if ( $lang =~ m/x-dev/ ) { +
+{{authors}}
+
+% } + +
+ diff --git a/test/unit/controllersSpec.js b/test/unit/controllersSpec.js index e0ad327..e7eb996 100644 --- a/test/unit/controllersSpec.js +++ b/test/unit/controllersSpec.js @@ -73,3 +73,35 @@ describe('ListCtrl', function(){ expect( scope.ValidStates ).toBeTruthy(); }); }); + + +describe('AuthorsCtrl', function(){ + var scope, $httpBackend; + + beforeEach(module('myApp')); + + beforeEach(inject(function($injector) { + $httpBackend = $injector.get('$httpBackend'); + $httpBackend.whenJSONP(/authors/).passThrough(); + })); + afterEach(function() { + $httpBackend.verifyNoOutstandingExpectation(); + $httpBackend.verifyNoOutstandingRequest(); + }); + + beforeEach(inject(function($rootScope, $controller){ + scope = $rootScope.$new(); + var ctrl = $controller(AuthorsCtrl, { $scope: scope } ); + })); + + + it('ready', function() { + $httpBackend.flush(); + expect( scope.ready ).toBe( true ); + }); + + it('data', function() { + $httpBackend.flush(); + expect( scope.data ).toBeTruthy(); + }); +}); -- 2.20.1