From 069bedf9e33ba2473ea70402e449a2dd6780a516 Mon Sep 17 00:00:00 2001 From: maycon.silva Date: Wed, 20 Apr 2016 18:38:16 -0300 Subject: [PATCH] Redmine #4599 Correcao anexo homologacao --- cit-ecm-api/src/main/java/br/com/centralit/api/framework/json/ViewsEcm.java | 2 ++ cit-ecm-api/src/main/java/br/com/centralit/api/model/HipoteseLegal.java | 2 +- cit-ecm-api/src/main/java/br/com/centralit/api/model/InteressadoProcesso.java | 2 +- cit-ecm-api/src/main/java/br/com/centralit/api/model/NivelAcessoTipoProcesso.java | 4 ++-- cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java | 2 +- cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java | 66 +++++++++++++++++++++++++++++++++++++----------------------------- cit-ecm-api/src/main/java/br/com/centralit/api/model/SigiloTipoProcesso.java | 2 +- cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoProcesso.java | 2 +- cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexarProcessoServiceImpl.java | 12 ++++++------ cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java | 3 +++ cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java | 1 + cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java | 29 ++++++++++++++++++++++++++++- cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java | 4 ++++ cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/AnexarProcessoController.js | 1 + cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js | 22 +++++++++++----------- cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js | 5 +++++ cit-ecm-web/src/main/webapp/html/anexarProcesso/anexarProcesso.html | 4 ---- cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeAcaoProcesso.html | 2 ++ cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeDocumentosProcesso.html | 49 ++++++++++++++++++++++++------------------------- cit-ecm-web/src/main/webapp/html/processo/metadadoProcesso.html | 166 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- cit-ecm-web/src/main/webapp/html/processo/metadadoProcessoView.html | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 21 files changed, 261 insertions(+), 249 deletions(-) delete mode 100644 cit-ecm-web/src/main/webapp/html/processo/metadadoProcesso.html create mode 100644 cit-ecm-web/src/main/webapp/html/processo/metadadoProcessoView.html diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/framework/json/ViewsEcm.java b/cit-ecm-api/src/main/java/br/com/centralit/api/framework/json/ViewsEcm.java index c9b8a07..c68d094 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/framework/json/ViewsEcm.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/framework/json/ViewsEcm.java @@ -109,4 +109,6 @@ public class ViewsEcm extends Views { public static class TarjaAssinaturaListview extends Views.GenericView{}; public static class TarjaAssinaturaEditview extends ViewsEcm.TarjaAssinaturaListview{}; + + public static class MetadadoProcessoView extends Views.GenericView{}; } diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/HipoteseLegal.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/HipoteseLegal.java index ac9743a..7edce57 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/HipoteseLegal.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/HipoteseLegal.java @@ -69,7 +69,7 @@ public class HipoteseLegal extends PersistentObjectAudit { private String descricao; /** Atributo nome. */ - @JsonView({ ViewsEcm.HipoteseLegalList.class, ViewsEcm.TipoProcessoList.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.NivelAcessoTipoDocumentoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class }) + @JsonView({ ViewsEcm.HipoteseLegalList.class, ViewsEcm.TipoProcessoList.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.NivelAcessoTipoDocumentoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private String nome; /** Atributo fundamentacaoLegal. */ diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/InteressadoProcesso.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/InteressadoProcesso.java index 1c237da..830aa1a 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/InteressadoProcesso.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/InteressadoProcesso.java @@ -63,7 +63,7 @@ public class InteressadoProcesso extends PersistentObjectAudit { /** Atributo interessado. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ ViewsEcm.ProcessoEdit.class }) + @JsonView({ ViewsEcm.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private Pessoa interessado; /** diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/NivelAcessoTipoProcesso.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/NivelAcessoTipoProcesso.java index 06c3ac1..22c1706 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/NivelAcessoTipoProcesso.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/NivelAcessoTipoProcesso.java @@ -72,11 +72,11 @@ public class NivelAcessoTipoProcesso extends PersistentObjectAudit { /** Atributo tipoAcesso. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ ViewsEcm.TipoProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class, Views.ProcessoList.class }) + @JsonView({ ViewsEcm.TipoProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class, Views.ProcessoList.class, ViewsEcm.MetadadoProcessoView.class }) private Dominio nivelAcesso; @OneToMany(fetch = FetchType.LAZY, mappedBy = "nivelAcessoTipoProcesso", cascade = CascadeType.ALL) - @JsonView({ ViewsEcm.TipoProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class, ViewsEcm.ProcessoEdit.class }) + @JsonView({ ViewsEcm.TipoProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class, ViewsEcm.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private Collection sigilos; /** 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 48a0fb1..dec0cf6 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 @@ -100,7 +100,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme private Boolean permitirUsarComoClassificacao; @Transient - @JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class }) + @JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class, ViewsEcm.MetadadoProcessoView.class }) private String assunto; /** Atributo tipoDestinacao. */ diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java index 7d070b9..ee62967 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java @@ -77,9 +77,9 @@ public class Processo extends PersistentObjectUnidade { @GeneratedValue(strategy = GenerationType.AUTO) @JsonView({ Views.GenericView.class }) private Long id; - + /** Atributo assuntoComplementar. */ - @JsonView({ Views.ProcessoList.class }) + @JsonView({ Views.ProcessoList.class, ViewsEcm.MetadadoProcessoView.class}) private String assuntoComplementar; /** Atributo dataReferencia. */ @@ -95,7 +95,7 @@ public class Processo extends PersistentObjectUnidade { private Calendar dataConclusao; /** Atributo nup. */ - @JsonView({ Views.ProcessoList.class, Views.ProcessoRelacionadoList.class, Views.AnexarProcesso.class, Views.ProcessoAutoCompleteView.class }) + @JsonView({ Views.ProcessoList.class, Views.ProcessoRelacionadoList.class, Views.AnexarProcesso.class, Views.ProcessoAutoCompleteView.class, ViewsEcm.MetadadoProcessoView.class }) private String nup; /** Atributo nome. */ @@ -104,6 +104,14 @@ public class Processo extends PersistentObjectUnidade { /** Atributo idTask. */ @Transient private Long idTask; + + @Transient + @JsonView({ Views.ProcessoAutoCompleteView.class }) + private boolean anexado; + + @Transient + @JsonView({ Views.ProcessoEdit.class }) + private boolean tramitado; /** Atributo prazoSigilo. */ @Temporal(TemporalType.TIMESTAMP) @@ -117,7 +125,7 @@ public class Processo extends PersistentObjectUnidade { private Boolean aprovado; /** Atributo observacaoGeral. */ - @JsonView({ Views.ProcessoEdit.class }) + @JsonView({ Views.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private String observacaoGeral; /** Atributo tipoAssunto. */ @@ -129,12 +137,12 @@ public class Processo extends PersistentObjectUnidade { private Long idProcessInstance; /** Atributo nup. */ - @JsonView({ Views.ProcessoEdit.class }) + @JsonView({ Views.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class}) private Dominio tipoProtocolo; /** Atributo status. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoEdit.class }) + @JsonView({ Views.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private Dominio status; /** Atributo tramitarDocumento. */ @@ -143,22 +151,22 @@ public class Processo extends PersistentObjectUnidade { private TramitarDocumento tramitarDocumento; /** Atributo tipoProcesso. */ - @JsonView({ Views.ProcessoList.class, Views.ProcessoRelacionadoList.class, Views.AnexarProcesso.class }) + @JsonView({ Views.ProcessoList.class, Views.ProcessoRelacionadoList.class, Views.AnexarProcesso.class, ViewsEcm.MetadadoProcessoView.class }) @ManyToOne(fetch = FetchType.LAZY) private TipoProcesso tipoProcesso; /** Atributo assunto. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoList.class }) + @JsonView({ Views.ProcessoList.class, ViewsEcm.MetadadoProcessoView.class }) private PlanoClassificacao assunto; /** Atributo nivelAcesso. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoList.class }) + @JsonView({ Views.ProcessoList.class, ViewsEcm.MetadadoProcessoView.class }) private NivelAcessoTipoProcesso nivelAcesso; @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoList.class }) + @JsonView({ Views.ProcessoList.class, ViewsEcm.MetadadoProcessoView.class }) private NivelAcessoTipoProcesso nivelAcessoOriginal; /** Atributo anexoProcesso. */ @@ -168,7 +176,7 @@ public class Processo extends PersistentObjectUnidade { /** Atributo hipoteseLegal. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoEdit.class }) + @JsonView({ Views.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private HipoteseLegal hipoteseLegal; /** Atributo cienciaProcesso. */ @@ -178,11 +186,11 @@ public class Processo extends PersistentObjectUnidade { /** Atributo sigilo. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoList.class }) + @JsonView({ Views.ProcessoList.class, ViewsEcm.MetadadoProcessoView.class }) private Sigilo sigilo; @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoList.class }) + @JsonView({ Views.ProcessoList.class, ViewsEcm.MetadadoProcessoView.class }) private Sigilo sigiloOriginal; /** Atributo temporalidade. */ @@ -193,7 +201,7 @@ public class Processo extends PersistentObjectUnidade { /** Atributo Interessados. */ @OneToMany(fetch = FetchType.LAZY, mappedBy = "processo", cascade = CascadeType.ALL, orphanRemoval = true) - @JsonView({ Views.ProcessoEdit.class }) + @JsonView({ Views.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private Collection interessados; /** Atributo documentos. */ @@ -848,25 +856,25 @@ public class Processo extends PersistentObjectUnidade { this.unidadesProcesso = unidadesProcesso; } + /** - *

