Download as
Browse Code »

Commit b8d3017bec06b4355dfa781c8f09d6d884aa4dbd

Authored by maycon.silva
2 parents 8290989f beb57d63
Exists in master

Merge remote-tracking branch 'remotes/origin/tarefa-3700-HOM' into desenvolvimento 

# Conflicts:
#	cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java
#	cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java
#	cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
#	cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js
#	cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js
Showing 18 changed files with 367 additions and 200 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/dao/ProcessoDao.java
  Diff comments   View file @b8d3017
... ... @@ -91,5 +91,34 @@ public interface ProcessoDao extends CitGenericDAO {
91 91 * @return
92 92 */
93 93 Boolean isProcessoAbertoEmOutrasUnidades(Processo processo);
  94 +
  95 + /**
  96 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  97 + *
  98 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  99 + *
  100 + * Método responsável por
  101 + *
  102 + * @author maycon.silva
  103 + *
  104 + * @param idProcessInstance
  105 + * @return
  106 + */
  107 + Processo getProcessoByIdProcessInstance(Long idProcessInstance);
  108 +
  109 +
  110 + /**
  111 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  112 + *
  113 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  114 + *
  115 + * Método responsável por
  116 + *
  117 + * @author maycon.silva
  118 + *
  119 + * @param nup
  120 + * @return
  121 + */
  122 + Processo getProcessoByProtocolo(String nup);
94 123  
95 124 }
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java
  Diff comments   View file @b8d3017
... ... @@ -83,7 +83,7 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD
83 83 return this.search(searchSeven);
84 84  
85 85 }
86   -
  86 +
87 87 /**
88 88 *
89 89 */
... ... @@ -98,25 +98,29 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD
98 98  
99 99 criteria.add(Restrictions.eq("id", processo.getId()));
100 100 criteria.add(Restrictions.ne("unidade.id", processo.getUnidade().getId()));
101   -
  101 +
102 102 Long quantidade = (Long) criteria.uniqueResult();
103   -
104   - if(quantidade > 0)
  103 +
  104 + if (quantidade > 0)
105 105 return Boolean.TRUE;
106   -
  106 +
107 107 return Boolean.FALSE;
108 108 }
109   -
  109 +
110 110 /**
111 111 *
112   - * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
113   - *
114   - * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
115   - *
  112 + * <p>
  113 + * <b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a>
  114 + * </p>
  115 + *
  116 + * <p>
  117 + * <b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a>
  118 + * </p>
  119 + *
116 120 * Método responsável por
117   - *
  121 + *
118 122 * @author andre.silva
119   - *
  123 + *
120 124 * @param idProcesso
121 125 * @param data
122 126 * @return
... ... @@ -130,12 +134,39 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD
130 134  
131 135 criteria.setProjection(Projections.rowCount());
132 136  
133   -
134 137 criteria.add(Restrictions.between("dataCriacao", dataInicial, dataFinal));
135 138  
136 139 return (Long) criteria.uniqueResult();
137 140 }
138   -
139 141  
  142 + /**
  143 + *
  144 + */
  145 + @Override
  146 + public Processo getProcessoByIdProcessInstance(Long idProcessInstance) {
  147 +
  148 + SearchSeven search = new SearchSeven(persistentClass);
  149 +
  150 + search.addFilterEqual("idProcessInstance", idProcessInstance);
  151 +
  152 + search(search, Processo.class);
  153 +
  154 + return searchUnique(search);
  155 + }
  156 +
  157 + /**
  158 + *
  159 + */
  160 + @Override
  161 + public Processo getProcessoByProtocolo(String nup) {
  162 +
  163 + SearchSeven search = new SearchSeven(persistentClass);
  164 +
  165 + search.addFilterEqual("nup", nup);
  166 +
  167 + search(search, Processo.class);
  168 +
  169 + return searchUnique(search);
  170 + }
140 171  
141 172 }
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java
  Diff comments   View file @b8d3017
