From 59e257e3288b1e47f4dccd2a779fcd13c3ef3064 Mon Sep 17 00:00:00 2001
From: rogerio.costa <rogerio.costa@centralit.com.br>
Date: Wed, 20 Apr 2016 09:52:42 -0300
Subject: [PATCH] #4289 - Implementação tipo suporte documento

---
 cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java             |  1 +
 cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/SolrSearchController.js | 45 ++++++++++++++++++++++++++++++++++++++++++---
 cit-ecm-web/src/main/webapp/html/pesquisa/pesquisa.html                                 | 22 ++++++++++++++++++++--
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java b/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
index b5669cc..db0cbca 100644
--- a/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
+++ b/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
@@ -417,6 +417,7 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.UNIDADE_GESTORA ", "Unidade gestora", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.DATA_CRIACAO ", "Data criação", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.PLACEHOLDER_PESQUISA ", "Digite o Nup, tipo de processo, tipo de documento, conteúdo do documento, autor, assunto, destinatário...", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.ATE ", "Até", dominio, modulo));
 		
 		
 	}
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/SolrSearchController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/SolrSearchController.js
index f9b6e4d..3f4a5f9 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/SolrSearchController.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/SolrSearchController.js
@@ -129,6 +129,12 @@ citApp.controller('SolrSearchController', ['$scope','$attrs','$location','$route
             query.setOption("facet.limit", $scope.maxHints);
             query.setOption('start', $scope.start * $scope.documentsPerPage);
             
+            //Verifica se foi selecionado filtro de data
+            if($scope.dateMathFilter != ""){
+            	
+            	query.setOption("fq", $scope.dateMathFilter);
+            }
+            
             var hints = $scope.searchHintsField.split(',');
             for(var i = 0; i < hints.length; i++){
             	query.setOption("facet.field#" + i, hints[i]);
@@ -136,6 +142,7 @@ citApp.controller('SolrSearchController', ['$scope','$attrs','$location','$route
             
             query.setNearMatch($scope.nearMatch);
             query.setUserQuery($scope.userQuery);
+            query.setQueryParameters($scope.queryParameters);
             SolrSearchService.setQuery($scope.queryName, query);
             SolrSearchService.updateQuery($scope.queryName);
         }, 350);    	
@@ -491,10 +498,22 @@ citApp.controller('SolrSearchController', ['$scope','$attrs','$location','$route
     $scope.addParameterDate = function(){
     	
     	$timeout(function () {
-	    	//Última Hora
-	    	if($scope.parameterDatePesquisa.codigo == 1){
+    		
+    		if($scope.parameterDatePesquisa.codigo == 0){
+    			
+    			$scope.dateMathFilter = "";
+    			
+    			$scope.onkeyup();
+    			
+    		  	//Última Hora
+    		}else if($scope.parameterDatePesquisa.codigo == 1){
+	    		
+	    		var date = new Date();
+	    		date.setHours(date.getHours() - 1);
 	    		
-	    		$scope.dateMathFilter = "dataCriacao:[NOW-1HOUR TO NOW]";
+	    		var dataUltimaHora = $filter('date')(date, "yyyy-MM-dd'T'HH:mm:ss'Z'");
+	    		
+	    		$scope.dateMathFilter = "dataCriacao:["+dataUltimaHora+" TO NOW]";
 	    		$scope.onkeyup();
 	    		//Útimas 24 horas
 	    	}else if($scope.parameterDatePesquisa.codigo == 2){
@@ -521,6 +540,26 @@ citApp.controller('SolrSearchController', ['$scope','$attrs','$location','$route
     	
     };
     
+    //adiciona o filtro entre datas
+    $scope.addParameterDatePersonalisada = function(){
+    	
+    	var dataInicioFormat = $filter('date')($scope.dataInicioFiltro, "yyyy-MM-dd'T'HH:mm:ss'Z'");
+    	
+    	var dataFimFormat = $filter('date')($scope.dataFimFiltro, "yyyy-MM-dd'T'HH:mm:ss'Z'");
+    	
+    	if($scope.dataInicioFiltro && $scope.dataFimFiltro){
+    		
+    		$scope.dateMathFilter = "dataCriacao:["+dataInicioFormat+" TO "+dataFimFormat+ "]";
+    		
+    		$scope.onkeyup();
+    	}else{
+    		
+    		$scope.dateMathFilter = "";
+    	}
+    	
+    	
+    };
+    
     /**
      * Add a query parameter. The parameter setting is added only if it is
      * unique.
diff --git a/cit-ecm-web/src/main/webapp/html/pesquisa/pesquisa.html b/cit-ecm-web/src/main/webapp/html/pesquisa/pesquisa.html
index 0543990..20b8997 100644
--- a/cit-ecm-web/src/main/webapp/html/pesquisa/pesquisa.html
+++ b/cit-ecm-web/src/main/webapp/html/pesquisa/pesquisa.html
@@ -42,14 +42,32 @@
 						<div class="row" ng-show="$showAdvancedFilters" style="padding-top: 10px;">
 							<hr>
 							<div class="col-sm-2">
-								<label-select ng-id="parameterPesquisa" ng-model="parameterPesquisa" form="solrForm" ng-list="filtroPesquisaList"
+								<label-select ng-id="parameterPesquisa" ng-model="parameterPesquisa" ng-label="ECM.LABEL.OBJETO" form="solrForm" ng-list="filtroPesquisaList"
 								ng-custom-options="dominio.originalElement as dominio.descricao for dominio" show-selecione='false' ng-custom-change="addParameter()"> </label-select>
 							</div>
 							
 							<div class="col-sm-2">
-								<label-select ng-id="parameterDatePesquisa" ng-model="parameterDatePesquisa" form="solrForm" ng-list="filtroDateList"
+								<label-select ng-id="parameterDatePesquisa" ng-label="ECM.LABEL.DATA_CRIACAO" ng-model="parameterDatePesquisa" form="solrForm" ng-list="filtroDateList"
 								ng-custom-options="dominio.originalElement as dominio.descricao for dominio" show-selecione='false' ng-custom-change="addParameterDate()"> </label-select>
 							</div>
+							
+							<div class='col-sm-2' ng-show="parameterDatePesquisa.codigo == 6">
+							    <div class="form-group">
+					          	  <label for="date-birth" class="control-label">De</label>
+						            <div class="control">
+						                <input id="date-birth" class="form-control" type="date" ng-model="dataInicioFiltro" ng-change="addParameterDatePersonalisada();">
+						            </div>
+					       		</div>
+							</div>
+							
+							<div class='col-sm-2' ng-show="parameterDatePesquisa.codigo == 6">
+							    <div class="form-group">
+					          	  <label for="date-birth" class="control-label"><translate>ECM.LABEL.ATE</translate></label>
+						            <div class="control">
+						                <input id="date-birth" class="form-control" type="date" ng-model="dataFimFiltro" ng-change="addParameterDatePersonalisada();"> 
+						            </div>
+					       		</div>
+							</div>
 						</div>
 	
 						<div class="row">
--
libgit2 0.21.2