Job event detail page now working. Search expanded to work with boolean an integer types. Added new form generator layout. Fixed pagination bugs. Job cancel/delete working.

This commit is contained in:
chouseknecht
2013-05-21 02:57:34 -04:00
parent 3d3782fcee
commit 8343d20c60
13 changed files with 659 additions and 393 deletions

View File

@@ -20,32 +20,44 @@ angular.module('PaginateHelper', ['RefreshHelper'])
var scope = params.scope;
var list = params.list;
var iterator = (params.iterator) ? params.iterator : list.iterator;
var url = params.url;
var mode = (params.mode) ? params.mode : null;
scope[list.iterator + 'Page'] = 0;
scope[iterator + 'Page'] = 0;
if (mode == 'lookup') {
scope[list.iterator + 'PageSize'] = 5;
if (params.pageSize) {
scope[iterator + 'PageSize'] = params.pageSize;
}
else if (mode == 'lookup') {
scope[iterator + 'PageSize'] = 5;
}
else {
scope[list.iterator + 'PageSize'] = 20;
scope[iterator + 'PageSize'] = 20;
}
scope.nextSet = function(set, iterator) {
scope[iterator + 'Page']++;
Refresh({ scope: scope, set: set, iterator: iterator, url: scope[iterator + 'NextUrl'] });
if (scope[iterator + 'NextUrl']) {
scope[iterator + 'Page']++;
Refresh({ scope: scope, set: set, iterator: iterator, url: scope[iterator + 'NextUrl'] });
}
};
scope.prevSet = function(set, iterator) {
scope[iterator + 'Page']--;
Refresh({ scope: scope, set: set, iterator: iterator, url: scope[iterator + 'PrevUrl'] });
if (scope[iterator + 'PrevUrl']) {
scope[iterator + 'Page']--;
Refresh({ scope: scope, set: set, iterator: iterator, url: scope[iterator + 'PrevUrl'] });
}
};
scope.changePageSize = function(set, iterator) {
// Called when a new page size is selected
scope[iterator + 'Page'] = 0;
url += (scope[iterator + 'SearchParams']) ? scope[iterator + 'SearchParams'] : '';
console.log(url);
url = url.replace(/\/\?.*$/,'/');
console.log(url);
url += (scope[iterator + 'SearchParams']) ? scope[iterator + 'SearchParams'] + '&page_size=' + scope[iterator + 'PageSize' ] :
'?page_size=' + scope[iterator + 'PageSize' ];
Refresh({ scope: scope, set: set, iterator: iterator, url: url });
}
}