... ... @@ -136,6 +136,7 @@ public class Processo extends PersistentObjectUnidade {
136 136 private String tipoAssunto;
137 137  
138 138 /** Atributo idProcessInstance. */
  139 + @JsonView({ Views.ProcessoList.class })
139 140 private Long idProcessInstance;
140 141  
141 142 /** Atributo nivelAcesso. */
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/service/ProcessoService.java
  Diff comments   View file @b8d3017
... ... @@ -4,6 +4,26 @@ import br.com.centralit.api.model.PlanoClassificacao;
4 4 import br.com.centralit.api.model.Processo;
5 5 import br.com.centralit.framework.service.arquitetura.GenericService;
6 6  
  7 +/**
  8 + * <p><img src="http://centralit.com.br/images/logo_central.png"></p>
  9 + *
  10 + * <p><b>Company: </b> Central IT - Governança Corporativa - </p>
  11 + *
  12 + * <p><b>Title: </b></p>
  13 + *
  14 + * <p><b>Description: </b></p>
  15 + *
  16 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  17 + *
  18 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  19 + *
  20 + * @since 28/03/2016 - 09:15:34
  21 + *
  22 + * @version 1.0.0
  23 + *
  24 + * @author maycon.silva
  25 + *
  26 + */
7 27 public interface ProcessoService extends GenericService<Processo, Long> {
8 28  
9 29 /**
... ... @@ -94,6 +114,35 @@ public interface ProcessoService extends GenericService&lt;Processo, Long&gt; {
94 114 */
95 115 Processo atualizarSigiloProcesso(Processo entity);
96 116  
  117 +
  118 + /**
  119 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  120 + *
  121 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  122 + *
  123 + * Método responsável por devolver o processoSigad passando como parametro o id da instancia do BPE
  124 + *
  125 + * @author maycon.silva
  126 + *
  127 + * @param idProcessInstance
  128 + * @return
  129 + */
  130 + Processo getProcessoByIdProcessInstance(Long idProcessInstance);
  131 +
  132 + /**
  133 + * <p><b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a></p>
  134 + *
  135 + * <p><b>Regra(s) de negócio:</b> <a href="LINK_PORTAL">NUMERO_REGRA_DE_NEGOCIO</a></p>
  136 + *
  137 + * Método responsável por
  138 + *
  139 + * @author maycon.silva
  140 + *
  141 + * @param nup
  142 + * @return
  143 + */
  144 + Processo getProcessoByProtocolo(String nup);
  145 +
97 146  
98 147  
99 148  
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/AnexoGedServiceImpl.java
  Diff comments   View file @b8d3017
... ... @@ -107,7 +107,7 @@ public class AnexoGedServiceImpl extends GenericServiceImpl&lt;AnexoGed, Long&gt; impl
107 107  
108 108 documentoGed.setConteudo(this.gedFileService.doOcr(anexo));
109 109  
110   -// solrService.addDocumento(documentoGed);
  110 + /*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
  Diff comments   View file @b8d3017
... ... @@ -139,6 +139,8 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl&lt;DocumentoGed, Lo
139 139  
140 140 private static final String ICON_PICTURE = "glyphicon glyphicon-picture fa-2x";
141 141  
  142 + private static final String ICON_PLAY = "fa fa-file-audio-o fa-2x";
  143 +
142 144 /**
143 145 * quantidade de documentos que podem ser incluídos.
144 146 */
... ... @@ -565,7 +567,7 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl&lt;DocumentoGed, Lo
565 567  
566 568 entity.setConteudo(this.decrypted(entity.getConteudoCriptografado()));
567 569  
568   -// this.saveSolr(entity);
  570 + // this.saveSolr(entity);
569 571  
570 572 try {
571 573 if (anexo != null) {
... ... @@ -944,6 +946,8 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl&lt;DocumentoGed, Lo
944 946  
945 947 return DocumentoGedServiceImpl.ICON_CODE;
946 948  
  949 + } else if (Dominio.TIPO_ANEXO_MP3_CODIGO.equals(tipoAnexo.getCodigo()) || Dominio.TIPO_ANEXO_WMA_CODIGO.equals(tipoAnexo.getCodigo()) || Dominio.TIPO_ANEXO_WAV_CODIGO.equals(tipoAnexo.getCodigo()) || Dominio.TIPO_ANEXO_AAC_CODIGO.equals(tipoAnexo.getCodigo()) || Dominio.TIPO_ANEXO_OGG_CODIGO.equals(tipoAnexo.getCodigo()) || Dominio.TIPO_ANEXO_M4A_CODIGO.equals(tipoAnexo.getCodigo()) || Dominio.TIPO_ANEXO_FLAC_CODIGO.equals(tipoAnexo.getCodigo())) {
  950 + return DocumentoGedServiceImpl.ICON_PLAY;
947 951 }
948 952  
949 953 return DocumentoGedServiceImpl.ICON_FILE_SEM_FORMATO;
... ...
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java
  Diff comments   View file @b8d3017
... ... @@ -36,6 +36,7 @@ import br.com.centralit.api.service.TemporalidadeService;
36 36 import br.com.centralit.api.service.UnidadeProcessoService;
37 37 import br.com.centralit.api.service.UnidadeService;
38 38 import br.com.centralit.framework.esi.enumerated.VariableTypeEnum;
  39 +import br.com.centralit.framework.esi.environment.EnvironmentOutput;
39 40 import br.com.centralit.framework.esi.environment.EnvironmentVariable;
40 41 import br.com.centralit.framework.exception.BusinessException;
41 42 import br.com.centralit.framework.exception.CodigoErro;
... ... @@ -143,13 +144,13 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl
143 144  
144 145 /* this.gerarCredenciais(processo); */
145 146  
146   - if (processo.getTipoProtocolo().getNome().equalsIgnoreCase("NUP_NOVO")) {
  147 + if (processo.getTipoProtocolo().getCodigo().equals(1L)) {
147 148 this.gerarNUP(processo);
148 149 }
149 150  
150 151 try {
151 152  
152   - // this.solrService.addProcesso(processo);
  153 + this.solrService.addProcesso(processo);
153 154 } catch (final Exception e) {
154 155  
155 156 e.printStackTrace();
... ... @@ -193,11 +194,11 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl
193 194 processo.setNivelAcesso(entity.getNivelAcesso());
194 195 processo.setAprovado(entity.getAprovado());
195 196  
  197 +
196 198 processo = super.merge(processo);
197 199  
198 200 documentoGedService.atualizarSigiloDocumentos(entity.getDocumentos());
199   -
200   -
  201 +
201 202 return processo;
202 203 }
203 204  
... ... @@ -290,7 +291,10 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl
290 291 throw new BusinessException("ECM.VALIDACAO.ERRO_VINCULO_FLUXO_BPE_ESI", CodigoErro.REGRA_NEGOCIO.getValue());
291 292 }
292 293  
293   - this.startBusinessProcess(processo.getTipoProcesso().getProcessoNegocio(), variaveis);
  294 + EnvironmentOutput environmentOutput = this.startBusinessProcess(processo.getTipoProcesso().getProcessoNegocio(), variaveis);
  295 +
  296 + processo.setIdProcessInstance(environmentOutput.getProcessInstanceId());
  297 +
294 298 }
295 299  
296 300 /**
... ... @@ -888,4 +892,25 @@ public class ProcessoServiceImpl extends GenericServiceImpl&lt;Processo, Long&gt; impl
888 892 }
889 893 }
890 894 }
  895 +
  896 + /**
  897 + *
  898 + */
  899 + @Override
  900 + public Processo getProcessoByIdProcessInstance(Long idProcessInstance) {
  901 +
  902 + // TODO Auto-generated method stub
  903 + return this.processoDao.getProcessoByIdProcessInstance(idProcessInstance);
  904 + }
  905 +
  906 + @Override
  907 + public Processo getProcessoByProtocolo(String nup) {
  908 +
  909 + // TODO Auto-generated method stub
  910 + return this.processoDao.getProcessoByProtocolo(nup);
  911 + }
  912 +
  913 +
  914 +
  915 +
891 916 }
... ...
cit-ecm-web/src/main/java/br/com/centralit/controller/ProcessoController.java
  Diff comments   View file @b8d3017
... ... @@ -63,6 +63,24 @@ public class ProcessoController extends GenericController&lt;Processo&gt; {
63 63 public ResponseBodyWrapper atualizarSigiloProcesso(@RequestBody Processo processo) throws Exception {
64 64  
65 65 ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.atualizarSigiloProcesso(processo), GenericView.class);
  66 +
  67 + return responseBody;
  68 + }
  69 +
  70 + @RequestMapping(method = RequestMethod.GET, value = "/getProcessoByIdProcessInstance")
  71 + @ResponseBody
  72 + public ResponseBodyWrapper getProcessoByIdProcessInstance(@RequestParam(value = "idProcessInstance") Long idProcessInstance) {
  73 +
  74 + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoByIdProcessInstance(idProcessInstance), this.getListView());
  75 +
  76 + return responseBody;
  77 + }
  78 +
  79 + @RequestMapping(method = RequestMethod.GET, value = "/getProcessoByProtocolo")
  80 + @ResponseBody
  81 + public ResponseBodyWrapper getProcessoByProtocolo(@RequestParam(value = "nup") String nup) {
  82 +
  83 + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.processoService.getProcessoByProtocolo(nup), this.getListView());
