X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=app%2Fjs%2Fservices.js.ep;h=0a94ae2b336cd4601d2059da3bbbfa2eaa5b17fe;hb=39e4203cab6bea4279c604afb76a18a9ec44ef8e;hp=45d5b37d53414305f181ccfbe72e73efe43c0d6c;hpb=760a58690346d0706199dd29e3543ea343c4b9a3;p=angular-drzb

diff --git a/app/js/services.js.ep b/app/js/services.js.ep
index 45d5b37..0a94ae2 100644
--- a/app/js/services.js.ep
+++ b/app/js/services.js.ep
@@ -20,7 +20,7 @@ angular.module('myApp.services', [ 'ngResource' ]).
 
 [ "participant", "Registracija", "- popunjavaju slušači i suatori, te autori i suatori radova na simpoziju i sudionici okruglog stola." ],
 [ "accomp", "Registracija za osobe u pratnji." ],
-[ '', 'Sve registracije', '', 'badge-inverse' ],
+[ '', 'Sve registracije', '', 'badge-inverse' ]
 
 		];
 
@@ -30,7 +30,7 @@ angular.module('myApp.services', [ 'ngResource' ]).
 				code: value[0],
 				label: value[1],
 				description: value[2],
-				css_class: value[3],
+				css_class: value[3]
 			});
 		}, RegistrationTypes);
 
@@ -40,12 +40,34 @@ angular.module('myApp.services', [ 'ngResource' ]).
 	}).
 	factory('Registration', function($resource){
 		return $resource('/data/:database/registration/:registrationId', { database: '<%= $couchdb_database %>' }, {
-			query: {method:'GET', params:{registraionId:'@id'}, isArray:true}
+			query: {method:'GET', params:{registrationId:'@id'}, isArray:true}
 		});
 	}).
-	factory('View', function($resource) {
-		return $resource('/:database/_design/registration/_view/:view?group=true;format=:format', { database: '<%= $couchdb_database %>' }, {
-			key_array: {method:'GET', params:{ format:'key_array' }, isArray:false}
-		});
 
+/* http://jsfiddle.net/asgoth/7bNAd/ */
+	factory('View', function($q, $http, $log) {
+		return {
+			getArrayPromise: 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);
+				}).error(function(error) {
+					$log.error('error', url, error );
+					deferred.reject(error);
+				});
+
+				return deferred.promise;
+			}
+		};
+	}).
+
+/* http://jsfiddle.net/asgoth/7bNAd/ */
+	value('ValidStates', function() {
+		return [ 'draft', 'confirmation', 'verified', 'review' ];
 	});