- * Iniciativa(s): NUMERO_INICIATIVA - *

- * - *

- * Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO - *

- * - * Verifica se o processo foi tramitado. Levando em consideração a unidadeProcesso criada apartir da criação do processo. - * - * @author maycon.silva - * - * @return boolean + * Retorna o valor do atributo tramitado + * + * @return boolean */ - /* @JsonView({ Views.ProcessoEdit.class }) */ public boolean isTramitado() { + + return !UtilColecao.isVazio(this.getUnidadesProcesso()) && this.getUnidadesProcesso().size() > 1; + } - return !UtilColecao.isVazio(this.getUnidadesProcesso()) && this.getUnidadesProcesso().size() > 1; + /** + * Retorna o valor do atributo anexado + * + * @return boolean + */ + public boolean isAnexado() { + + return !UtilColecao.isVazio(this.getAnexados()) && this.getAnexados().size() >= 1; } } diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/SigiloTipoProcesso.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/SigiloTipoProcesso.java index 15ac6c8..3a672f4 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/SigiloTipoProcesso.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/SigiloTipoProcesso.java @@ -66,7 +66,7 @@ public class SigiloTipoProcesso extends PersistentObjectAudit { /** Atributo sigilo. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ ViewsEcm.TipoProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class, ViewsEcm.ProcessoEdit.class }) + @JsonView({ ViewsEcm.TipoProcessoEdit.class, ViewsEcm.NivelAcessoTipoProcessoEdit.class, ViewsEcm.ProcessoEdit.class, ViewsEcm.MetadadoProcessoView.class }) private Sigilo sigilo; /** diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoProcesso.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoProcesso.java index 37be2d2..db42f3d 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoProcesso.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoProcesso.java @@ -67,7 +67,7 @@ public class TipoProcesso extends PersistentObjectUnidade { private String descricao; /** Atributo nome. */ - @JsonView({ ViewsEcm.TipoProcessoList.class, Views.ProcessoList.class, Views.ProcessoRelacionadoList.class }) + @JsonView({ ViewsEcm.TipoProcessoList.class, Views.ProcessoList.class, Views.ProcessoRelacionadoList.class, ViewsEcm.MetadadoProcessoView.class }) private String nome; /** Atributo nome. */ diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexarProcessoServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexarProcessoServiceImpl.java index 556f73f..62e16ff 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexarProcessoServiceImpl.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexarProcessoServiceImpl.java @@ -14,11 +14,9 @@ import br.com.centralit.api.model.Processo; import br.com.centralit.api.service.AnexarProcessoService; import br.com.centralit.api.service.AnexoGedService; import br.com.centralit.api.service.DocumentoGedService; +import br.com.centralit.api.service.DominioService; import br.com.centralit.api.service.ProcessoService; import br.com.centralit.api.viewHelper.AnexarProcessoVH; -import br.com.centralit.framework.esi.enumerated.EventTargetEnum; -import br.com.centralit.framework.esi.environment.EnvironmentVariable; -import br.com.centralit.framework.esi.environment.SignalEventInput; import br.com.centralit.framework.exception.BusinessException; import br.com.centralit.framework.exception.CodigoErro; import br.com.centralit.framework.service.arquitetura.GedFileService; @@ -83,6 +81,9 @@ public class AnexarProcessoServiceImpl extends GenericServiceImpl impl this.montarEntidade(entity); entity.setSigiloOriginal(entity.getSigilo()); entity.setNivelAcessoOriginal(entity.getNivelAcesso()); + entity.setStatus(this.dominioService.findByChaveAndCodigo("statusProcesso", 2L)); Processo processo = super.save(entity); diff --git a/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java b/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java index 920259b..5c8597d 100644 --- a/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java +++ b/cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import br.com.centralit.api.framework.json.ViewsEcm; import br.com.centralit.api.model.Processo; import br.com.centralit.api.service.ProcessoService; import br.com.centralit.api.service.UsuarioService; @@ -98,6 +99,28 @@ public class ProcessoController extends GenericController { return responseBody; } + + + /** + *

Iniciativa(s): NUMERO_INICIATIVA

+ * + *

Regra(s) de negócio: NUMERO_REGRA_DE_NEGOCIO

+ * + * Método responsável por retornar apenas os atributos do metadado do processo. + * + * @author maycon.silva + * + * @param idProcesso + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getMetadadoProcesso") + @ResponseBody + public ResponseBodyWrapper getMetadadoProcesso(@RequestParam(value = "idProcesso") Long idProcesso) { + + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getReference(idProcesso), this.getMetadadoProcessoView()); + + return responseBody; + } /** *

@@ -197,8 +220,12 @@ public class ProcessoController extends GenericController { @Override public Class getAutoCompleteView() { - // TODO Auto-generated method stub return Views.ProcessoAutoCompleteView.class; } + + public Class getMetadadoProcessoView() { + + return ViewsEcm.MetadadoProcessoView.class; + } } 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 5d7d48c..002d57d 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 @@ -203,6 +203,7 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen list.add(new Dominio("statusProcesso", "Concluído", "CONCLUIDO", 1L)); list.add(new Dominio("statusProcesso", "Em andamento", "EM_ANDAMENTO", 2L)); + list.add(new Dominio("statusProcesso", "Anexado", "ANEXADO", 3L)); list.add(new Dominio("tipoAssinatura", "Assinatura interna", "ASSINATURA_INTERNA", 1L)); list.add(new Dominio("tipoAssinatura", "Assinatura por certificado digital", "ASSINATURA_CERTIFICADO_DIGITAL", 2L)); @@ -412,6 +413,9 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.CONTEUDO_HTML", "Conteúdo HTML", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.REMOVER_IMAGEM", "Remover imagem", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.CAMPOS_DINAMICOS", "Campos Dinâmicos", dominio, modulo)); + internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.DADOS_PROCESSO_ANEXADO", "Dados do Processo Anexado", dominio, modulo)); + + } /** diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/AnexarProcessoController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/AnexarProcessoController.js index afcb1dc..5276504 100644 --- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/AnexarProcessoController.js +++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/AnexarProcessoController.js @@ -34,6 +34,7 @@ citApp.controller('AnexarProcessoController', ['$scope', 'UnidadeProcessoReposit AnexarProcessoRepository.findByIdProcesso($scope.$parent.$parent.processo.id).then(function(result) { angular.forEach(result, function(item, key) { if(item.originalElement.processo != null){ + $scope.anexarProcessoVH.listaProcessoAnexado.push(item.originalElement); } diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js index dd68908..d19089d 100644 --- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js +++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js @@ -26,10 +26,10 @@ citApp.controller('GerenciarProcessoController', [ '$scope', '$translate', '$tim $scope.isHistoricoJustificativa = false; $scope.isAnexarProcesso = false; $scope.widgetExemploIsCollapsed = true; - $scope.tratimitado(); $scope.isGerenciarCredencialProcesso = false; $scope.isClassificarProcessoDocumento = false; $scope.isAtribuirProcesso = false; + $scope.isVisualizarMetadadoProcesso = false; }; // CRIAR RELACIONAMENTO DE PROCESSO @@ -460,14 +460,6 @@ citApp.controller('GerenciarProcessoController', [ '$scope', '$translate', '$tim // WIDGET PRADAO $scope.isHistoricoProcesso = true; }; - - $scope.tratimitado = function () { - UnidadeProcessoRepository.existeVinculo( { 'joinClass' : 'processo.id', 'id' : $scope.processo.id } ).then( function ( result ) { - if ( result ) { - $scope.isTramitado = true; - } - } ); - }; // ------------------------------EXECUTA BPE------------------------------------ @@ -690,6 +682,14 @@ citApp.controller('GerenciarProcessoController', [ '$scope', '$translate', '$tim } }); - } - + }; + + $scope.visualizarMetadadosProcessoDocumento = function (processoDocumento){ + $scope.fecharPagina(); + $scope.isVisualizarMetadadoProcesso = true; + $timeout( function () { + angular.element( "#metadadoProcessoView" ).scope().getProcessoView(processoDocumento); + } ); + }; + }] ); diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js index 3a266e3..5cbf750 100644 --- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js +++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js @@ -37,6 +37,11 @@ citApp.factory('ProcessoRepository', ['RestangularEcm', 'AbstractRepository', fu }; + this.getMetadadoProcesso = function (idProcesso){ + return restangularEcm.one(this.route + '/getMetadadoProcesso').get({"idProcesso": idProcesso}); + + }; + } AbstractRepository.extend(ProcessoRepository); diff --git a/cit-ecm-web/src/main/webapp/html/anexarProcesso/anexarProcesso.html b/cit-ecm-web/src/main/webapp/html/anexarProcesso/anexarProcesso.html index d280d97..9b02c8f 100644 --- a/cit-ecm-web/src/main/webapp/html/anexarProcesso/anexarProcesso.html +++ b/cit-ecm-web/src/main/webapp/html/anexarProcesso/anexarProcesso.html @@ -53,10 +53,6 @@ LABEL.ADICIONAR - diff --git a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeAcaoProcesso.html b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeAcaoProcesso.html index 2e1e37c..3666d86 100644 --- a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeAcaoProcesso.html +++ b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeAcaoProcesso.html @@ -23,6 +23,8 @@
+
+
diff --git a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeDocumentosProcesso.html b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeDocumentosProcesso.html index 5cb714c..5e837eb 100644 --- a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeDocumentosProcesso.html +++ b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeDocumentosProcesso.html @@ -1,29 +1,28 @@
- -
- -
-
- {{documento.tipoDocumento.nome}} - {{documento.numero}} {{documento.tipoDocumento.nome}} - {{documento.numero}} -
- -
- {{documento.dataCriacao | date: 'dd/MM/yyyy HH:mm:ss'}} -
- -
{{documento.assuntoComplementar}}
- -
- {{documento.sigilo.tipoSigilo.descricao}} {{documento.sigilo.tipoSigilo.descricao}} {{documento.sigilo.tipoSigilo.descricao}} - {{documento.nivelAcesso.nivelAcesso.descricao}} {{documento.nivelAcesso.nivelAcesso.descricao}} Anexado Assinado Habilitado Ciência Cancelado -
+
+ {{documento.tipoDocumento.nome}} - {{documento.numero}} {{documento.tipoDocumento.nome}} - {{documento.numero}} +
+ +
+ {{documento.dataCriacao | date: 'dd/MM/yyyy HH:mm:ss'}} +
+ +
{{documento.assuntoComplementar}}
+ + + +
+ {{documento.sigilo.tipoSigilo.descricao}} {{documento.sigilo.tipoSigilo.descricao}} {{documento.sigilo.tipoSigilo.descricao}} + {{documento.nivelAcesso.nivelAcesso.descricao}} {{documento.nivelAcesso.nivelAcesso.descricao}} Anexado Assinado Habilitado Ciência Cancelado +
+
@@ -35,8 +34,8 @@ diff --git a/cit-ecm-web/src/main/webapp/html/processo/metadadoProcesso.html b/cit-ecm-web/src/main/webapp/html/processo/metadadoProcesso.html deleted file mode 100644 index 52f9e63..0000000 --- a/cit-ecm-web/src/main/webapp/html/processo/metadadoProcesso.html +++ /dev/null @@ -1,166 +0,0 @@ -

- ( * ) LABEL.CAMPOS_OBRIGATORIOS -

- -
- - - LABEL.DADOS_PROCESSO - - -
-
- -
- -
-
- - -
-
- -
- -
-
- -
-
- -
-
- - -
-
-
-
-
-
- - -
-
-
-
-
- -
- -
- -
-
- - -
- -
-
-
- -
- -
-
- -
-
- - -
- -
- - - -
- -
- - - -
- -
- -
- - - LABEL.INTERESSADOS - - -
- -
- -
-
- -
- -
- -
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - -
LABEL.NOME
{{interessadoList.interessado.nome}}
LABEL.TABELA_VAZIA
- - - - - - - - diff --git a/cit-ecm-web/src/main/webapp/html/processo/metadadoProcessoView.html b/cit-ecm-web/src/main/webapp/html/processo/metadadoProcessoView.html new file mode 100644 index 0000000..1112227 --- /dev/null +++ b/cit-ecm-web/src/main/webapp/html/processo/metadadoProcessoView.html @@ -0,0 +1,130 @@ +

+ +
+ +
+

+ ECM.LABEL.DADOS_PROCESSO_ANEXADO +

+ +
+ + +
+
+ +
+
+ + +
+ +
+ +
+
-- libgit2 0.21.2