diff --git a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js index 17346c9..98c4844 100644 --- a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js +++ b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js @@ -15,7 +15,11 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", exibirColunaSelecao : '=?ngExibirColunaSelecao', templateTransclude : '@transclude', modelParent : '=?ngModelParent', - customTransclude : '&ngCustomTransclude' + customTransclude : '&ngCustomTransclude', + setTotalPages : '=?setTotalPages', + setTotalItens : '=?setTotalItens', + useCustomFilterTemp : '=?useCustomFilterTemp', + customFilter : '&ngCustomFilter' }, replace : true, restrict : 'E', @@ -23,8 +27,18 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", templateUrl : 'assets/js/angular/custom/directive/html/listView.html', controller: ['$scope', '$element', '$attrs', function($scope, $element, $attrs) { - $scope.totalPages = 10; - $scope.totalItens = 0; + if($scope.setTotalPages){ + $scope.totalPages = $scope.setTotalPages; + }else{ + $scope.totalPages = 10; + } + + if($scope.setTotalItens){ + $scope.totalItens = $scope.setTotalPages; + }else{ + $scope.totalItens = 0; + } + $scope.limit = 10; $scope.repositorio = $injector.get($scope.repository); $scope.appController = angular.element("#citapp-controller").scope(); @@ -75,6 +89,11 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", } }); + if($scope.useCustomFilterTemp){ + $scope.customFilter(); + return; + } + $scope.fetchResult().then(function() { // The request fires correctly but sometimes the ui doesn't update, // that's a fix @@ -94,6 +113,12 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", $scope.filterCriteria.dir = sortDir; $scope.filterCriteria.sort = sortedBy; $scope.filterCriteria.start = 1; + + if($scope.useCustomFilterTemp){ + $scope.customFilter(); + return; + } + $scope.fetchResult().then(function() { // The request fires correctly but sometimes the ui doesn't update, // that's a fix @@ -103,6 +128,13 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", // RECUPERA LISTA E SETA RESULTADO NA GRID $scope.fetchResult = function(page) { + + if($scope.useCustomFilterTemp){ + $scope.customFilter(); + return; + } + + $scope.appController.setLoadingPesquisa(true); $scope.itemSelecionado = undefined; return $scope.repositorio.getListPage($scope.filterCriteria).then(function(result) { @@ -176,6 +208,7 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", // Limpa os filtros avançados $scope.limparFilters = function() { + $scope.useCustomFilterTemp = false; $scope.filterCriteria.keywordValue = null; if($scope.filtersCopy){ $scope.filterCriteria.filters= angular.copy($scope.filtersCopy); @@ -225,6 +258,22 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", $scope.aplicarMask = function(value, mask){ return value.replace(mask[0], mask[1]); }; + + $scope.$watch('setTotalPages', function() { + if($scope.setTotalPages){ + $scope.totalPages = $scope.setTotalPages; + }else{ + $scope.totalPages = 10; + } + }); + + $scope.$watch('setTotalItens', function() { + if($scope.setTotalItens){ + $scope.totalItens = $scope.setTotalItens; + }else{ + $scope.totalItens = 10; + } + }); $scope.$on('filtroDirective-listViewDirective', function(event, active) { $scope.$showAdvancedFilters = active; diff --git a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html index 5bb770e..98e1a7b 100644 --- a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html +++ b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html @@ -28,9 +28,12 @@ - + {{ header.title }} + + {{ header.title }} + -- libgit2 0.21.2