Download as
Browse Code »

Commit a846a4b026648ca73097357012eeb23383e38ed6

Authored by maycon.silva
2 parents 400f052d 5d7cb161
Exists in master

Merge branch 'tarefa-4393' of http://ferramentasgo.centralit.com.br:8080/scm/git… 

…/cit-grp-ecm into tarefa-4393
Showing 7 changed files with 35 additions and 35 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java
  Diff comments   View file @a846a4b
@@ -361,7 +361,9 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme @@ -361,7 +361,9 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
361 public String getAssunto() { 361 public String getAssunto() {
362 362
363 StringBuilder sb = new StringBuilder(); 363 StringBuilder sb = new StringBuilder();
364 - 364 +
  365 + sb.append(this.getCodigo()).append(" - ");
  366 +
365 setAssunto(this, sb); 367 setAssunto(this, sb);
366 368
367 assunto = sb.toString().substring(0, sb.toString().length() - 2); 369 assunto = sb.toString().substring(0, sb.toString().length() - 2);
@@ -381,7 +383,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme @@ -381,7 +383,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
381 setAssunto(planoClassificacao.getPlanoClassificacaoParent(), sb); 383 setAssunto(planoClassificacao.getPlanoClassificacaoParent(), sb);
382 } 384 }
383 385
384 - sb.append(planoClassificacao.getCodigo()).append("-").append(planoClassificacao.getNome()).append(" / "); 386 + sb.append(planoClassificacao.getNome()).append(" / ");
385 } 387 }
386 388
387 /** 389 /**
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexoGedServiceImpl.java
  Diff comments   View file @a846a4b
@@ -105,9 +105,9 @@ public class AnexoGedServiceImpl extends GenericServiceImpl<AnexoGed, Long> impl @@ -105,9 +105,9 @@ public class AnexoGedServiceImpl extends GenericServiceImpl<AnexoGed, Long> impl
105 105
106 // FAZ OCR DO DOCUMENTO ANEXADO E JÁ MANDA PARA INDEXAÇÃO 106 // FAZ OCR DO DOCUMENTO ANEXADO E JÁ MANDA PARA INDEXAÇÃO
107 107
108 - documentoGed.setConteudo(this.gedFileService.doOcr(anexo)); 108 +// documentoGed.setConteudo(this.gedFileService.doOcr(anexo));
109 109
110 - this.solrService.addDocumento(documentoGed); 110 +// this.solrService.addDocumento(documentoGed);
111 111
112 anexo.setDocumentoGed(documentoGed); 112 anexo.setDocumentoGed(documentoGed);
113 113
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java
  Diff comments   View file @a846a4b
@@ -223,7 +223,7 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo @@ -223,7 +223,7 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo
223 223
224 try { 224 try {
225 225
226 - this.solrService.addDocumento(entity); 226 +// this.solrService.addDocumento(entity);
227 227
228 } catch (Exception e) { 228 } catch (Exception e) {
229 229
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js
  Diff comments   View file @a846a4b
@@ -175,7 +175,7 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository', @@ -175,7 +175,7 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository',
175 $scope.$parent.$parent.closeWidget(); 175 $scope.$parent.$parent.closeWidget();
176 $scope.atualizaProcesso(); 176 $scope.atualizaProcesso();
177 $scope.setLoadingSalva(false); 177 $scope.setLoadingSalva(false);
178 - }); 178 + }, 300);
179 179
180 }); 180 });
181 181
@@ -284,14 +284,20 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository', @@ -284,14 +284,20 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository',
284 $scope.findNivelAcessoPorTipoDocumento(item); 284 $scope.findNivelAcessoPorTipoDocumento(item);
285 285
286 $scope.findSugestaoAssunto(item); 286 $scope.findSugestaoAssunto(item);
287 - 287 +
  288 + //Limpar o assuntoSelecionado e as sugestões.
288 $timeout(function(){ 289 $timeout(function(){
289 $scope.assuntoSelecionado = null; 290 $scope.assuntoSelecionado = null;
290 if($scope.documentoGedForm && $scope.documentoGedForm['assuntoSelecionado']) { 291 if($scope.documentoGedForm && $scope.documentoGedForm['assuntoSelecionado']) {
291 $scope.documentoGedForm['assuntoSelecionado'].$setViewValue(''); 292 $scope.documentoGedForm['assuntoSelecionado'].$setViewValue('');
292 $scope.documentoGedForm['assuntoSelecionado'].$render(); 293 $scope.documentoGedForm['assuntoSelecionado'].$render();
293 - $scope.documentoGedForm.$submitted = false;  
294 - $scope.documentoGedForm.$setPristine(); 294 + $scope.documentoGedForm.$submitted = false;
  295 + $scope.documentoGedForm.$setPristine();
  296 +
  297 + }
  298 + if($scope.documentoGedForm && $scope.documentoGedForm['sugestoes']) {
  299 + $scope.documentoGedForm['sugestoes'].$setViewValue('');
  300 + $scope.documentoGedForm['sugestoes'].$render();
295 } 301 }
296 }); 302 });
297 303
@@ -601,6 +607,7 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository', @@ -601,6 +607,7 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository',
601 $scope.findSugestaoAssunto = function(tipoDocumento){ 607 $scope.findSugestaoAssunto = function(tipoDocumento){
602 608
603 $scope.assuntos = []; 609 $scope.assuntos = [];
  610 + $scope.sugestoes = [];
604 TipoDocumentoPlanoClassificacaoRepository.findByIdJoin('tipoDocumento.id', tipoDocumento.id).then(function(result){ 611 TipoDocumentoPlanoClassificacaoRepository.findByIdJoin('tipoDocumento.id', tipoDocumento.id).then(function(result){
605 angular.forEach(result, function (item) { 612 angular.forEach(result, function (item) {
606 $scope.assuntos.push(item.planoClassificacao); 613 $scope.assuntos.push(item.planoClassificacao);
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js
  Diff comments   View file @a846a4b
@@ -194,7 +194,10 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini @@ -194,7 +194,10 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini
194 $scope.assuntos = []; 194 $scope.assuntos = [];
195 195
196 NivelAcessoTipoProcessoRepository.findPorIdTipoProcesso(tipoProcesso.id).then(function(result) { 196 NivelAcessoTipoProcessoRepository.findPorIdTipoProcesso(tipoProcesso.id).then(function(result) {
  197 +
197 $scope.nivelAcessoList = result; 198 $scope.nivelAcessoList = result;
  199 + //Setar o nivelAcessoTipoProcesso público.
  200 + $scope.processo.nivelAcesso = $.grep($scope.nivelAcessoList, function(e){ return e.nivelAcesso.codigo == 2; })[0].originalElement;
198 201
199 $scope.findSugestaoAssunto(tipoProcesso); 202 $scope.findSugestaoAssunto(tipoProcesso);
200 }); 203 });
cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html
  Diff comments   View file @a846a4b
@@ -81,17 +81,18 @@ @@ -81,17 +81,18 @@
81 </div> 81 </div>
82 </div> 82 </div>
83 83
84 - <div class="row" ng-show='documentoGed.tipoDocumento.id'>  
85 - <div class="col-md-12"> 84 + <div class="row">
  85 + <div class="col-md-12" ng-show='documentoGed.tipoDocumento.id'>
86 <div class="form-group"> 86 <div class="form-group">
87 <label><translate>ECM.LABEL.SUGESTOES_ASSUNTO</translate></label> 87 <label><translate>ECM.LABEL.SUGESTOES_ASSUNTO</translate></label>
88 <div class="input-group"> 88 <div class="input-group">
89 - <select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple ng-id="sugestoes" ng-disabled='assuntoSelecionado.id' ng-multiple="true" 89 + <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"
90 ng-options="sugestao as sugestao.assunto for sugestao in assuntos track by sugestao.id"> 90 ng-options="sugestao as sugestao.assunto for sugestao in assuntos track by sugestao.id">
91 - </select> <span ng-show="sugestoes" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" ng-mouseover="$hover = true" 91 + </select>
  92 + <span ng-show="sugestoes" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" ng-mouseover="$hover = true"
92 ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i> 93 ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i>
93 - </span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i>  
94 - </span> 94 + </span>
  95 + <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i></span>
95 </div> 96 </div>
96 </div> 97 </div>
97 </div> 98 </div>
@@ -250,7 +251,7 @@ @@ -250,7 +251,7 @@
250 251
251 <div class="row" ng-show='uploader.queue[0]'> 252 <div class="row" ng-show='uploader.queue[0]'>
252 <div class="col-sm-6"> 253 <div class="col-sm-6">
253 - <strong><label>{{ uploader.queue[0].file.name}}</label></strong> 254 + <label>{{ uploader.queue[0].file.name}}</label>
254 </div> 255 </div>
255 256
256 <div class="col-sm-4"> 257 <div class="col-sm-4">
cit-ecm-web/src/main/webapp/html/processo/processoEdit.html
  Diff comments   View file @a846a4b
@@ -32,21 +32,8 @@ @@ -32,21 +32,8 @@
32 </div> 32 </div>
33 <!-- .row --> 33 <!-- .row -->
34 </div> 34 </div>
35 - <!-- .bar-buttons-action -->  
36 35
37 - <div id="cabecalhoProcesso">  
38 - <h1 class="title">  
39 - <translate>ECM.LABEL.PROCESSO</translate>  
40 - </h1>  
41 -  
42 - <ul class="breadcrumb">  
43 - <li><translate>LABEL.MENU</translate></li>  
44 -  
45 - <li>SIGAD</li>  
46 -  
47 - <li class="active"><translate>ECM.LABEL.PROCESSO</translate></li>  
48 - </ul>  
49 - </div> 36 + <breadcrumb ng-workspace="workspace"></breadcrumb>
50 37
51 <form name="processoForm" autocomplete="off" novalidate> 38 <form name="processoForm" autocomplete="off" novalidate>
52 <p> 39 <p>
@@ -101,8 +88,8 @@ @@ -101,8 +88,8 @@
101 <div class="input-group"> 88 <div class="input-group">
102 <select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple ng-id="sugestao" ng-disabled='assuntoSelecionado.id' ng-multiple="true" 89 <select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple ng-id="sugestao" ng-disabled='assuntoSelecionado.id' ng-multiple="true"
103 ng-options="sugestao as sugestao.assunto for sugestao in assuntos" track-by="track by sugestao.id"> 90 ng-options="sugestao as sugestao.assunto for sugestao in assuntos" track-by="track by sugestao.id">
104 - </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"  
105 - ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i> 91 + </select> <span ng-show="sugestoes" ng-if="!processo.id" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}"
  92 + ng-mouseover="$hover = true" ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i>
106 </span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i> 93 </span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i>
107 </span> 94 </span>
108 </div> 95 </div>
@@ -114,7 +101,7 @@ @@ -114,7 +101,7 @@
114 <div class="col-md-6"> 101 <div class="col-md-6">
115 <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" 102 <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"
116 ng-obrigatorio="true" ng-disabled="!edit" ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao for nivelAcessoTipoProcesso" 103 ng-obrigatorio="true" ng-disabled="!edit" ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao for nivelAcessoTipoProcesso"
117 - track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" /> 104 + track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" show-selecione='false'/>
118 </div> 105 </div>
119 106
120 <div class="col-md-6"> 107 <div class="col-md-6">
@@ -171,8 +158,8 @@ @@ -171,8 +158,8 @@
171 158
172 <div class="row"> 159 <div class="row">
173 <div class="col-sm-6"> 160 <div class="col-sm-6">
174 - <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)"  
175 - ng-show='edit' button-new-show="true" button-new-action="novaPessoa();" /> 161 + <auto-complete ng-id="interessado" ng-label="ECM.LABEL.INTERESSADO" ng-model="interessado" ng-find="findAutoCompleteInteressados(value)" ng-item="item.nome"
  162 + ng-set-result="setInteressados(item)" ng-show='edit' button-new-show="true" button-new-action="novaPessoa();" />
176 </div> 163 </div>
177 </div> 164 </div>
178 165