Download as
Browse Code »

Commit fe6d1d413d3ad7d2bedf9413c185177ad96bdd90

Authored by rogerio.costa
1 parent 6c49c898
Exists in master

#4289 - Implementação tipo suporte documento

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
  Diff comments   View file @fe6d1d4
... ... @@ -164,23 +164,22 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable {
164 164 @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class })
165 165 private TipoDocumento tipoDocumento;
166 166  
167   -
168 167 /** Atributo nivelAcesso. */
169 168 @ManyToOne(fetch = FetchType.EAGER)
170   - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class})
  169 + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class })
171 170 private NivelAcessoTipoDocumento nivelAcesso;
172   -
  171 +
173 172 @ManyToOne(fetch = FetchType.EAGER)
174   - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class , ViewsEcm.ClassificacaoDocumentoGedView.class})
  173 + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class })
175 174 private NivelAcessoTipoDocumento nivelAcessoOriginal;
176 175  
177 176 /** Atributo sigilo. */
178 177 @ManyToOne(fetch = FetchType.LAZY)
179   - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class , ViewsEcm.ClassificacaoDocumentoGedView.class})
  178 + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class })
180 179 private Sigilo sigilo;
181   -
  180 +
182 181 @ManyToOne(fetch = FetchType.LAZY)
183   - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class , ViewsEcm.ClassificacaoDocumentoGedView.class})
  182 + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class })
184 183 private Sigilo sigiloOriginal;
185 184  
186 185 /** Atributo planoClassificacao. */
... ... @@ -205,7 +204,7 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable {
205 204  
206 205 /** Atributo anexo. */
207 206 @OneToOne(mappedBy = "documentoGed", fetch = FetchType.EAGER)
208   - @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class ,ViewsEcm.ClassificacaoDocumentoGedView.class})
  207 + @JsonView({ ViewsEcm.DocumentoGedEdit.class, Views.ProcessoEdit.class, ViewsEcm.ClassificacaoDocumentoGedView.class })
