Commit 5d7cb161162e368b754bd640f968ee15aa2c7bd6
1 parent
596640c3
Exists in
master
#4393 Correção de defeitos encontrados em homologação
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
... | ... | @@ -361,7 +361,9 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme |
361 | 361 | public String getAssunto() { |
362 | 362 | |
363 | 363 | StringBuilder sb = new StringBuilder(); |
364 | - | |
364 | + | |
365 | + sb.append(this.getCodigo()).append(" - "); | |
366 | + | |
365 | 367 | setAssunto(this, sb); |
366 | 368 | |
367 | 369 | assunto = sb.toString().substring(0, sb.toString().length() - 2); |
... | ... | @@ -381,7 +383,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme |
381 | 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-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js
... | ... | @@ -284,14 +284,20 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository', |
284 | 284 | $scope.findNivelAcessoPorTipoDocumento(item); |
285 | 285 | |
286 | 286 | $scope.findSugestaoAssunto(item); |
287 | - | |
287 | + | |
288 | + //Limpar o assuntoSelecionado e as sugestões. | |
288 | 289 | $timeout(function(){ |
289 | 290 | $scope.assuntoSelecionado = null; |
290 | 291 | if($scope.documentoGedForm && $scope.documentoGedForm['assuntoSelecionado']) { |
291 | 292 | $scope.documentoGedForm['assuntoSelecionado'].$setViewValue(''); |
292 | 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 | ... | ... |
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js
... | ... | @@ -187,7 +187,10 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini |
187 | 187 | $scope.assuntos = []; |
188 | 188 | |
189 | 189 | NivelAcessoTipoProcessoRepository.findPorIdTipoProcesso(tipoProcesso.id).then(function(result) { |
190 | + | |
190 | 191 | $scope.nivelAcessoList = result; |
192 | + //Setar o nivelAcessoTipoProcesso público. | |
193 | + $scope.processo.nivelAcesso = $.grep($scope.nivelAcessoList, function(e){ return e.nivelAcesso.codigo == 2; })[0].originalElement; | |
191 | 194 | |
192 | 195 | $scope.findSugestaoAssunto(tipoProcesso); |
193 | 196 | }); | ... | ... |
cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html
... | ... | @@ -81,17 +81,18 @@ |
81 | 81 | </div> |
82 | 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 | 86 | <div class="form-group"> |
87 | 87 | <label><translate>ECM.LABEL.SUGESTOES_ASSUNTO</translate></label> |
88 | 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 | 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 | 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 | 96 | </div> |
96 | 97 | </div> |
97 | 98 | </div> | ... | ... |
cit-ecm-web/src/main/webapp/html/processo/processoEdit.html
... | ... | @@ -32,21 +32,8 @@ |
32 | 32 | </div> |
33 | 33 | <!-- .row --> |
34 | 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 | 38 | <form name="processoForm" autocomplete="off" novalidate> |
52 | 39 | <p> |
... | ... | @@ -97,8 +84,8 @@ |
97 | 84 | <div class="input-group"> |
98 | 85 | <select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple ng-id="sugestao" ng-disabled='assuntoSelecionado.id' ng-multiple="true" |
99 | 86 | ng-options="sugestao as sugestao.assunto for sugestao in assuntos" track-by="track by sugestao.id"> |
100 | - </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" | |
101 | - ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i> | |
87 | + </select> <span ng-show="sugestoes" ng-if="!processo.id" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" | |
88 | + ng-mouseover="$hover = true" ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i> | |
102 | 89 | </span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i> |
103 | 90 | </span> |
104 | 91 | </div> |
... | ... | @@ -110,7 +97,7 @@ |
110 | 97 | <div class="col-md-6"> |
111 | 98 | <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" |
112 | 99 | ng-obrigatorio="true" ng-disabled="!edit" ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao for nivelAcessoTipoProcesso" |
113 | - track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" /> | |
100 | + track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" show-selecione='false'/> | |
114 | 101 | </div> |
115 | 102 | |
116 | 103 | <div class="col-md-6"> |
... | ... | @@ -167,8 +154,8 @@ |
167 | 154 | |
168 | 155 | <div class="row"> |
169 | 156 | <div class="col-sm-6"> |
170 | - <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)" | |
171 | - ng-show='edit' button-new-show="true" button-new-action="novaPessoa();" /> | |
157 | + <auto-complete ng-id="interessado" ng-label="ECM.LABEL.INTERESSADO" ng-model="interessado" ng-find="findAutoCompleteInteressados(value)" ng-item="item.nome" | |
158 | + ng-set-result="setInteressados(item)" ng-show='edit' button-new-show="true" button-new-action="novaPessoa();" /> | |
172 | 159 | </div> |
173 | 160 | </div> |
174 | 161 | ... | ... |