66 84  
67 85 return responseBody;
68 86 }
... ...
cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
  Diff comments   View file @b8d3017
... ... @@ -194,8 +194,8 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen
194 194 list.add(new Dominio("tipoFormaCriacao", "Anexo", "ANEXO", 2L));
195 195 list.add(new Dominio("tipoFormaCriacao", "Ambos", "AMBOS", 3L));
196 196  
197   - list.add(new Dominio("tipoProtocoloNup", "Automático", "EXTERNO", 1L, Boolean.FALSE));
198   - list.add(new Dominio("tipoProtocoloNup", "Informado", "NUP_NOVO", 2L, Boolean.FALSE));
  197 + list.add(new Dominio("tipoProtocoloNup", "Automático", "NUP_NOVO", 1L, Boolean.FALSE));
  198 + list.add(new Dominio("tipoProtocoloNup", "Informado", "EXTERNO", 2L, Boolean.FALSE));
199 199  
200 200 this.dominioService.saveListIfNotExist(list);
201 201  
... ... @@ -376,7 +376,8 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen
376 376 internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.NUM_DOCUMENTO", "Número Documento", dominio, modulo));
377 377 internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.RENUNCIAR_CREDENCIAL", "Renunciar credencial", dominio, modulo));
378 378 internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.APROVAR", "Aprovar", dominio, modulo));
379   -
  379 + internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.AVANCAR_FLUXO", "Avançar no Fluxo", dominio, modulo));
  380 + internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.JUSTIFICATIVA_CANCELAMENTO", "Justificativa Cancelado", dominio, modulo));
