Commit f7666b52866b04249aac5a14c1f5da46946659a8
1 parent
b5d92b7c
Exists in
master
[Redmine #4987]Novos filtros busca avançada (Ativo / Baixado / Outros)
Showing
1 changed file
with
10 additions
and
3 deletions
Show diff stats
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewCheckBoxDirective.js
| @@ -185,12 +185,19 @@ citApp.directive("listViewCheckBox", ["$translate", "$injector", "$timeout", "$f | @@ -185,12 +185,19 @@ citApp.directive("listViewCheckBox", ["$translate", "$injector", "$timeout", "$f | ||
| 185 | $scope.appController.setLoadingPesquisa(true); | 185 | $scope.appController.setLoadingPesquisa(true); |
| 186 | 186 | ||
| 187 | //FILTER - ABA_GERAL | 187 | //FILTER - ABA_GERAL |
| 188 | + if($scope.bemPatrimonialVH.$checkBemStatusAtivo && !$scope.bemPatrimonialVH.$checkBemStatusBaixado){ | ||
| 189 | + $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2, comparison: 'ne'}); | ||
| 190 | + | ||
| 191 | + }else if(!$scope.bemPatrimonialVH.$checkBemStatusAtivo && $scope.bemPatrimonialVH.$checkBemStatusBaixado){ | ||
| 192 | + $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2}); | ||
| 193 | + | ||
| 194 | + }else if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){ | ||
| 195 | + $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus}); | ||
| 196 | + } | ||
| 197 | + | ||
| 188 | if($scope.bemPatrimonialVH.idDominioSituacaoFisica !== undefined && $scope.bemPatrimonialVH.idDominioSituacaoFisica != ""){ | 198 | if($scope.bemPatrimonialVH.idDominioSituacaoFisica !== undefined && $scope.bemPatrimonialVH.idDominioSituacaoFisica != ""){ |
| 189 | $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioSituacaoFisica.id', value : $scope.bemPatrimonialVH.idDominioSituacaoFisica}); | 199 | $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioSituacaoFisica.id', value : $scope.bemPatrimonialVH.idDominioSituacaoFisica}); |
| 190 | } | 200 | } |
| 191 | - if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){ | ||
| 192 | - $scope.filterCriteria.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus}); | ||
| 193 | - } | ||
| 194 | if($scope.bemPatrimonialVH.$contaContabil != undefined && $scope.bemPatrimonialVH.$contaContabil != ''){ | 201 | if($scope.bemPatrimonialVH.$contaContabil != undefined && $scope.bemPatrimonialVH.$contaContabil != ''){ |
| 195 | 202 | ||
| 196 | $injector.get('ConfiguracaoParametroSistemaRepository').getParametro("CONTA_CONTABIL_ALMOXARIFADO").then(function(result) { | 203 | $injector.get('ConfiguracaoParametroSistemaRepository').getParametro("CONTA_CONTABIL_ALMOXARIFADO").then(function(result) { |