diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java index e53138d..48a0fb1 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java @@ -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(" / "); } /** diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js index 8fe15ca..c9a435c 100644 --- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js +++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js @@ -284,14 +284,20 @@ citApp.controller('DocumentoGedController', ['$scope', 'DocumentoGedRepository', $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(); } }); diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js index bb0da4f..d59cbe0 100644 --- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js +++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js @@ -187,7 +187,10 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', '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); }); diff --git a/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html b/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html index 7cb0bf2..f43b99e 100644 --- a/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html +++ b/cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html @@ -81,17 +81,18 @@ -