380 381 }
381 382  
382 383 /**
... ...
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/DocumentoGedController.js
  Diff comments   View file @b8d3017
... ... @@ -633,5 +633,12 @@ citApp.controller(&#39;DocumentoGedController&#39;, [&#39;$scope&#39;, &#39;DocumentoGedRepository&#39;,
633 633 });
634 634  
635 635 };
  636 +
  637 + $scope.downloadArquivo = function(idDocumento){
  638 + href = "/cit-ecm-web/rest/anexoGed/visualizar?idAnexo="+idDocumento;
  639 +
  640 + $window.location.href = (href);
  641 +
  642 + }
636 643  
637 644 }]);
... ...
cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/ProcessoRepository.js
  Diff comments   View file @b8d3017
... ... @@ -13,9 +13,19 @@ citApp.factory(&#39;ProcessoRepository&#39;, [&#39;RestangularEcm&#39;, &#39;AbstractRepository&#39;, fu
13 13 return restangularEcm.one(this.route + "/concluir").get(paramsGet);
14 14 };
15 15  
  16 +
16 17 this.atualizarSigiloProcesso = function(paramsGet) {
17 18 return restangularEcm.all(this.route + '/atualizarSigiloProcesso').post(paramsGet);
18 19 };
  20 +
  21 + this.getProcessoByIdProcessInstance = function (idProcessInstance){
  22 + return restangularEcm.one(this.route + '/getProcessoByIdProcessInstance').get({"idProcessInstance": idProcessInstance}).then();
  23 + };
  24 +
  25 + this.getProcessoByProtocolo = function (nup){
  26 + return restangularEcm.one(this.route + '/getProcessoByProtocolo').get({"nup": nup}).then();
  27 +
  28 + };
19 29 }
20 30  
21 31 AbstractRepository.extend(ProcessoRepository);
... ...
cit-ecm-web/src/main/webapp/html/documentoGed/documentoAnexoVisualizacao.html
  Diff comments   View file @b8d3017
... ... @@ -16,14 +16,6 @@
16 16 <div collapse="widgetAnexoIsCollapsed" class="widget-body">
17 17 <div class="widget-main clearfix">
18 18 <div id="anexoGed" class="page-content clearfix">
19   - <div class="row">
20   - <div class="col-md-4">
21   - <div class="form-group">
22   - <label class='control-label'><translate>ECM.LABEL.DATA_REFERENCIA</translate></label>
23   - <label>{{documentoGed.dataReferencia | date:'dd-MM-yyyy'}}</label>
24   - </div>
25   - </div>
26   - </div>
27 19 <div class="row" ng-show='documentoGed.anexo.id && !edit'>
28 20 <div class="col-sm-6">
29 21 <strong><label>{{ documentoGed.anexo.descricao}}</label></strong>
... ...
cit-ecm-web/src/main/webapp/html/documentoGed/documentoGedEdit.html
  Diff comments   View file @b8d3017
1 1  
2 2 <div ng-controller="DocumentoGedController as documentoGedController">
3 3 <form name="documentoGedController.documentoGedForm" novalidate autocomplete="off">
4   -
  4 +
5 5 <div ng-if="!edit">
6 6 <div ng-include src="'/cit-ecm-web/html/documentoGed/documentoAnexoVisualizacao.html'" />
7 7  
... ...
cit-ecm-web/src/main/webapp/html/documentoGed/metadadosDocumentoEdit.html
  Diff comments   View file @b8d3017
... ... @@ -5,9 +5,8 @@
5 5 </h2>
6 6  
7 7 <div class="widget-toolbar">
8   - <a href="#void" ng-click="widgetDocumentoIsCollapsed = !widgetDocumentoIsCollapsed">
9   - <i class="fa" ng-class="{'fa-chevron-up': !widgetDocumentoIsCollapsed, 'fa-chevron-down': widgetDocumentoIsCollapsed}"></i></a>
10   - <a href="#void" ng-click="closeWidget('widget-processo')"> <i class="fa fa-close"></i></a>
  8 + <a href="#void" ng-click="widgetDocumentoIsCollapsed = !widgetDocumentoIsCollapsed"> <i class="fa"
  9 + ng-class="{'fa-chevron-up': !widgetDocumentoIsCollapsed, 'fa-chevron-down': widgetDocumentoIsCollapsed}"></i></a> <a href="#void" ng-click="closeWidget('widget-processo')"> <i class="fa fa-close"></i></a>
11 10 </div>
12 11 </div>
13 12 <div id="metadadosDocumentoGedCollapsed" collapse="widgetDocumentoIsCollapsed" class="widget-body">
... ... @@ -36,12 +35,8 @@
36 35  
37 36 </div>
38 37 </div>
39   -
  38 +
40 39 <div class="row">
41   - <div class="col-md-4">
42   - <label-input ng-id="documentoGed.numero" ng-label="LABEL.NUMERO" ng-type="numerico" ng-model="documentoGed.numero" form="documentoGedForm" ng-obrigatorio="documentoGed.formaCriacao.codigo == 2"
43   - ng-custom-maxlength="255" ng-type="text" ng-disabled="!edit || documentoGed.formaCriacao.codigo == 1" />
44   - </div>
45 40  
46 41 <div class="col-md-8">
47 42 <auto-complete ng-id="documentoGed.tipoDocumento" ng-set-result="construirRelacionamento(item)" ng-label="ECM.LABEL.TIPODOCUMENTO" ng-model="documentoGed.tipoDocumento" form="documentoGedForm"
... ... @@ -52,6 +47,22 @@
52 47 </div>
53 48  
54 49 <div class="row">
  50 + <div class="col-md-4">
  51 + <label-input ng-id="documentoGed.numero" ng-label="LABEL.NUMERO" ng-type="numerico" ng-model="documentoGed.numero" form="documentoGedForm" ng-obrigatorio="documentoGed.formaCriacao.codigo == 2"
  52 + ng-custom-maxlength="255" ng-type="text" ng-disabled="!edit || documentoGed.formaCriacao.codigo == 1" />
  53 + </div>
  54 +
  55 + <div class="row" ng-show='documentoGed.formaCriacao.codigo == 2'>
  56 + <div class="col-md-4">
  57 + <label-input-data ng-id="documentoGed.dataReferencia" form="documentoGedForm" ng-label="ECM.LABEL.DATA_REFERENCIA" ng-obrigatorio="documentoGed.formaCriacao.codigo == 2" ng-disabled="!edit"
  58 + ng-model="documentoGed.dataReferencia" />
  59 + </div>
  60 + </div>
  61 + </div>
  62 +
  63 +
  64 +
  65 + <div class="row">
55 66  
56 67 <div class="col-md-4">
57 68 <label-select ng-id="documentoGed.status" ng-model="documentoGed.status" ng-label="ECM.LABEL.STATUS" ng-obrigatorio='true' form="documentoGedForm" ng-list="statusList"
... ... @@ -153,7 +164,8 @@
153 164 <div class="row">
154 165  
155 166 <div class="col-md-10">
156   - <auto-complete ng-id="interessado" ng-label="ECM.LABEL.INTERESSADO" ng-disabled="!edit" form='documentoGedForm' ng-model="interessado" ng-find="findAutoCompleteInteressados(value)" ng-item="item.nome" ng-set-result="setInteressados(item)" />
  167 + <auto-complete ng-id="interessado" ng-label="ECM.LABEL.INTERESSADO" ng-disabled="!edit" form='documentoGedForm' ng-model="interessado" ng-find="findAutoCompleteInteressados(value)"
  168 + ng-item="item.nome" ng-set-result="setInteressados(item)" />
157 169 </div>
158 170  
159 171 <div class="col-md-12">
... ... @@ -176,9 +188,8 @@
176 188 </thead>
177 189 <tbody>
178 190 <tr ng-repeat="interessado in documentoGed.interessados">
179   - <td class="text-center">
180   - <input type="radio" name="interessadoChecked" id="interessadoChecked" ng-value="interessado" ng-model="$parent.interessadoChecked" ng-click="setInteressadoRemocao(interessado, $index)" />
181   - </td>
  191 + <td class="text-center"><input type="radio" name="interessadoChecked" id="interessadoChecked" ng-value="interessado" ng-model="$parent.interessadoChecked"
  192 + ng-click="setInteressadoRemocao(interessado, $index)" /></td>
182 193  
183 194 <td class="text-center">{{interessado.interessado.nome}}</td>
184 195  
... ... @@ -219,13 +230,6 @@
219 230 </label>
220 231 </legend>
221 232  
222   - <div class="row">
223   - <div class="col-md-6">
224   - <label-input-data ng-id="documentoGed.dataReferencia" form="documentoGedForm" ng-label="ECM.LABEL.DATA_REFERENCIA" ng-obrigatorio="documentoGed.formaCriacao.codigo == 2" ng-disabled="!edit"
225   - ng-model="documentoGed.dataReferencia" />
226   - </div>
227   - </div>
228   -
229 233 <div class="row" style="padding: 0px 12px 0px 12px !important;" ng-show='uploader.queue < 1 && !documentoGed.anexo.id'>
230 234 <div nv-file-drop="" uploader="uploader" id="actionUploadArquivos" onclick="$('#uploadArquivos').click();">
231 235 <div nv-file-over="" uploader="uploader" over-class="another-file-over-class" class="well my-drop-zone">
... ...
cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeAcaoProcesso.html
  Diff comments   View file @b8d3017
1   -
2   - <div ng-include src="'/cit-ecm-web/html/processoRelacionado/processoRelacionadoEdit.html'" ng-if="isProcessoRelacionado" />
3 1  
4   - <div ng-include src="'/cit-ecm-web/html/documentoGed/documentoGedEdit.html'" ng-show="isDocumentoEdit" />
  2 +<div ng-include src="'/cit-ecm-web/html/processoRelacionado/processoRelacionadoEdit.html'" ng-show="isProcessoRelacionado" />
5 3  
6   - <div ng-include src="'/cit-ecm-web/html/grupoProcesso/enviarProcesso.html'" ng-if="isEnviarProcesso" />
  4 +<div ng-include src="'/cit-ecm-web/html/documentoGed/documentoGedEdit.html'" ng-show="isDocumentoEdit" />
7 5  
8   - <div ng-include src="'/cit-ecm-web/html/anexarProcesso/anexarProcesso.html'" ng-if="isAnexarProcesso" />
  6 +<div ng-include src="'/cit-ecm-web/html/grupoProcesso/enviarProcesso.html'" ng-show="isEnviarProcesso" />
9 7  
10   - <div ng-include src="'/cit-ecm-web/html/versaoDocumentoGed/versaoDocumentoGedList.html'" ng-if="isVersoesDocumento" />
  8 +<div ng-include src="'/cit-ecm-web/html/anexarProcesso/anexarProcesso.html'" ng-show="isAnexarProcesso" />
11 9  
12   - <div ng-include src="'/cit-ecm-web/html/historicoAlteracaoProcesso/historicoAlteracaoProcesso.html'" ng-show="isHistoricoProcesso" />
  10 +<div ng-include src="'/cit-ecm-web/html/versaoDocumentoGed/versaoDocumentoGedList.html'" ng-show="isVersoesDocumento" />
13 11  
14   - <div ng-include src="'/cit-ecm-web/html/documentoGed/cancelarDocumento.html'" ng-if="isCancelarDocumento" />
  12 +<div ng-include src="'/cit-ecm-web/html/historicoAlteracaoProcesso/historicoAlteracaoProcesso.html'" ng-show="isHistoricoProcesso" />
15 13  
16   - <div ng-include src="'/cit-ecm-web/html/justificativaProcesso/justificativaAcaoProcesso.html'" ng-if="isJustificativaAcaoProcesso" />
  14 +<div ng-include src="'/cit-ecm-web/html/documentoGed/cancelarDocumento.html'" ng-show="isCancelarDocumento" />
17 15  
18   - <div ng-include src="'/cit-ecm-web/html/justificativaProcesso/justificativaAcaoProcessoList.html'" ng-if="isHistoricoJustificativa" />
19   -
20   - <div ng-include src="'/cit-ecm-web/html/credencialProcesso/credencialProcesso.html'" ng-show="isGerenciarCredencialProcesso" />
  16 +<div ng-include src="'/cit-ecm-web/html/justificativaProcesso/justificativaAcaoProcesso.html'" ng-show="isJustificativaAcaoProcesso" />
21 17  
22   - <div ng-include src="'/cit-ecm-web/html/classificarProcessoDocumento/classificarProcessoDocumento.html'" ng-if="isClassificarProcessoDocumento" />
  18 +<div ng-include src="'/cit-ecm-web/html/justificativaProcesso/justificativaAcaoProcessoList.html'" ng-show="isHistoricoJustificativa" />
23 19  
24   -
  20 +<div ng-include src="'/cit-ecm-web/html/credencialProcesso/credencialProcesso.html'" ng-show="isGerenciarCredencialProcesso" />
25 21  
26   - <div id="widget-processo" ng-show="isProcessoEdit" class="widget-box margin-bottom">
27   - <div class="widget-header">
28   - <h2 class="widget-title">
29   - <translate>ECM.LABEL.PROCESSO</translate>
30   - </h2>
  22 +<div ng-include src="'/cit-ecm-web/html/classificarProcessoDocumento/classificarProcessoDocumento.html'" ng-show="isClassificarProcessoDocumento" />
31 23  
32   - <div class="widget-toolbar">
33   - <a href="#void" ng-click="closeWidget('widget-processo')"> <i class="fa fa-close"></i>
34   - </a>
35   - </div>
36   - </div>
37   - <div class="widget-body">
38   - <div class="widget-main clearfix">
39   - <div ng-include src="'/cit-ecm-web/html/processo/processoEdit.html'" />
40   - </div>
41   - </div>
42 24  
43   - <div class="row">
44   - <div style="margin-top: -38px; margin-left: 17px;" class="col-md-12">
45   - <button class="btn btn-sm btn-primary" ng-click="saveOrUpdateProcessoECM()" ng-show="true">
46   - <translate>LABEL.SALVAR</translate>
47   - </button>
48 25  
49   - <button class="btn btn-sm btn-primary" ng-click="closeWidget('widget-processo')" ng-show="true">
50   - <translate>LABEL.CANCELAR</translate>
51   - </button>
52   - </div>
53   - </div>
54   - </div>
55 26 \ No newline at end of file
  27 +<div id="widget-processo" ng-show="isProcessoEdit" class="widget-box margin-bottom">
  28 + <div class="widget-header">
  29 + <h2 class="widget-title">
  30 + <translate>ECM.LABEL.PROCESSO</translate>
  31 + </h2>
  32 +
  33 + <div class="widget-toolbar">
  34 + <a href="#void" ng-click="closeWidget('widget-processo')"> <i class="fa fa-close"></i>
  35 + </a>
  36 + </div>
  37 + </div>
  38 + <div class="widget-body">
  39 + <div class="widget-main clearfix">
  40 + <div ng-include src="'/cit-ecm-web/html/processo/processoEdit.html'" />
  41 + </div>
  42 + </div>
  43 +
  44 + <div class="row">
  45 + <div style="margin-top: -38px; margin-left: 17px;" class="col-md-12">
  46 + <button class="btn btn-sm btn-primary" ng-click="saveOrUpdateProcessoECM()" ng-show="true">
  47 + <translate>LABEL.SALVAR</translate>
  48 + </button>
  49 +
  50 + <button class="btn btn-sm btn-primary" ng-click="closeWidget('widget-processo')" ng-show="true">
  51 + <translate>LABEL.CANCELAR</translate>
  52 + </button>
  53 + </div>
  54 + </div>
  55 +</div>
56 56 \ No newline at end of file
... ...
cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeCabecalhoGerenciarProcesso.html
  Diff comments   View file @b8d3017
1 1  
2   - <button ng-show="task.flowElement.actions && task.flowElement.actions.length == 1" title="{{$translate.instant('ESI.EXECUCAO_TAREFA.GRAVAR_TAREFA_AVANCAR')}}"
3   - alt="{{$translate.instant('ESI.EXECUCAO_TAREFA.GRAVAR_TAREFA_AVANCAR')}}" class="btn btn-clear" ng-click="executarProcesso(task.flowElement.actions[0])">
  2 +<button ng-show="task.flowElement.actions && task.flowElement.actions.length == 1" title="{{$translate.instant('ESI.EXECUCAO_TAREFA.GRAVAR_TAREFA_AVANCAR')}}"
  3 + alt="{{$translate.instant('ESI.EXECUCAO_TAREFA.GRAVAR_TAREFA_AVANCAR')}}" class="btn btn-clear" ng-click="executarProcesso(task.flowElement.actions[0])">
  4 + <i class="fa fa-play-circle green"></i>
  5 + <translate>ECM.LABEL.AVANCAR_FLUXO</translate>
  6 +</button>
  7 +
  8 +<div class="btn-group dropdown" role="group" dropdown ng-show=" task.flowElement.actions && task.flowElement.actions.length > 1">
  9 + <button type="button" class="btn btn-clear" dropdown-toggle>
4 10 <i class="fa fa-play-circle green"></i>
5   - <translate>LABEL.AVANCAR_FLUXO</translate>
  11 + <translate>ECM.LABEL.AVANCAR_FLUXO</translate>
  12 + <span class="fa fa-caret-down icon-on-right"></span>
6 13 </button>
7 14  
8   - <div class="btn-group dropdown" role="group" dropdown ng-show=" task.flowElement.actions && task.flowElement.actions.length > 1">
9   - <button type="button" class="btn btn-clear" dropdown-toggle>
10   - <i class="fa fa-play-circle green"></i>
11   - <translate>LABEL.AVANCAR_FLUXO</translate>
12   - <span class="fa fa-caret-down icon-on-right"></span>
13   - </button>
  15 + <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu" ng-repeat="action in task.flowElement.actions">
  16 + <li ng-repeat="action in task.flowElement.actions"><a href="javascript: return false;" ng-click='executarProcesso(action);'><i class="fa fa-circle"> <translate>{{action.name}}</translate></i></a>
  17 + </li>
14 18  
15   - <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu" ng-repeat="action in task.flowElement.actions">
16   - <li ng-repeat="action in task.flowElement.actions"><a href="javascript: return false;" ng-click='executarProcesso(action);'><i class="fa fa-circle"> <translate>{{action.name}}</translate></i></a>
17   - </li>
  19 + </ul>
  20 +</div>
18 21  
19   - </ul>
20   - </div>
  22 +<span class="divider-vertical"></span>
21 23  
22   - <span class="divider-vertical"></span>
  24 +<button type="button" class="btn btn-clear" ng-click="novoProcesso();">
  25 + <i class="fa fa-plus-circle yellow-dark"></i>
  26 + <translate>ECM.LABEL.NOVOPROCESSO</translate>
  27 +</button>
23 28  
24   - <button type="button" class="btn btn-clear" ng-click="novoProcesso();">
25   - <i class="fa fa-plus-circle yellow-dark"></i>
26   - <translate>ECM.LABEL.NOVOPROCESSO</translate>
27   - </button>
  29 +<button type="button" class="btn btn-clear" ng-click="editProcessoECM()">
  30 + <i class="fa fa-pencil blue"></i>
  31 + <translate>LABEL.EDITAR</translate>
  32 +</button>
28 33  
29   - <button type="button" class="btn btn-clear" ng-click="editProcessoECM()">
30   - <i class="fa fa-pencil blue"></i>
31   - <translate>LABEL.EDITAR</translate>
32   - </button>
  34 +<button type="button" class="btn btn-clear" ng-click="concluir()">
  35 + <i class="ace-icon fa fa-check green"></i>
  36 + <translate>ECM.LABEL.CONCLUIR</translate>
  37 +</button>
33 38  
34   - <button type="button" class="btn btn-clear" ng-click="concluir()">
35   - <i class="ace-icon fa fa-check green"></i>
36   - <translate>ECM.LABEL.CONCLUIR</translate>
37   - </button>
38 39  
  40 +<button type="button" class="btn btn-clear" ng-click="newDocument()">
  41 + <i class="fa fa-book blue"></i>
  42 + <translate>ECM.LABEL.INCLUIRDOCUMENTO</translate>
  43 +</button>
  44 +
  45 +<span class="divider-vertical"></span>
39 46  
40   - <button type="button" class="btn btn-clear" ng-click="newDocument()">
41   - <i class="fa fa-book blue"></i>
42   - <translate>ECM.LABEL.INCLUIRDOCUMENTO</translate>
  47 +<div class="btn-group dropdown" role="group" dropdown>
  48 + <button type="button" class="btn btn-clear" dropdown-toggle>
  49 + <i class="fa fa-list"></i>
  50 + <translate>ECM.LABEL.ACAODEPROCESSO</translate>
  51 + <span class="fa fa-caret-down icon-on-right"></span>
43 52 </button>
44 53  
45   - <span class="divider-vertical"></span>
46   -
47   - <div class="btn-group dropdown" role="group" dropdown>
48   - <button type="button" class="btn btn-clear" dropdown-toggle>
49   - <i class="fa fa-list"></i>
50   - <translate>ECM.LABEL.ACAODEPROCESSO</translate>
51   - <span class="fa fa-caret-down icon-on-right"></span>
52   - </button>
53   -
54   - <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu">
55   - <li><a href="#void" ng-click="editProcessoRelacionado();"><i class="fa fa-link"></i>
56   - <translate>ECM.LABEL.PROCESSORELACIONADOS</translate></a></li>
57   - <li><a href="#void" ng-click='enviarProcesso();'><i class="fa fa-share-square-o">&nbsp </i>
58   - <translate>ECM.LABEL.ENVIAR_PROCESSO</translate> </a></li>
59   - <li><a href="#void" ng-click='anexarProcesso();'><i class="fa fa-paperclip">&nbsp </i>
60   - <translate>ECM.LABEL.ANEXAR_ESTE_PROCESSO</translate> </a></li>
61   - <li><a href="#void;" ng-click='gerenciarCredenciaisProcesso();'><i class="fa fa-user-plus">&nbsp </i>
62   - <translate>ECM.LABEL.GERENCIAR_CREDENCIAIS_ACESSO</translate> </a></li>
63   - <li><a href="javascript: return false;" ng-click='exibirDialogConfirmacaoRemoverCredencial()' ng-if="credencialUsuarioProcesso.id"><i class="fa fa-user-plus">&nbsp </i>
64   - <translate>ECM.LABEL.RENUNCIAR_CREDENCIAL</translate> </a></li>
65   - <li><a href="#void" ng-click='classificarDocumentoProceso();'><i class="fa fa fa-eye">&nbsp </i>
66   - <translate>ECM.LABEL.VALIDAR_NIVEL_ACESSO</translate> </a></li>
67   -
68   -
69   - <!-- <li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.ENVIARCORRESPONDENCIA</translate></a></li>
  54 + <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu">
  55 + <li><a href="#void" ng-click="editProcessoRelacionado();"><i class="fa fa-link"></i> <translate>ECM.LABEL.PROCESSORELACIONADOS</translate></a></li>
  56 + <li><a href="#void" ng-click='enviarProcesso();'><i class="fa fa-share-square-o">&nbsp </i> <translate>ECM.LABEL.ENVIAR_PROCESSO</translate> </a></li>
  57 + <li><a href="#void" ng-click='anexarProcesso();'><i class="fa fa-paperclip">&nbsp </i> <translate>ECM.LABEL.ANEXAR_ESTE_PROCESSO</translate> </a></li>
  58 + <li><a href="#void;" ng-click='gerenciarCredenciaisProcesso();'><i class="fa fa-user-plus">&nbsp </i> <translate>ECM.LABEL.GERENCIAR_CREDENCIAIS_ACESSO</translate> </a></li>
  59 + <li><a href="javascript: return false;" ng-click='exibirDialogConfirmacaoRemoverCredencial()' ng-if="credencialUsuarioProcesso.id"><i class="fa fa-user-plus">&nbsp </i> <translate>ECM.LABEL.RENUNCIAR_CREDENCIAL</translate>
  60 + </a></li>
  61 + <li><a href="#void" ng-click='classificarDocumentoProceso();'><i class="fa fa fa-eye">&nbsp </i> <translate>ECM.LABEL.VALIDAR_NIVEL_ACESSO</translate> </a></li>
  62 +
  63 +
  64 + <!--<li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.ENVIARCORRESPONDENCIA</translate></a></li>
70 65 <li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.CIENCIA</translate></a></li>
71 66 <li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.DUPLICARPROCESSO</translate></a></li> </a></li>
72 67 <li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.GERENCIARDISPONIBILIZACAOACESSOEXTERNO</translate></a></li>
73 68 <li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.ACOMPANHAMENTOESPECIAL</translate> </a></li>
74 69 <li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.ANEXARPROCESSO</translate> </a></li>
75 70 <li><a href="#void"><i class="fa fa-file-o"></i> <translate>LABEL.GERARARQUIVOPROCESSO</translate></a></li> -->
76   - </ul>
77   - </div>
78   -
  71 + </ul>
  72 +</div>
  73 +
79 74  
... ...
cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeDocumentosProcesso.html
  Diff comments   View file @b8d3017
1 1 <div class="itemdiv commentdiv" ng-repeat="documento in processo.documentos | orderBy:'-dataCriacao'">
2 2  
3   - <div class="user">
4   - <i class="{{documento.icon}}" title="{{documento.anexo.dominioTipoAnexo.descricao}}"></i>
  3 + <div class="user">
  4 + <i class="{{documento.icon}}" title="{{documento.anexo.dominioTipoAnexo.descricao}}"></i>
  5 + </div>
  6 +
  7 + <div class="body">
  8 + <div class="text ellipsis" tooltip="{{documento.tipoDocumento.nome}} - {{documento.numero}}">
  9 + <a ng-show='!documento.cancelado' href="#void" ng-click="editDocument(documento, false)">{{documento.tipoDocumento.nome}} - {{documento.numero}}</a> <a ng-show='documento.cancelado' href="#void"
  10 + ng-click="getCancelamentoDocumento(documento);"> {{documento.tipoDocumento.nome}} - {{documento.numero}}</a>
5 11 </div>
6 12  
7   - <div class="body">
8   - <div class="text ellipsis" tooltip="{{documento.tipoDocumento.nome}} - {{documento.numero}}">
9   - <a ng-show='!documento.cancelado' href="#void" ng-click="editDocument(documento, false)">{{documento.tipoDocumento.nome}} - {{documento.numero}}</a>
10   - <a ng-show='documento.cancelado' href="#void" ng-click="getCancelamentoDocumento(documento);"> {{documento.tipoDocumento.nome}} - {{documento.numero}}</a>
11   - </div>
12   -
13   - <div class="time hidden-md">
14   - <i class="ace-icon fa fa-clock-o"></i> <span class="blue">{{documento.dataCriacao | date: 'dd/MM/yyyy HH:mm:ss'}} </span>
15   - </div>
16   -
17   - <div class="text ellipsis" tooltip="{{documento.assuntoComplementar}}">{{documento.assuntoComplementar}} </div>
18   -
19   - <div class="itemdiv-informacoes" >
20   - <span class="label label-gray" ng-show="documento.sigilo.tipoSigilo.codigo == 0 ">{{documento.sigilo.tipoSigilo.descricao}}</span>
21   - <span class="label label-danger" ng-show="documento.sigilo.tipoSigilo.codigo == 1 ">{{documento.sigilo.tipoSigilo.descricao}}</span>
22   - <span class="label label-black" ng-show="documento.sigilo.tipoSigilo.codigo == 2 ">{{documento.sigilo.tipoSigilo.descricao}}</span>
23   - <span class="label label-warning" ng-show="documento.nivelAcesso.nivelAcesso.codigo == 1">{{documento.nivelAcesso.nivelAcesso.descricao}}</span>
24   - <span class="label label-success" ng-show="documento.nivelAcesso.nivelAcesso.codigo == 2">{{documento.nivelAcesso.nivelAcesso.descricao}}</span>
25   - <span class="label label-info" ng-show="documento.origem">Anexado</span> <span class="label label-info" ng-show="false">Assinado</span>
26   - <span class="label label-success" ng-show="false">Habilitado</span> <span class="label label-warning" ng-show="false">Ci&#xEA;ncia</span>
27   - <span class="label label-danger" ng-show="documento.cancelado">Cancelado</span>
28   - </div>
  13 + <div class="time hidden-md">
  14 + <i class="ace-icon fa fa-clock-o"></i> <span class="blue">{{documento.dataCriacao | date: 'dd/MM/yyyy HH:mm:ss'}} </span>
29 15 </div>
30 16  
31   -
32   - <div ng-if = "!isProcessoView" class="tools btn-group dropdown" role="group" dropdown >
  17 + <div class="text ellipsis" tooltip="{{documento.assuntoComplementar}}">{{documento.assuntoComplementar}}</div>
  18 +
  19 + <div class="itemdiv-informacoes">
  20 + <span class="label label-gray" ng-show="documento.sigilo.tipoSigilo.codigo == 0 ">{{documento.sigilo.tipoSigilo.descricao}}</span> <span class="label label-danger"
  21 + ng-show="documento.sigilo.tipoSigilo.codigo == 1 ">{{documento.sigilo.tipoSigilo.descricao}}</span> <span class="label label-black" ng-show="documento.sigilo.tipoSigilo.codigo == 2 ">{{documento.sigilo.tipoSigilo.descricao}}</span>
  22 + <span class="label label-warning" ng-show="documento.nivelAcesso.nivelAcesso.codigo == 1">{{documento.nivelAcesso.nivelAcesso.descricao}}</span> <span class="label label-success"
  23 + ng-show="documento.nivelAcesso.nivelAcesso.codigo == 2">{{documento.nivelAcesso.nivelAcesso.descricao}}</span> <span class="label label-info" ng-show="documento.origem">Anexado</span> <span
  24 + class="label label-info" ng-show="false">Assinado</span> <span class="label label-success" ng-show="false">Habilitado</span> <span class="label label-warning" ng-show="false">Ci&#xEA;ncia</span> <span
  25 + class="label label-danger" ng-show="documento.cancelado">Cancelado</span>
  26 + </div>
  27 + </div>
  28 +
  29 +
  30 + <div ng-if="!isProcessoView" class="tools btn-group dropdown" role="group" dropdown>
33 31 <button type="button" class="btn btn-success btn-xs" dropdown-toggle>
34 32 <translate>LABEL.ACOES</translate>
35 33 <span class="fa fa-caret-down icon-on-right"></span>
36 34 </button>
37 35  
38   - <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu">
39   - <li ng-if='!documento.cancelado'><a href="#void" ng-click="editDocument(documento, true);"><translate>LABEL.EDITAR</translate></a></li>
40   - <li ng-if='!isTramitado || (documento.cancelado && documento.unidade.id === usuarioLogado.unidade.id) '><a href="#void" ng-click="removeDocumento(documento, $index);"><translate>LABEL.REMOVER</translate></a></li>
41   - <li ng-if='isTramitado || (!documento.cancelado && documento.unidade.id === usuarioLogado.unidade.id)'><a href="#void" ng-click='cancelarDocumento(documento)'> <translate>LABEL.CANCELARDOCUMENTO</translate></a></li>
42   - <li ng-if='!documento.cancelado'><a href="#void" ng-click="visualizarVersoes(documento);"> <translate>LABEL.VERSOESDODOCUMENTO</translate></a></li>
43   - <li ng-if='documento.cancelado'><a href="#void" ng-click="getCancelamentoDocumento(documento);"> <translate>LABEL.CANCELAMENTO</translate></a></li>
  36 + <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu">
  37 + <li ng-if='!documento.cancelado'><a href="#void" ng-click="editDocument(documento, true);"><translate>LABEL.EDITAR</translate></a></li>
  38 + <li ng-if='!isTramitado && (!documento.cancelado && documento.unidade.id === usuarioLogado.unidade.id)'><a href="#void" ng-click="removeDocumento(documento, $index);"><translate>LABEL.REMOVER</translate></a></li>
  39 + <li ng-if='isTramitado && (!documento.cancelado && documento.unidade.id === usuarioLogado.unidade.id)'><a href="#void" ng-click='cancelarDocumento(documento)'> <translate>ECM.LABEL.CANCELARDOCUMENTO</translate></a></li>
  40 + <li ng-if='!documento.cancelado'><a href="#void" ng-click="visualizarVersoes(documento);"> <translate>ECM.LABEL.VERSOESDODOCUMENTO</translate></a></li>
  41 + <li ><a ng-if='documento.cancelado'href="#void" ng-click="getCancelamentoDocumento(documento);"> <translate>ECM.LABEL.JUSTIFICATIVA_CANCELAMENTO</translate></a></li>
44 42 </ul>
  43 +
45 44 </div>
46 45 </div>
47 46 \ No newline at end of file
... ...
cit-ecm-web/src/main/webapp/html/gerenciarProcessoView/gerenciarProcessoView.html
  Diff comments   View file @b8d3017
... ... @@ -2,7 +2,7 @@
2 2  
3 3 <div id="viewGerenciarProcesso" class="page-content" ng-controller="GerenciarProcessoViewController">
4 4 <div class="bar-buttons-action fixed">
5   - <span class="divider-vertical"></span>
  5 + <span class="divider-vertical"></span>
6 6 </div>
7 7  
8 8 <div id="informacaoProcesso">
... ... @@ -13,18 +13,18 @@
13 13 <div class="widget-box margin-bottom">
14 14 <div class="widget-header">
15 15 <h2 class="widget-title">
16   - <translate>LABEL.INFORMACAODOPROCESSO</translate>
  16 + <translate>ECM.LABEL.INFORMACAODOPROCESSO</translate>
17 17 - {{processo.nup}}
18 18 </h2>
19 19  
20 20 <div class="widget-toolbar">
21   - <a href="#void" ng-click="widgetExemploIsCollapsed = !widgetExemploIsCollapsed">
22   - <i class="fa" ng-class="{'fa-chevron-up': !widgetExemploIsCollapsed, 'fa-chevron-down': widgetExemploIsCollapsed}"></i>
  21 + <a href="#void" ng-click="widgetExemploIsCollapsed = !widgetExemploIsCollapsed"> <i class="fa"
  22 + ng-class="{'fa-chevron-up': !widgetExemploIsCollapsed, 'fa-chevron-down': widgetExemploIsCollapsed}"></i>
23 23 </a>
24 24 </div>
25   - </div>
26   - <div collapse="widgetExemploIsCollapsed" class="widget-body">
27   - <div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/includeInformacaoProcesso.html'" />
  25 + </div>
  26 + <div collapse="widgetExemploIsCollapsed" class="widget-body">
  27 + <div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/includeInformacaoProcesso.html'" />
28 28 </div>
29 29 </div>
30 30 </div>
... ... @@ -39,17 +39,19 @@
39 39 <div class="widget-box documentos margin-bottom">
40 40 <div class="widget-header">
41 41 <h2 class="widget-title">
42   - <translate>LABEL.DOCUMENTOS</translate>
  42 + <translate>ECM.LABEL.DOCUMENTOS</translate>
43 43 </h2>
44   -
45   - </div>
  44 +
  45 + </div>
46 46 <div class="widget-body">
47   -
48   -
  47 +
  48 +
49 49 <div class="widget-main clearfix">
50   -
51   - <div id="documentoProcesso"> <div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/includeDocumentosProcesso.html'" /> </div>
52   -
  50 +
  51 + <div id="documentoProcesso">
  52 + <div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/includeDocumentosProcesso.html'" />
  53 + </div>
  54 +
53 55 </div>
54 56 </div>
55 57 </div>
... ... @@ -57,11 +59,11 @@
57 59 </div>
58 60  
59 61 <div id="content-container" class="col-md-8">
60   -
  62 +
61 63 <div ng-include src="'/cit-ecm-web/html/documentoGed/documentoGedView.html'" ng-show="isDocumentoEdit" />
62 64  
63   - <div ng-include src="'/cit-ecm-web/html/documentoGed/cancelarDocumentoView.html'" ng-show="isCancelarDocumento" />
64   -
  65 + <div ng-include src="'/cit-ecm-web/html/documentoGed/cancelarDocumentoView.html'" ng-show="isCancelarDocumento" />
  66 +
65 67 </div>
66 68  
67 69 </div>
... ...