From fe6d1d413d3ad7d2bedf9413c185177ad96bdd90 Mon Sep 17 00:00:00 2001 From: rogerio.costa Date: Thu, 7 Apr 2016 11:20:51 -0300 Subject: [PATCH] #4289 - Implementação tipo suporte documento --- cit-ecm-api/src/main/java/br/com/centralit/api/model/DocumentoGed.java | 70 +++++++++++++++++++++++++++++----------------------------------------- cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoSuporteDocumento.java | 2 -- cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js | 9 +++++++-- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/DocumentoGed.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/DocumentoGed.java index 7f125dc..8d01116 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/DocumentoGed.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/DocumentoGed.java @@ -164,23 +164,22 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable { @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class }) private TipoDocumento tipoDocumento; - /** Atributo nivelAcesso. */ @ManyToOne(fetch = FetchType.EAGER) - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class}) + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class }) private NivelAcessoTipoDocumento nivelAcesso; - + @ManyToOne(fetch = FetchType.EAGER) - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class , ViewsEcm.ClassificacaoDocumentoGedView.class}) + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class }) private NivelAcessoTipoDocumento nivelAcessoOriginal; /** Atributo sigilo. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class , ViewsEcm.ClassificacaoDocumentoGedView.class}) + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class }) private Sigilo sigilo; - + @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class , ViewsEcm.ClassificacaoDocumentoGedView.class}) + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class }) private Sigilo sigiloOriginal; /** Atributo planoClassificacao. */ @@ -205,7 +204,7 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable { /** Atributo anexo. */ @OneToOne(mappedBy = "documentoGed", fetch = FetchType.EAGER) - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class ,ViewsEcm.ClassificacaoDocumentoGedView.class}) + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class }) private AnexoGed anexo; /** Atributo versaoAnterior. */ @@ -219,19 +218,17 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable { @OneToOne(mappedBy = "documentoGed", fetch = FetchType.EAGER) @JsonView({ Views.ProcessoEdit.class }) private CancelamentoDocumentoGed cancelamentoDocumentoGed; - + /** Atributo prazoSigilo. */ @Temporal(TemporalType.TIMESTAMP) @JsonSerialize(using = JsonCalendarSimpleDateSerializer.class) @JsonDeserialize(using = JsonCalendarSimpleDateDeserializer.class) @JsonView({ ViewsEcm.DocumentoGedList.class }) private Calendar prazoSigilo; - + /** Atributo aprovado. */ @JsonView({ ViewsEcm.DocumentoGedEdit.class }) private Boolean aprovado; - - /** * @return the novaVersao @@ -424,7 +421,6 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable { this.tipoDocumento = tipoDocumento; } - /** * Retorna o valor do atributo nivelAcesso * @@ -872,91 +868,83 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable { } - /** * Retorna o valor do atributo prazoSigilo - * + * * @return Calendar */ public Calendar getPrazoSigilo() { - + return prazoSigilo; } - /** * Define o valor do atributo prazoSigilo. - * - * @param prazoSigilo + * + * @param prazoSigilo */ public void setPrazoSigilo(Calendar prazoSigilo) { - + this.prazoSigilo = prazoSigilo; } - /** * Retorna o valor do atributo aprovado - * + * * @return Boolean */ public Boolean getAprovado() { - + return aprovado; } - /** * Define o valor do atributo aprovado. - * - * @param aprovado + * + * @param aprovado */ public void setAprovado(Boolean aprovado) { - + this.aprovado = aprovado; } - /** * Retorna o valor do atributo nivelAcessoOriginal - * + * * @return NivelAcessoTipoDocumento */ public NivelAcessoTipoDocumento getNivelAcessoOriginal() { - + return nivelAcessoOriginal; } - /** * Define o valor do atributo nivelAcessoOriginal. - * - * @param nivelAcessoOriginal + * + * @param nivelAcessoOriginal */ public void setNivelAcessoOriginal(NivelAcessoTipoDocumento nivelAcessoOriginal) { - + this.nivelAcessoOriginal = nivelAcessoOriginal; } - /** * Retorna o valor do atributo sigiloOriginal - * + * * @return Sigilo */ public Sigilo getSigiloOriginal() { - + return sigiloOriginal; } - /** * Define o valor do atributo sigiloOriginal. - * - * @param sigiloOriginal + * + * @param sigiloOriginal */ public void setSigiloOriginal(Sigilo sigiloOriginal) { - + this.sigiloOriginal = sigiloOriginal; } diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoSuporteDocumento.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoSuporteDocumento.java index d64ee6c..17747af 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoSuporteDocumento.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoSuporteDocumento.java @@ -2,11 +2,9 @@ package br.com.centralit.api.model; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.OneToOne; import br.com.centralit.api.framework.json.ViewsEcm; import br.com.centralit.framework.json.Views; 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 4494a87..93ffb23 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 @@ -53,7 +53,8 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini } $scope.removerPropriedades(); - $scope.setLoadingSalva(true); + + $scope.setLoadingSalva(true); ProcessoRepository.save($scope.processo).then(function(result) { $scope.processo = result.originalElement; @@ -68,6 +69,8 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini }; HistoricoAlteracaoProcessoRepository.saveParams(historicoAlteracaoProcesso).then(function(result){ + $scope.setLoading(false); + }); } else { var historicoAlteracaoProcesso = { @@ -78,12 +81,14 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini }; HistoricoAlteracaoProcessoRepository.saveParams(historicoAlteracaoProcesso).then(function(result){ + $scope.setLoading(false); + }); } $scope.processoForm.$submitted = false; $scope.resetForm(); }); - $scope.setLoading(false); + }else{ //Mensagem de erro de campos obrigatorios não preenchidos $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false); -- libgit2 0.21.2