209 208 private AnexoGed anexo;
210 209  
211 210 /** Atributo versaoAnterior. */
... ... @@ -219,19 +218,17 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable {
219 218 @OneToOne(mappedBy = "documentoGed", fetch = FetchType.EAGER)
220 219 @JsonView({ Views.ProcessoEdit.class })
221 220 private CancelamentoDocumentoGed cancelamentoDocumentoGed;
222   -
  221 +
223 222 /** Atributo prazoSigilo. */
224 223 @Temporal(TemporalType.TIMESTAMP)
225 224 @JsonSerialize(using = JsonCalendarSimpleDateSerializer.class)
226 225 @JsonDeserialize(using = JsonCalendarSimpleDateDeserializer.class)
227 226 @JsonView({ ViewsEcm.DocumentoGedList.class })
228 227 private Calendar prazoSigilo;
229   -
  228 +
230 229 /** Atributo aprovado. */
231 230 @JsonView({ ViewsEcm.DocumentoGedEdit.class })
232 231 private Boolean aprovado;
233   -
234   -
235 232  
236 233 /**
237 234 * @return the novaVersao
... ... @@ -424,7 +421,6 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable {
424 421 this.tipoDocumento = tipoDocumento;
425 422 }
426 423  
427   -
428 424 /**
429 425 * Retorna o valor do atributo <code>nivelAcesso</code>
430 426 *
... ... @@ -872,91 +868,83 @@ public class DocumentoGed extends PersistentObjectUnidade implements Cloneable {
872 868  
873 869 }
874 870  
875   -
876 871 /**
877 872 * Retorna o valor do atributo <code>prazoSigilo</code>
878   - *
  873 + *
879 874 * @return <code>Calendar</code>
880 875 */
881 876 public Calendar getPrazoSigilo() {
882   -
  877 +
883 878 return prazoSigilo;
884 879 }
885 880  
886   -
887 881 /**
888 882 * Define o valor do atributo <code>prazoSigilo</code>.
889   - *
890   - * @param prazoSigilo
  883 + *
  884 + * @param prazoSigilo
891 885 */
892 886 public void setPrazoSigilo(Calendar prazoSigilo) {
893   -
  887 +
894 888 this.prazoSigilo = prazoSigilo;
895 889 }
896 890  
897   -
898 891 /**
899 892 * Retorna o valor do atributo <code>aprovado</code>
900   - *
  893 + *
901 894 * @return <code>Boolean</code>
902 895 */
903 896 public Boolean getAprovado() {
904   -
  897 +
905 898 return aprovado;
906 899 }
907 900  
908   -
909 901 /**
910 902 * Define o valor do atributo <code>aprovado</code>.
911   - *
912   - * @param aprovado
  903 + *
  904 + * @param aprovado
913 905 */
914 906 public void setAprovado(Boolean aprovado) {
915   -
  907 +
916 908 this.aprovado = aprovado;
917 909 }
918 910  
919   -
920 911 /**
921 912 * Retorna o valor do atributo <code>nivelAcessoOriginal</code>
922   - *
  913 + *
923 914 * @return <code>NivelAcessoTipoDocumento</code>
924 915 */
925 916 public NivelAcessoTipoDocumento getNivelAcessoOriginal() {
926   -
  917 +
927 918 return nivelAcessoOriginal;
928 919 }
929 920  
930   -
931 921 /**
932 922 * Define o valor do atributo <code>nivelAcessoOriginal</code>.
933   - *
934   - * @param nivelAcessoOriginal
  923 + *
  924 + * @param nivelAcessoOriginal
935 925 */
936 926 public void setNivelAcessoOriginal(NivelAcessoTipoDocumento nivelAcessoOriginal) {
937   -
  927 +
938 928 this.nivelAcessoOriginal = nivelAcessoOriginal;
939 929 }
940 930  
941   -
942 931 /**
943 932 * Retorna o valor do atributo <code>sigiloOriginal</code>
944   - *
  933 + *
945 934 * @return <code>Sigilo</code>
946 935 */
947 936 public Sigilo getSigiloOriginal() {
948   -
  937 +
949 938 return sigiloOriginal;
950 939 }
951 940  
952   -
953 941 /**
954 942 * Define o valor do atributo <code>sigiloOriginal</code>.
955   - *
956   - * @param sigiloOriginal
  943 + *
  944 + * @param sigiloOriginal
957 945 */
958 946 public void setSigiloOriginal(Sigilo sigiloOriginal) {
959   -
  947 +
960 948 this.sigiloOriginal = sigiloOriginal;
961 949 }
962 950  
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoSuporteDocumento.java
  Diff comments   View file @fe6d1d4
... ... @@ -2,11 +2,9 @@ package br.com.centralit.api.model;
2 2  
3 3 import javax.persistence.Column;
4 4 import javax.persistence.Entity;
5   -import javax.persistence.FetchType;
6 5 import javax.persistence.GeneratedValue;
7 6 import javax.persistence.GenerationType;
8 7 import javax.persistence.Id;
9   -import javax.persistence.OneToOne;
10 8  
11 9 import br.com.centralit.api.framework.json.ViewsEcm;
12 10 import br.com.centralit.framework.json.Views;
... ...
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js
  Diff comments   View file @fe6d1d4
... ... @@ -53,7 +53,8 @@ citApp.controller(&#39;ProcessoController&#39;, [&#39;$scope&#39;, &#39;ProcessoRepository&#39;, &#39;Domini
53 53 }
54 54  
55 55 $scope.removerPropriedades();
56   - $scope.setLoadingSalva(true);
  56 +
  57 + $scope.setLoadingSalva(true);
57 58  
58 59 ProcessoRepository.save($scope.processo).then(function(result) {
59 60 $scope.processo = result.originalElement;
... ... @@ -68,6 +69,8 @@ citApp.controller(&#39;ProcessoController&#39;, [&#39;$scope&#39;, &#39;ProcessoRepository&#39;, &#39;Domini
68 69 };
69 70 HistoricoAlteracaoProcessoRepository.saveParams(historicoAlteracaoProcesso).then(function(result){
70 71  
  72 + $scope.setLoading(false);
  73 +
71 74 });
72 75 } else {
73 76 var historicoAlteracaoProcesso = {
... ... @@ -78,12 +81,14 @@ citApp.controller(&#39;ProcessoController&#39;, [&#39;$scope&#39;, &#39;ProcessoRepository&#39;, &#39;Domini
78 81 };
79 82 HistoricoAlteracaoProcessoRepository.saveParams(historicoAlteracaoProcesso).then(function(result){
80 83  
  84 + $scope.setLoading(false);
  85 +
81 86 });
82 87 }
83 88 $scope.processoForm.$submitted = false;
84 89 $scope.resetForm();
85 90 });
86   - $scope.setLoading(false);
  91 +
87 92 }else{
88 93 //Mensagem de erro de campos obrigatorios não preenchidos
89 94 $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false);
... ...