From f7666b52866b04249aac5a14c1f5da46946659a8 Mon Sep 17 00:00:00 2001 From: erick.sato Date: Wed, 18 May 2016 17:42:35 -0300 Subject: [PATCH] [Redmine #4987]Novos filtros busca avançada (Ativo / Baixado / Outros) --- cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewCheckBoxDirective.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewCheckBoxDirective.js b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewCheckBoxDirective.js index 4a5c3af..4d90954 100644 --- a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewCheckBoxDirective.js +++ b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewCheckBoxDirective.js @@ -185,12 +185,19 @@ citApp.directive("listViewCheckBox", ["$translate", "$injector", "$timeout", "$f $scope.appController.setLoadingPesquisa(true); //FILTER - ABA_GERAL + if($scope.bemPatrimonialVH.$checkBemStatusAtivo && !$scope.bemPatrimonialVH.$checkBemStatusBaixado){ + $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2, comparison: 'ne'}); + + }else if(!$scope.bemPatrimonialVH.$checkBemStatusAtivo && $scope.bemPatrimonialVH.$checkBemStatusBaixado){ + $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2}); + + }else if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){ + $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus}); + } + if($scope.bemPatrimonialVH.idDominioSituacaoFisica !== undefined && $scope.bemPatrimonialVH.idDominioSituacaoFisica != ""){ $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioSituacaoFisica.id', value : $scope.bemPatrimonialVH.idDominioSituacaoFisica}); } - if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){ - $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus}); - } if($scope.bemPatrimonialVH.$contaContabil != undefined && $scope.bemPatrimonialVH.$contaContabil != ''){ $injector.get('ConfiguracaoParametroSistemaRepository').getParametro("CONTA_CONTABIL_ALMOXARIFADO").then(function(result) { -- libgit2 0.21.2