Commit 8811234bce926a1350e5b8691ca590f914e2e9b3
1 parent
a2b44f82
Exists in
master
#4199 Change Request. Atribuir Processos a um usuário.
Showing
11 changed files
with
169 additions
and
101 deletions
Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java
... | ... | @@ -167,7 +167,7 @@ public class Processo extends PersistentObjectUnidade { |
167 | 167 | @ManyToOne(fetch = FetchType.LAZY) |
168 | 168 | @JsonView({ Views.ProcessoList.class }) |
169 | 169 | private Sigilo sigilo; |
170 | - | |
170 | + | |
171 | 171 | @ManyToOne(fetch = FetchType.LAZY) |
172 | 172 | @JsonView({ Views.ProcessoList.class }) |
173 | 173 | private Sigilo sigiloOriginal; |
... | ... | @@ -183,6 +183,7 @@ public class Processo extends PersistentObjectUnidade { |
183 | 183 | @JsonView({ Views.ProcessoEdit.class }) |
184 | 184 | private Collection<InteressadoProcesso> interessados; |
185 | 185 | |
186 | + /** Atributo documentos. */ | |
186 | 187 | @OneToMany(fetch = FetchType.LAZY, mappedBy = "processo", cascade = CascadeType.ALL) |
187 | 188 | @JsonView({ Views.ProcessoEdit.class }) |
188 | 189 | private Collection<DocumentoGed> documentos; |
... | ... | @@ -200,15 +201,14 @@ public class Processo extends PersistentObjectUnidade { |
200 | 201 | @ManyToMany |
201 | 202 | @JoinTable(name = "processo_anexado", joinColumns = { @JoinColumn(name = "processo_id") }, inverseJoinColumns = { @JoinColumn(name = "processo_anexado_id") }) |
202 | 203 | private Collection<AnexoProcesso> anexados; |
203 | - | |
204 | - | |
204 | + | |
205 | 205 | /** Atributo prazoSigilo. */ |
206 | 206 | @Temporal(TemporalType.TIMESTAMP) |
207 | 207 | @JsonSerialize(using = JsonCalendarSimpleDateSerializer.class) |
208 | 208 | @JsonDeserialize(using = JsonCalendarSimpleDateDeserializer.class) |
209 | 209 | @JsonView({ ViewsEcm.ProcessoList.class }) |
210 | 210 | private Calendar prazoSigilo; |
211 | - | |
211 | + | |
212 | 212 | /** Atributo aprovado. */ |
213 | 213 | @JsonView({ ViewsEcm.ProcessoList.class }) |
214 | 214 | private Boolean aprovado; |
... | ... | @@ -741,91 +741,84 @@ public class Processo extends PersistentObjectUnidade { |
741 | 741 | |
742 | 742 | this.credenciais = credenciais; |
743 | 743 | } |
744 | - | |
744 | + | |
745 | 745 | /** |
746 | 746 | * Retorna o valor do atributo <code>prazoSigilo</code> |
747 | - * | |
747 | + * | |
748 | 748 | * @return <code>Calendar</code> |
749 | 749 | */ |
750 | 750 | public Calendar getPrazoSigilo() { |
751 | - | |
751 | + | |
752 | 752 | return prazoSigilo; |
753 | 753 | } |
754 | 754 | |
755 | - | |
756 | 755 | /** |
757 | 756 | * Define o valor do atributo <code>prazoSigilo</code>. |
758 | - * | |
759 | - * @param prazoSigilo | |
757 | + * | |
758 | + * @param prazoSigilo | |
760 | 759 | */ |
761 | 760 | public void setPrazoSigilo(Calendar prazoSigilo) { |
762 | - | |
761 | + | |
763 | 762 | this.prazoSigilo = prazoSigilo; |
764 | 763 | } |
765 | 764 | |
766 | - | |
767 | 765 | /** |
768 | 766 | * Retorna o valor do atributo <code>nivelAcessoOriginal</code> |
769 | - * | |
767 | + * | |
770 | 768 | * @return <code>NivelAcessoTipoProcesso</code> |
771 | 769 | */ |
772 | 770 | public NivelAcessoTipoProcesso getNivelAcessoOriginal() { |
773 | - | |
771 | + | |
774 | 772 | return nivelAcessoOriginal; |
775 | 773 | } |
776 | 774 | |
777 | - | |
778 | 775 | /** |
779 | 776 | * Define o valor do atributo <code>nivelAcessoOriginal</code>. |
780 | - * | |
781 | - * @param nivelAcessoOriginal | |
777 | + * | |
778 | + * @param nivelAcessoOriginal | |
782 | 779 | */ |
783 | 780 | public void setNivelAcessoOriginal(NivelAcessoTipoProcesso nivelAcessoOriginal) { |
784 | - | |
781 | + | |
785 | 782 | this.nivelAcessoOriginal = nivelAcessoOriginal; |
786 | 783 | } |
787 | 784 | |
788 | - | |
789 | 785 | /** |
790 | 786 | * Retorna o valor do atributo <code>sigiloOriginal</code> |
791 | - * | |
787 | + * | |
792 | 788 | * @return <code>Sigilo</code> |
793 | 789 | */ |
794 | 790 | public Sigilo getSigiloOriginal() { |
795 | - | |
791 | + | |
796 | 792 | return sigiloOriginal; |
797 | 793 | } |
798 | 794 | |
799 | - | |
800 | 795 | /** |
801 | 796 | * Define o valor do atributo <code>sigiloOriginal</code>. |
802 | - * | |
803 | - * @param sigiloOriginal | |
797 | + * | |
798 | + * @param sigiloOriginal | |
804 | 799 | */ |
805 | 800 | public void setSigiloOriginal(Sigilo sigiloOriginal) { |
806 | - | |
801 | + | |
807 | 802 | this.sigiloOriginal = sigiloOriginal; |
808 | 803 | } |
809 | 804 | |
810 | - | |
811 | 805 | /** |
812 | 806 | * Retorna o valor do atributo <code>aprovado</code> |
813 | - * | |
807 | + * | |
814 | 808 | * @return <code>Boolean</code> |
815 | 809 | */ |
816 | 810 | public Boolean getAprovado() { |
817 | - | |
811 | + | |
818 | 812 | return aprovado; |
819 | 813 | } |
820 | 814 | |
821 | - | |
822 | 815 | /** |
823 | 816 | * Define o valor do atributo <code>aprovado</code>. |
824 | - * | |
825 | - * @param aprovado | |
817 | + * | |
818 | + * @param aprovado | |
826 | 819 | */ |
827 | 820 | public void setAprovado(Boolean aprovado) { |
828 | - | |
821 | + | |
829 | 822 | this.aprovado = aprovado; |
830 | 823 | } |
831 | 824 | ... | ... |
cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoDocumento.java
... | ... | @@ -75,6 +75,11 @@ public class TipoDocumento extends PersistentObjectAudit { |
75 | 75 | @JsonView({ ViewsEcm.TipoDocumentoEdit.class, Views.DocumentoGedEdit.class }) |
76 | 76 | private Dominio formaCriacao; |
77 | 77 | |
78 | + /** Atributo formaNumeracao. */ | |
79 | + @ManyToOne(fetch = FetchType.LAZY) | |
80 | + @JsonView({ ViewsEcm.TipoDocumentoEdit.class, Views.DocumentoGedEdit.class }) | |
81 | + private Dominio formaNumeracao; | |
82 | + | |
78 | 83 | /** Atributo hipoteseLegal. */ |
79 | 84 | @ManyToOne(fetch = FetchType.LAZY) |
80 | 85 | @JsonView({ ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.NivelAcessoTipoDocumentoEdit.class, ViewsEcm.DocumentoGedEdit.class }) |
... | ... | @@ -234,4 +239,44 @@ public class TipoDocumento extends PersistentObjectAudit { |
234 | 239 | this.hipoteseLegal = hipoteseLegal; |
235 | 240 | } |
236 | 241 | |
242 | + /** | |
243 | + * Retorna o valor do atributo <code>formaNumeracao</code> | |
244 | + * | |
245 | + * @return <code>Dominio</code> | |
246 | + */ | |
247 | + public Dominio getFormaNumeracao() { | |
248 | + | |
249 | + return formaNumeracao; | |
250 | + } | |
251 | + | |
252 | + /** | |
253 | + * Define o valor do atributo <code>formaNumeracao</code>. | |
254 | + * | |
255 | + * @param formaNumeracao | |
256 | + */ | |
257 | + public void setFormaNumeracao(Dominio formaNumeracao) { | |
258 | + | |
259 | + this.formaNumeracao = formaNumeracao; | |
260 | + } | |
261 | + | |
262 | + /** | |
263 | + * Retorna o valor do atributo <code>templatePadrao</code> | |
264 | + * | |
265 | + * @return <code>TemplatePadrao</code> | |
266 | + */ | |
267 | + public TemplatePadrao getTemplatePadrao() { | |
268 | + | |
269 | + return templatePadrao; | |
270 | + } | |
271 | + | |
272 | + /** | |
273 | + * Define o valor do atributo <code>templatePadrao</code>. | |
274 | + * | |
275 | + * @param templatePadrao | |
276 | + */ | |
277 | + public void setTemplatePadrao(TemplatePadrao templatePadrao) { | |
278 | + | |
279 | + this.templatePadrao = templatePadrao; | |
280 | + } | |
281 | + | |
237 | 282 | } | ... | ... |
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexoGedServiceImpl.java
... | ... | @@ -107,7 +107,7 @@ public class AnexoGedServiceImpl extends GenericServiceImpl<AnexoGed, Long> impl |
107 | 107 | |
108 | 108 | documentoGed.setConteudo(this.gedFileService.doOcr(anexo)); |
109 | 109 | |
110 | - this.solrService.addDocumento(documentoGed); | |
110 | +// this.solrService.addDocumento(documentoGed); | |
111 | 111 | |
112 | 112 | anexo.setDocumentoGed(documentoGed); |
113 | 113 | ... | ... |
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java
... | ... | @@ -176,7 +176,7 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo |
176 | 176 | entity.setConteudo(this.decrypted(entity.getConteudoCriptografado())); |
177 | 177 | } |
178 | 178 | |
179 | - this.saveSolr(entity); | |
179 | + // this.saveSolr(entity); | |
180 | 180 | |
181 | 181 | this.verificaTemporalidadeProcesso(entity); |
182 | 182 | |
... | ... | @@ -504,6 +504,32 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo |
504 | 504 | */ |
505 | 505 | private void gerarNumeroDocumentOnline(DocumentoGed entity) { |
506 | 506 | |
507 | + if (entity.getTipoDocumento().getFormaNumeracao().getCodigo().equals(1L)) { | |
508 | + | |
509 | + this.gerarNumeroSequencialAno(entity); | |
510 | + }else{ | |
511 | + | |
512 | + } | |
513 | + | |
514 | + } | |
515 | + | |
516 | + /** | |
517 | + * <p> | |
518 | + * <b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a> | |
519 | + * </p> | |
520 | + * | |
521 | + * <p> | |
522 | + * <b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a> | |
523 | + * </p> | |
524 | + * | |
525 | + * Método responsável por gerar o numero do documento sequencial | |
526 | + * | |
527 | + * @author rogerio.costa | |
528 | + * | |
529 | + * @param entity | |
530 | + */ | |
531 | + private void gerarNumeroSequencialAno(DocumentoGed entity) { | |
532 | + | |
507 | 533 | entity.setIcon(DocumentoGedServiceImpl.ICON_DOC_ONLINE); |
508 | 534 | |
509 | 535 | Calendar calendarInicial = Calendar.getInstance(); |
... | ... | @@ -538,7 +564,6 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo |
538 | 564 | sb.append("1/").append(UtilDate.getAnoAtual()); |
539 | 565 | entity.setNumero(sb.toString()); |
540 | 566 | } |
541 | - | |
542 | 567 | } |
543 | 568 | |
544 | 569 | @Override | ... | ... |
cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java
... | ... | @@ -103,7 +103,7 @@ public class ProcessoController extends GenericController<Processo> { |
103 | 103 | @ResponseBody |
104 | 104 | public ResponseBodyWrapper getProcessoGerenciamento(@RequestParam(value = "idProcesso") Long idProcesso) { |
105 | 105 | |
106 | - ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoGerenciamento(idProcesso), this.getListView()); | |
106 | + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoGerenciamento(idProcesso), this.getEditView()); | |
107 | 107 | |
108 | 108 | return responseBody; |
109 | 109 | } | ... | ... |
cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
... | ... | @@ -197,6 +197,9 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen |
197 | 197 | |
198 | 198 | list.add(new Dominio("tipoProtocoloNup", "Automático", "EXTERNO", 1L, Boolean.FALSE)); |
199 | 199 | list.add(new Dominio("tipoProtocoloNup", "Informado", "NUP_NOVO", 2L, Boolean.FALSE)); |
200 | + | |
201 | + list.add(new Dominio("formaNumeracao", "Sequencial por ano", "SEQUENCIAL_ANO", 1L)); | |
202 | + list.add(new Dominio("formaNumeracao", "Sequencial único", "SEQUENCIAL_UNICO", 2L)); | |
200 | 203 | |
201 | 204 | this.dominioService.saveListIfNotExist(list); |
202 | 205 | |
... | ... | @@ -388,6 +391,7 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen |
388 | 391 | internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.ATRIBUIDO_POR", "Atribuído por", dominio, modulo)); |
389 | 392 | internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.REMOVIDO_POR", "Removido por", dominio, modulo)); |
390 | 393 | internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.DATA_REMOCAO", "Data remoção", dominio, modulo)); |
394 | + internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.FORMA_NUMERACAO", "Forma de numeração", dominio, modulo)); | |
391 | 395 | |
392 | 396 | |
393 | 397 | } | ... | ... |
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js
... | ... | @@ -453,7 +453,7 @@ citApp.controller('GerenciarProcessoController', [ '$scope', '$translate', '$tim |
453 | 453 | // WIDGET PRADAO |
454 | 454 | $scope.isHistoricoProcesso = true; |
455 | 455 | }; |
456 | - | |
456 | + | |
457 | 457 | $scope.tratimitado = function () { |
458 | 458 | UnidadeProcessoRepository.existeVinculo( { |
459 | 459 | 'joinClass' : 'processo.id', | ... | ... |
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/HistoricoAlteracaoProcessoController.js
... | ... | @@ -34,15 +34,19 @@ citApp.controller('HistoricoAlteracaoProcessoController', ['$scope', 'HistoricoA |
34 | 34 | }; |
35 | 35 | |
36 | 36 | $scope.findByProcessoPaginado = function(idProcesso, inicio, max) { |
37 | + $scope.setLoading(true); | |
37 | 38 | HistoricoAlteracaoProcessoRepository.findByProcessoPaginado(idProcesso, inicio, max).then(function(result) { |
38 | 39 | $scope.listHistoricos = result; |
39 | 40 | $scope.exibidos = max; |
40 | 41 | $scope.maxExibidos = max + 10; |
42 | + $scope.setLoading(false); | |
41 | 43 | }); |
42 | 44 | }; |
43 | 45 | |
44 | 46 | $scope.countByProcesso = function(idProcesso) { |
47 | + $scope.setLoading(true); | |
45 | 48 | HistoricoAlteracaoProcessoRepository.countByProcesso(idProcesso).then(function(result) { |
49 | + $scope.setLoading(false); | |
46 | 50 | $scope.numeroHistoricos = result; |
47 | 51 | }); |
48 | 52 | }; | ... | ... |
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TipoDocumentoController.js
... | ... | @@ -536,6 +536,10 @@ citApp.controller('TipoDocumentoController',['$scope', 'TipoDocumentoRepository' |
536 | 536 | $scope.formaCriacaoList = result; |
537 | 537 | }); |
538 | 538 | |
539 | + DominioRepository.findAllDominio('formaNumeracao').then(function(result) { | |
540 | + $scope.formaNumeracaoList = result; | |
541 | + }); | |
542 | + | |
539 | 543 | $scope.findAutoCompleteTemplatePadrao = function(value){ |
540 | 544 | return TemplatePadraoRepository.findAutoComplete('nome',value).then(function(result) { |
541 | 545 | return result; | ... | ... |
cit-ecm-web/src/main/webapp/html/historicoAlteracaoProcesso/historicoAlteracaoProcesso.html
1 | -<div id="widget-historico" class="widget-box margin-bottom" ng-controller="HistoricoAlteracaoProcessoController" | |
2 | - ng-show="numeroHistoricos > 0"> | |
1 | +<div id="widget-historico" class="widget-box margin-bottom" ng-controller="HistoricoAlteracaoProcessoController" ng-show="numeroHistoricos > 0"> | |
3 | 2 | <div class="widget-header"> |
4 | 3 | <h2 class="widget-title"> |
5 | 4 | <translate>ECM.LABEL.HISTORICO_ALTERACAO_PROCESSO</translate> |
6 | 5 | </h2> |
6 | + <div class="col-sm-9 text-right"> | |
7 | + <button class="btn btn-clear" title="{{$translate.instant('LABEL.ATUALIZAR')}}" alt="{{$translate.instant('LABEL.ATUALIZAR')}}" ng-click="closeWidget()"> | |
8 | + <i class="fa fa-refresh purple"></i> | |
9 | + <translate>LABEL.ATUALIZAR</translate> | |
10 | + </button> | |
11 | + </div> | |
12 | + | |
7 | 13 | </div> |
8 | 14 | <div class="widget-body"> |
9 | 15 | <div class="widget-main clearfix"> |
... | ... | @@ -19,22 +25,34 @@ |
19 | 25 | <div class="timeline-item"> |
20 | 26 | <div class="timeline-item-icon" tooltip="{{item.nomeUsuario}}"> |
21 | 27 | <i class="fa fa-user"></i> |
22 | - </div> <!-- .timeline-item-icon --> | |
28 | + </div> | |
29 | + <!-- .timeline-item-icon --> | |
23 | 30 | |
24 | 31 | <div class=" body"> |
25 | - | |
32 | + | |
26 | 33 | <div class="row timeline-item-text"> |
27 | - <div class="col-sm-9" style = "word-wrap: break-word;"> | |
28 | - <div class="row"> <div class="col-sm-12 name" >{{item.nomeUsuario}}</div> </div> | |
29 | - <div class="row"><div class="col-sm-12" >{{item.descricaoAcao}}</div></div> | |
34 | + <div class="col-sm-9" style="word-wrap: break-word;"> | |
35 | + <div class="row"> | |
36 | + <div class="col-sm-12 name">{{item.nomeUsuario}}</div> | |
37 | + </div> | |
38 | + <div class="row"> | |
39 | + <div class="col-sm-12">{{item.descricaoAcao}}</div> | |
40 | + </div> | |
30 | 41 | </div> |
31 | - | |
42 | + | |
32 | 43 | <div class="col-sm-3" style="text-align: end; word-wrap: break-word"> |
33 | - <div class="row"><div class="col-sm-12">{{item.dataRegistro | date : 'dd/MM/yyyy HH:mm:ss'}}</div></div> | |
34 | - <div class="row"> <div class="col-sm-12" ><translate>LABEL.UNIDADE</translate>: {{item.nomeUnidadeVigente}}</div></div> | |
44 | + <div class="row"> | |
45 | + <div class="col-sm-12">{{item.dataRegistro | date : 'dd/MM/yyyy HH:mm:ss'}}</div> | |
46 | + </div> | |
47 | + <div class="row"> | |
48 | + <div class="col-sm-12"> | |
49 | + <translate>LABEL.UNIDADE</translate> | |
50 | + : {{item.nomeUnidadeVigente}} | |
51 | + </div> | |
52 | + </div> | |
35 | 53 | </div> |
36 | 54 | </div> |
37 | - | |
55 | + | |
38 | 56 | </div> |
39 | 57 | </div> |
40 | 58 | </div> | ... | ... |
cit-ecm-web/src/main/webapp/html/tipoDocumento/tipoDocumentoEdit.html
... | ... | @@ -63,42 +63,34 @@ |
63 | 63 | |
64 | 64 | <div class="col-md-6"> |
65 | 65 | |
66 | - <label-input ng-id="tipoDocumento.nome" ng-label="LABEL.NOME" | |
67 | - ng-model="tipoDocumento.nome" form="tipoDocumentoForm" | |
68 | - ng-obrigatorio="true" ng-custom-maxlength="255" ng-type="text" | |
66 | + <label-input ng-id="tipoDocumento.nome" ng-label="LABEL.NOME" ng-model="tipoDocumento.nome" form="tipoDocumentoForm" ng-obrigatorio="true" ng-custom-maxlength="255" ng-type="text" | |
69 | 67 | ng-disabled="!edit" /> |
70 | 68 | |
71 | 69 | </div> |
72 | 70 | |
73 | 71 | <div class="col-md-6"> |
74 | - <label-select ng-id="tipoDocumento.formaCriacao" | |
75 | - ng-label="ECM.LABEL.FORMADECRIACAO" | |
76 | - ng-model="tipoDocumento.formaCriacao" form="tipoDocumentoForm" | |
77 | - ng-obrigatorio="true" ng-disabled="!edit" ng-obrigatorio="false" | |
78 | - ng-disabled="!edit" | |
79 | - ng-custom-options="dominio.originalElement as dominio.descricao for dominio" | |
80 | - track-by="track by dominio.id" ng-list="formaCriacaoList" /> | |
72 | + <label-select ng-id="tipoDocumento.formaCriacao" ng-label="ECM.LABEL.FORMADECRIACAO" ng-model="tipoDocumento.formaCriacao" form="tipoDocumentoForm" ng-obrigatorio="true" ng-disabled="!edit" | |
73 | + ng-obrigatorio="false" ng-disabled="!edit" ng-custom-options="dominio.originalElement as dominio.descricao for dominio" track-by="track by dominio.id" ng-list="formaCriacaoList" /> | |
81 | 74 | </div> |
82 | 75 | |
83 | 76 | </div> |
84 | 77 | |
85 | - <div class="row"> | |
78 | + <div class="row" ng-show='tipoDocumento.formaCriacao.codigo && tipoDocumento.formaCriacao.codigo != 2'> | |
86 | 79 | <div class="col-md-6"> |
80 | + <label-select ng-id="tipoDocumento.formaNumeracao" ng-label="ECM.LABEL.FORMA_NUMERACAO" ng-model="tipoDocumento.formaNumeracao" form="tipoDocumentoForm" ng-obrigatorio="tipoDocumento.formaCriacao.codigo != 2" ng-disabled="!edit" | |
81 | + ng-obrigatorio="false" ng-disabled="!edit" ng-custom-options="dominio.originalElement as dominio.descricao for dominio" track-by="track by dominio.id" ng-list="formaNumeracaoList" /> | |
82 | + </div> | |
87 | 83 | |
88 | - <label-text-area ng-id="tipoDocumento.descricao" | |
89 | - ng-label="LABEL.DESCRICAO" ng-model="tipoDocumento.descricao" | |
90 | - form="tipoDocumentoForm" ng-obrigatorio="false" | |
91 | - ng-custom-maxlength="255" ng-type="text" ng-disabled="!edit" /> | |
84 | + <div class="col-md-6"> | |
85 | + <auto-complete ng-id="tipoDocumento.templatePadrao" ng-label="ECM.LABEL.TEMPLATE" ng-model="tipoDocumento.templatePadrao" form="tipoDocumentoForm" | |
86 | + ng-obrigatorio="{{tipoDocumento.formaCriacao.codigo != 2}}" ng-disabled="!edit" ng-find="findAutoCompleteTemplatePadrao(value);" ng-item="item.nome" /> | |
92 | 87 | </div> |
93 | - <div class="col-md-6" | |
94 | - ng-show='tipoDocumento.formaCriacao.codigo && tipoDocumento.formaCriacao.codigo != 2'> | |
95 | - <auto-complete ng-id="tipoDocumento.templatePadrao" | |
96 | - ng-label="ECM.LABEL.TEMPLATE" | |
97 | - ng-model="tipoDocumento.templatePadrao" form="tipoDocumentoForm" | |
98 | - ng-obrigatorio="{{tipoDocumento.formaCriacao.codigo != 2}}" | |
99 | - ng-disabled="!edit" | |
100 | - ng-find="findAutoCompleteTemplatePadrao(value);" | |
101 | - ng-item="item.nome" /> | |
88 | + </div> | |
89 | + <div class="row"> | |
90 | + <div class="col-md-6"> | |
91 | + | |
92 | + <label-text-area ng-id="tipoDocumento.descricao" ng-label="LABEL.DESCRICAO" ng-model="tipoDocumento.descricao" form="tipoDocumentoForm" ng-obrigatorio="false" ng-custom-maxlength="255" | |
93 | + ng-type="text" ng-disabled="!edit" /> | |
102 | 94 | </div> |
103 | 95 | </div> |
104 | 96 | |
... | ... | @@ -111,23 +103,15 @@ |
111 | 103 | |
112 | 104 | <div class="row"> |
113 | 105 | <div class="col-sm-4"> |
114 | - <div ng-repeat='nivelAcesso in tipoNivelAcessoList' | |
115 | - class='radio-inline'> | |
116 | - <label-input-checkbox ng-model="nivelAcesso.checked" | |
117 | - ng-disabled="!edit || nivelAcesso.codigo == 2" | |
118 | - ng-custom-change='setNivelAcesso(nivelAcesso)' | |
119 | - ng-label="{{nivelAcesso.descricao}}"></label-input-checkbox> | |
106 | + <div ng-repeat='nivelAcesso in tipoNivelAcessoList' class='radio-inline'> | |
107 | + <label-input-checkbox ng-model="nivelAcesso.checked" ng-disabled="!edit || nivelAcesso.codigo == 2" ng-custom-change='setNivelAcesso(nivelAcesso)' ng-label="{{nivelAcesso.descricao}}"></label-input-checkbox> | |
120 | 108 | </div> |
121 | 109 | </div> |
122 | 110 | |
123 | - <div class="col-md-4" ng-show='isSigilo' | |
124 | - ng-class="{'has-error' : tipoDocumentoForm.$submitted && !isTipoSigiloSelecionado()}"> | |
111 | + <div class="col-md-4" ng-show='isSigilo' ng-class="{'has-error' : tipoDocumentoForm.$submitted && !isTipoSigiloSelecionado()}"> | |
125 | 112 | <div ng-repeat='sigilo in sigiloList' class='radio-inline'> |
126 | - <label class='label-switch'> <input type='checkbox' | |
127 | - name='sigilo.checked' ng-checked='sigilo.checked' | |
128 | - ng-model='sigilo.checked' form="tipoDocumentoForm" | |
129 | - ng-change='setSigilo(sigilo)' ng-disabled='!edit' /> | |
130 | - {{sigilo.tipoSigilo.descricao}} | |
113 | + <label class='label-switch'> <input type='checkbox' name='sigilo.checked' ng-checked='sigilo.checked' ng-model='sigilo.checked' form="tipoDocumentoForm" ng-change='setSigilo(sigilo)' | |
114 | + ng-disabled='!edit' /> {{sigilo.tipoSigilo.descricao}} | |
131 | 115 | </label> |
132 | 116 | </div> |
133 | 117 | </div> |
... | ... | @@ -144,10 +128,8 @@ |
144 | 128 | |
145 | 129 | <div class="row"> |
146 | 130 | <div class="col-md-6"> |
147 | - <auto-complete ng-id="assunto" ng-set-result="setAssunto(item)" | |
148 | - ng-label="LABEL.ASSUNTO" ng-model="assunto" | |
149 | - form="tipoDocumentoForm" ng-disabled="!edit" | |
150 | - ng-find="findAutoCompleteSugestao(value)" ng-item="item.assunto" /> | |
131 | + <auto-complete ng-id="assunto" ng-set-result="setAssunto(item)" ng-label="LABEL.ASSUNTO" ng-model="assunto" form="tipoDocumentoForm" ng-disabled="!edit" ng-find="findAutoCompleteSugestao(value)" | |
132 | + ng-item="item.assunto" /> | |
151 | 133 | </div> |
152 | 134 | </div> |
153 | 135 | |
... | ... | @@ -156,8 +138,7 @@ |
156 | 138 | <div class="panel panel-default"> |
157 | 139 | <div class="panel-heading clearfix" ng-show="edit"> |
158 | 140 | |
159 | - <button class="btn btn-clear" type="button" | |
160 | - ng-click="montaListaDelete()"> | |
141 | + <button class="btn btn-clear" type="button" ng-click="montaListaDelete()"> | |
161 | 142 | <i class="fa fa-times red"></i> |
162 | 143 | <translate>LABEL.REMOVER</translate> |
163 | 144 | </button> |
... | ... | @@ -168,25 +149,19 @@ |
168 | 149 | <table class="table table-bordered table-striped"> |
169 | 150 | <thead> |
170 | 151 | <tr> |
171 | - <th class="text-center" style="width: 5%;"><input | |
172 | - type="checkbox" ng-model="selectedAll" | |
173 | - ng-checked="selectedAll" ng-click="checkAll(selectedAll);" /></th> | |
152 | + <th class="text-center" style="width: 5%;"><input type="checkbox" ng-model="selectedAll" ng-checked="selectedAll" ng-click="checkAll(selectedAll);" /></th> | |
174 | 153 | <th style="width: 20%;"><translate>LABEL.CODIGO</translate></th> |
175 | 154 | <th style="width: 80%;"><translate>ECM.LABEL.ASSUNTO</translate></th> |
176 | 155 | </tr> |
177 | 156 | </thead> |
178 | 157 | <tbody> |
179 | - <tr | |
180 | - ng-repeat="tipoDocumentoPlanoClassificacao in tipoDocumento.tipoDocumentoPlanoClassificacoes"> | |
181 | - <td class="text-center"><input type="checkbox" | |
182 | - ng-click="verificaSelectedAll(tipoDocumentoPlanoClassificacao);" | |
183 | - ng-checked="tipoDocumentoPlanoClassificacao.$selected" | |
158 | + <tr ng-repeat="tipoDocumentoPlanoClassificacao in tipoDocumento.tipoDocumentoPlanoClassificacoes"> | |
159 | + <td class="text-center"><input type="checkbox" ng-click="verificaSelectedAll(tipoDocumentoPlanoClassificacao);" ng-checked="tipoDocumentoPlanoClassificacao.$selected" | |
184 | 160 | ng-model="tipoDocumentoPlanoClassificacao.$selected" /></td> |
185 | 161 | <td>{{tipoDocumentoPlanoClassificacao.planoClassificacao.codigo}}</td> |
186 | 162 | <td>{{tipoDocumentoPlanoClassificacao.planoClassificacao.assunto}}</td> |
187 | 163 | </tr> |
188 | - <tr | |
189 | - ng-hide="tipoDocumento.tipoDocumentoPlanoClassificacoes.length != 0"> | |
164 | + <tr ng-hide="tipoDocumento.tipoDocumentoPlanoClassificacoes.length != 0"> | |
190 | 165 | <td colspan="3"><translate>LABEL.TABELA_VAZIA</translate></td> |
191 | 166 | </tr> |
192 | 167 | ... | ... |