#4289 - Implementação tipo suporte documento

rogerio.costa
1 parent 6c49c898
Showing 3 changed files with 36 additions and 45 deletions Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/model/DocumentoGed.java
cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoSuporteDocumento.java
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js
@@ -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 <code>nivelAcesso</code>
 	 * 
@@ -872,91 +868,83 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable {
 	}
-	
 	/**
 	 * Retorna o valor do atributo <code>prazoSigilo</code>
-	 *
+	 * 
 	 * @return <code>Calendar</code>
 	 */
 	public Calendar getPrazoSigilo() {
-	
+
 		return prazoSigilo;
 	}
-	
 	/**
 	 * Define o valor do atributo <code>prazoSigilo</code>.
-	 *
-	 * @param prazoSigilo 
+	 * 
+	 * @param prazoSigilo
 	 */
 	public void setPrazoSigilo(Calendar prazoSigilo) {
-	
+
 		this.prazoSigilo = prazoSigilo;
 	}
-	
 	/**
 	 * Retorna o valor do atributo <code>aprovado</code>
-	 *
+	 * 
 	 * @return <code>Boolean</code>
 	 */
 	public Boolean getAprovado() {
-	
+
 		return aprovado;
 	}
-	
 	/**
 	 * Define o valor do atributo <code>aprovado</code>.
-	 *
-	 * @param aprovado 
+	 * 
+	 * @param aprovado
 	 */
 	public void setAprovado(Boolean aprovado) {
-	
+
 		this.aprovado = aprovado;
 	}
-	
 	/**
 	 * Retorna o valor do atributo <code>nivelAcessoOriginal</code>
-	 *
+	 * 
 	 * @return <code>NivelAcessoTipoDocumento</code>
 	 */
 	public NivelAcessoTipoDocumento getNivelAcessoOriginal() {
-	
+
 		return nivelAcessoOriginal;
 	}
-	
 	/**
 	 * Define o valor do atributo <code>nivelAcessoOriginal</code>.
-	 *
-	 * @param nivelAcessoOriginal 
+	 * 
+	 * @param nivelAcessoOriginal
 	 */
 	public void setNivelAcessoOriginal(NivelAcessoTipoDocumento nivelAcessoOriginal) {
-	
+
 		this.nivelAcessoOriginal = nivelAcessoOriginal;
 	}
-	
 	/**
 	 * Retorna o valor do atributo <code>sigiloOriginal</code>
-	 *
+	 * 
 	 * @return <code>Sigilo</code>
 	 */
 	public Sigilo getSigiloOriginal() {
-	
+
 		return sigiloOriginal;
 	}
-	
 	/**
 	 * Define o valor do atributo <code>sigiloOriginal</code>.
-	 *
-	 * @param sigiloOriginal 
+	 * 
+	 * @param sigiloOriginal
 	 */
 	public void setSigiloOriginal(Sigilo sigiloOriginal) {
-	
+
 		this.sigiloOriginal = sigiloOriginal;
 	}
@@ -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;
@@ -53,7 +53,8 @@ citApp.controller(&#39;ProcessoController&#39;, [&#39;$scope&#39;, &#39;ProcessoRepository&#39;, &#39;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(&#39;ProcessoController&#39;, [&#39;$scope&#39;, &#39;ProcessoRepository&#39;, &#39;Domini
 	                };
 	                HistoricoAlteracaoProcessoRepository.saveParams(historicoAlteracaoProcesso).then(function(result){
+	                	  $scope.setLoading(false);
+	                	
 	                }); 
             	} else {
 	                var historicoAlteracaoProcesso = {
@@ -78,12 +81,14 @@ citApp.controller(&#39;ProcessoController&#39;, [&#39;$scope&#39;, &#39;ProcessoRepository&#39;, &#39;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);