#4393 Correção de defeitos encontrados em homologação

rogerio.costa
1 parent 596640c3
Showing 5 changed files with 29 additions and 30 deletions Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js
cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html
cit-ecm-web/src/main/webapp/html/processo/processoEdit.html
@@ -361,7 +361,9 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
 	public String getAssunto() {
 		StringBuilder sb = new StringBuilder();
-
+		
+		sb.append(this.getCodigo()).append(" - ");
+		
 		setAssunto(this, sb);
 		assunto = sb.toString().substring(0, sb.toString().length() - 2);
@@ -381,7 +383,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
 			setAssunto(planoClassificacao.getPlanoClassificacaoParent(), sb);
 		}
-		sb.append(planoClassificacao.getCodigo()).append("-").append(planoClassificacao.getNome()).append(" / ");
+		sb.append(planoClassificacao.getNome()).append(" / ");
 	}
 	/**
@@ -284,14 +284,20 @@ citApp.controller(&#39;DocumentoGedController&#39;, [&#39;$scope&#39;, &#39;DocumentoGedRepository&#39;,
 	   $scope.findNivelAcessoPorTipoDocumento(item);
 	   $scope.findSugestaoAssunto(item);
-	   
+	  
+	   //Limpar o assuntoSelecionado e as sugestões.
 	   $timeout(function(){
 	     $scope.assuntoSelecionado = null;
 	     if($scope.documentoGedForm && $scope.documentoGedForm['assuntoSelecionado']) {
 				$scope.documentoGedForm['assuntoSelecionado'].$setViewValue('');
 				$scope.documentoGedForm['assuntoSelecionado'].$render();
-				$scope.documentoGedForm.$submitted = false;
-				$scope.documentoGedForm.$setPristine();
+				 $scope.documentoGedForm.$submitted = false;
+			 	 $scope.documentoGedForm.$setPristine();
+			
+			}
+	     if($scope.documentoGedForm && $scope.documentoGedForm['sugestoes']) {
+				$scope.documentoGedForm['sugestoes'].$setViewValue('');
+				$scope.documentoGedForm['sugestoes'].$render();
 			}
 	   });
@@ -187,7 +187,10 @@ citApp.controller(&#39;ProcessoController&#39;, [&#39;$scope&#39;, &#39;ProcessoRepository&#39;, &#39;Domini
  	   $scope.assuntos = [];
  	   NivelAcessoTipoProcessoRepository.findPorIdTipoProcesso(tipoProcesso.id).then(function(result) {
+ 		   
  	    	$scope.nivelAcessoList = result;
+ 	    	//Setar o nivelAcessoTipoProcesso público.
+ 	        $scope.processo.nivelAcesso = $.grep($scope.nivelAcessoList, function(e){ return e.nivelAcesso.codigo == 2; })[0].originalElement;
  	    	$scope.findSugestaoAssunto(tipoProcesso);
      	});
@@ -81,17 +81,18 @@
 						</div>
 					</div>
-					<div class="row" ng-show='documentoGed.tipoDocumento.id'>
-						<div class="col-md-12">
+					<div class="row">
+						<div class="col-md-12" ng-show='documentoGed.tipoDocumento.id'>
 							<div class="form-group">
 								<label><translate>ECM.LABEL.SUGESTOES_ASSUNTO</translate></label>
 								<div class="input-group">
-									<select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple ng-id="sugestoes" ng-disabled='assuntoSelecionado.id' ng-multiple="true"
+									<select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple id="sugestoes" name="sugestoes" ng-disabled='assuntoSelecionado.id' ng-multiple="true"
 										ng-options="sugestao as sugestao.assunto for sugestao in assuntos track by sugestao.id">
-									</select> <span ng-show="sugestoes" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" ng-mouseover="$hover = true"
+									</select> 
+									<span ng-show="sugestoes" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" ng-mouseover="$hover = true"
 										ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i>
-									</span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i>
-									</span>
+									</span> 
+									<span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i></span>
 								</div>
 							</div>
 						</div>
@@ -32,21 +32,8 @@
 		</div>
 		<!-- .row -->
 	</div>
-	<!-- .bar-buttons-action -->
-	<div id="cabecalhoProcesso">
-		<h1 class="title">
-			<translate>ECM.LABEL.PROCESSO</translate>
-		</h1>
-
-		<ul class="breadcrumb">
-			<li><translate>LABEL.MENU</translate></li>
-
-			<li>SIGAD</li>
-
-			<li class="active"><translate>ECM.LABEL.PROCESSO</translate></li>
-		</ul>
-	</div>
+	<breadcrumb ng-workspace="workspace"></breadcrumb>
 	<form name="processoForm" autocomplete="off" novalidate>
 		<p>
@@ -97,8 +84,8 @@
 						<div class="input-group">
 							<select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple ng-id="sugestao" ng-disabled='assuntoSelecionado.id' ng-multiple="true"
 								ng-options="sugestao as sugestao.assunto for sugestao in assuntos" track-by="track by sugestao.id">
-							</select> <span ng-show="sugestoes" ng-if="!processo.id" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" ng-mouseover="$hover = true"
-								ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i>
+							</select> <span ng-show="sugestoes" ng-if="!processo.id" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}"
+								ng-mouseover="$hover = true" ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i>
 							</span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i>
 							</span>
 						</div>
@@ -110,7 +97,7 @@
 				<div class="col-md-6">
 					<label-select ng-id="processo.nivelAcesso" ng-label="ECM.LABEL.NIVEL_ACESSO" ng-model="processo.nivelAcesso" ng-custom-change='setHipoteseLegal(processo.nivelAcesso.id)' form="processoForm"
 						ng-obrigatorio="true" ng-disabled="!edit" ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao  for nivelAcessoTipoProcesso"
-						track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" />
+						track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" show-selecione='false'/>
 				</div>
 				<div class="col-md-6">
@@ -167,8 +154,8 @@
 						<div class="row">
 							<div class="col-sm-6">
-								<auto-complete ng-id="interessado" ng-label="ECM.LABEL.INTERESSADO" ng-model="interessado" ng-find="findAutoCompleteInteressados(value)" ng-item="item.nome" ng-set-result="setInteressados(item)"
-									ng-show='edit' button-new-show="true" button-new-action="novaPessoa();" />
+								<auto-complete ng-id="interessado" ng-label="ECM.LABEL.INTERESSADO" ng-model="interessado" ng-find="findAutoCompleteInteressados(value)" ng-item="item.nome"
+									ng-set-result="setInteressados(item)" ng-show='edit' button-new-show="true" button-new-action="novaPessoa();" />
 							</div>
 						</div>