Commit c6a6ba145f66a8793ce2901e76852edd506cbddb
1 parent
cba4209b
Exists in
master
[3576] - Ajustar modelo e cadastros: Tipo de documento, tipo de processo, documento e processo.
Showing
2 changed files
with
14 additions
and
231 deletions
Show diff stats
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js
... | ... | @@ -104,7 +104,7 @@ citApp.controller('GerenciarProcessoController', [ '$scope', '$translate', '$tim |
104 | 104 | $scope.isGerenciarCredencialProcesso = true; |
105 | 105 | |
106 | 106 | $timeout( function () { |
107 | - angular.element( "#credencialProcessoEdit" ).scope().iniciarCredencial( $scope.processo.id, $scope.credencialUsuarioProcesso ); | |
107 | + angular.element( "#credencialProcessoEdit" ).scope().iniciarCredencial( $scope.processo); | |
108 | 108 | } ); |
109 | 109 | }; |
110 | 110 | |
... | ... | @@ -333,26 +333,21 @@ citApp.controller('GerenciarProcessoController', [ '$scope', '$translate', '$tim |
333 | 333 | } ); |
334 | 334 | }; |
335 | 335 | |
336 | - // Exibir dialog para remover credencial do usuário | |
337 | - $scope.exibirDialogConfirmacaoRemoverCredencial = function () { | |
338 | - | |
339 | - $scope.$openModalConfirm( { | |
340 | - message : $translate.instant( 'ECM.MSG.CONFIRMA_RENUNCIAR_CREDENCIAL' ), | |
341 | - callback : $scope.removeCredemcial | |
342 | - } ); | |
343 | - | |
336 | + //Exibir dialog para remover credencial do usuário | |
337 | + $scope.exibirDialogConfirmacaoRemoverCredencial = function(){ | |
338 | + | |
339 | + $scope.$openModalConfirm({message: $translate.instant('ECM.MSG.CONFIRMA_RENUNCIAR_CREDENCIAL'), callback: $scope.renunciarCredencial}); | |
340 | + | |
344 | 341 | }; |
345 | - | |
346 | - // Remover a credencial do usuário | |
347 | - $scope.removeCredemcial = function () { | |
348 | - | |
349 | - CredencialProcessoRepository.remove( $scope.credencialUsuarioProcesso ).then( function () { | |
350 | - | |
351 | - $scope.credencialUsuarioProcesso = null; | |
352 | - | |
342 | + | |
343 | + //Remover a credencial do usuário | |
344 | + $scope.renunciarCredencial = function(){ | |
345 | + | |
346 | + CredencialProcessoRepository.renunciar($scope.processo.id).then(function() { | |
347 | + | |
353 | 348 | $scope.voltarGerenciamentoTarefa(); |
354 | - | |
355 | - } ); | |
349 | + | |
350 | + }); | |
356 | 351 | }; |
357 | 352 | |
358 | 353 | // Voltar para tela de gerenciamento de tarefa | ... | ... |
cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.html
... | ... | @@ -1,212 +0,0 @@ |
1 | - | |
2 | -<div ng-controller="CredencialProcessoController as credencialProcessoController"> | |
3 | - <form name="credencialProcessoController.credenciarProcessoForm" novalidate autocomplete="off"> | |
4 | - | |
5 | - <div id="widget-credenciarProcesso" class="widget-box margin-bottom"> | |
6 | - <div class="widget-header"> | |
7 | - <h2 class="widget-title"> | |
8 | - <translate>ECM.LABEL.GERENCIAR_CREDENCIAIS_ACESSO</translate> | |
9 | - </h2> | |
10 | - | |
11 | - <div class="widget-toolbar"> | |
12 | - <a href="#void" ng-click="closeWidget('widget-credenciarProcesso')"> <i class="fa fa-close"></i> | |
13 | - </a> | |
14 | - </div> | |
15 | - </div> | |
16 | - <div class="widget-main clearfix"> | |
17 | - <div id="credencialProcessoEdit" class="page-content clearfix"> | |
18 | - | |
19 | - <p> | |
20 | - <small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small> | |
21 | - </p> | |
22 | - | |
23 | - <fieldset> | |
24 | - <legend> | |
25 | - <label ng-class="{'has-error' : credenciarProcessoForm.$submitted && credencialProcessoList.length < 1}"> <translate>ECM.LABEL.CREDENCIAR_USUARIO_GRUPO</translate> <span class='red'>*</span> | |
26 | - <i ng-show="credenciarProcessoForm.$submitted && credencialProcessoList.length < 1" class='fa fa-warning red' | |
27 | - tooltip="{{$translate.instant('ECM.LABEL.CREDENCIAR_USUARIO_GRUPO') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}" tooltip-placement='top'></i> | |
28 | - </label> | |
29 | - </legend> | |
30 | - | |
31 | - | |
32 | - <div class="row"> | |
33 | - | |
34 | - <div class="col-md-8"> | |
35 | - <auto-complete ng-id="credencialProcesso.grupoUsuario" ng-label="ECM.LABEL.USUARIO_GRUPO" ng-model="credencialProcesso.grupoUsuario" ng-find="findAutoCompleteGrupoUsuario(value)" | |
36 | - ng-item="item.nome" /> | |
37 | - </div> | |
38 | - | |
39 | - <div class="col-sm-4"> | |
40 | - <label-input-checkbox ng-id="credencialProcesso.permiteCredenciar" ng-model="credencialProcesso.permiteCredenciar" ng-label="ECM.LABEL.PODE_CREDENCIAR"></label-input-checkbox> | |
41 | - </div> | |
42 | - | |
43 | - </div> | |
44 | - | |
45 | - <div class="row"> | |
46 | - | |
47 | - <div class="col-md-12"> | |
48 | - <div class="row"> | |
49 | - <div class="col-sm-12"> | |
50 | - <div class="panel panel-default"> | |
51 | - <div class="panel-heading clearfix"> | |
52 | - <button title="{{$translate.instant('LABEL.ADICIONAR')}}" alt="{{$translate.instant('LABEL.ADICIONAR')}}" class="btn btn-clear" ng-click="addCredencial()" | |
53 | - ng-disabled="!credencialProcesso.grupoUsuario.id" type="button"> | |
54 | - <i class="fa fa-plus-circle yellow-dark"></i> | |
55 | - <translate>LABEL.ADICIONAR</translate> | |
56 | - </a> | |
57 | - </button> | |
58 | - | |
59 | - <button type="button" class="btn btn-clear" ng-disabled="!credencialProcessoChecked" ng-click="editCredencial();"> | |
60 | - <i class="fa fa-pencil blue"></i> | |
61 | - <translate>LABEL.EDITAR</translate> | |
62 | - </button> | |
63 | - | |
64 | - <button class="btn btn-clear" type="button" ng-click="exibirDialogRemocao()" ng-if="permiteRemoverCredencial"> | |
65 | - <i class="fa fa-times red"></i> | |
66 | - <translate>LABEL.REMOVER</translate> | |
67 | - </button> | |
68 | - </div> | |
69 | - <table class="table table-striped table-bordered table-hover"> | |
70 | - <thead> | |
71 | - <tr> | |
72 | - <th width="5%" class="text-center"></th> | |
73 | - <th width="5%" class="text-center"></th> | |
74 | - <th width="35%" class="text-center"><translate>LABEL.NOME</translate></th> | |
75 | - <th width="20%" class="text-center"><translate>LABEL.UNIDADE</translate></th> | |
76 | - <th width="20%" class="text-center"><translate>ECM.LABEL.PODE_CREDENCIAR</translate></th> | |
77 | - | |
78 | - </tr> | |
79 | - </thead> | |
80 | - <tbody> | |
81 | - <tr ng-repeat="credencialProcesso in credenciais"> | |
82 | - | |
83 | - <td class="text-center"><input type="radio" name="credencialProcessoChecked" ng-click="verificarPermissaoRemover()" ng-value="credencialProcesso" ng-model="$parent.credencialProcessoChecked" /></td> | |
84 | - <td class="text-center"><i class="{{credencialProcesso.icon}}" title="{{credencialProcesso.grupo ? $translate.instant('LABEL.GRUPO') : $translate.instant('LABEL.USUARIO')}}"></i></td> | |
85 | - <td class="text-center">{{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}</td> | |
86 | - <td class="text-center">{{credencialProcesso.usuario.unidade.nome}}</td> | |
87 | - <td class="text-center">{{credencialProcesso.permiteCredenciar ? $translate.instant('LABEL.SIM') : $translate.instant('LABEL.NAO')}}</td> | |
88 | - | |
89 | - </tr> | |
90 | - <tr ng-hide="credenciais.length > 0"> | |
91 | - <td colspan="5" class="text-center"><translate>LABEL.TABELA_VAZIA</translate></td> | |
92 | - </tr> | |
93 | - </tbody> | |
94 | - </table> | |
95 | - </div> | |
96 | - </div> | |
97 | - </div> | |
98 | - </div> | |
99 | - </div> | |
100 | - | |
101 | - </fieldset> | |
102 | - | |
103 | - <fieldset> | |
104 | - | |
105 | - <legend> | |
106 | - <translate>ECM.LABEL.HERANCA_SISTEMA</translate> | |
107 | - </legend> | |
108 | - | |
109 | - <div class="col-md-12"> | |
110 | - <div class="row"> | |
111 | - <div class="col-sm-12"> | |
112 | - <div class="panel panel-default"> | |
113 | - <div class="panel-heading clearfix"></div> | |
114 | - <table class="table table-striped table-bordered table-hover"> | |
115 | - <thead> | |
116 | - <tr> | |
117 | - <th class="text-center"><translate>ECM.LABEL.USUARIO_GRUPO</translate></th> | |
118 | - <th class="text-center"><translate>LABEL.UNIDADE</translate></th> | |
119 | - </tr> | |
120 | - </thead> | |
121 | - <tbody> | |
122 | - <tr ng-repeat="hecanca in herdadas"> | |
123 | - <td class="text-center">{{hecanca.nome}}</td> | |
124 | - <td class="text-center">{{hecanca.nomeUnidade}}</td> | |
125 | - </tr> | |
126 | - <tr ng-hide="historicos.length > 0"> | |
127 | - <td colspan="2" class="text-center"><translate>LABEL.TABELA_VAZIA</translate></td> | |
128 | - </tr> | |
129 | - </tbody> | |
130 | - </table> | |
131 | - </div> | |
132 | - </div> | |
133 | - </div> | |
134 | - </div> | |
135 | - | |
136 | - </fieldset> | |
137 | - | |
138 | - <div class="row"> | |
139 | - <div class="col-md-12"> | |
140 | - <button class="btn btn-sm btn-primary" ng-click="saveOrUpdate()" type="button"> | |
141 | - <translate>LABEL.SALVAR</translate> | |
142 | - </button> | |
143 | - | |
144 | - <button class="btn btn-sm btn-primary" ng-click="closeWidget('widget-credenciarProcesso')" type="button"> | |
145 | - <translate>LABEL.CANCELAR</translate> | |
146 | - </button> | |
147 | - </div> | |
148 | - </div> | |
149 | - </div> | |
150 | - </div> | |
151 | - </div> | |
152 | - | |
153 | - <div id="widget-historicoCredenciarProcesso" class="widget-box margin-bottom"> | |
154 | - <div class="widget-header"> | |
155 | - <h2 class="widget-title"> | |
156 | - <translate>ECM.LABEL.HISTORICO_CREDENCIAL</translate> | |
157 | - </h2> | |
158 | - | |
159 | - <div class="widget-toolbar"> | |
160 | - <a href="#void" ng-click="closeWidget('widget-historicoCredenciarProcesso')"> <i class="fa fa-close"></i> <a href="#void" | |
161 | - ng-click="widgetCredencialProcessoIsCollapsed = !widgetCredencialProcessoIsCollapsed"> <i class="fa" | |
162 | - ng-class="{'fa-chevron-up': !widgetCredencialProcessoIsCollapsed, 'fa-chevron-down': widgetCredencialProcessoIsCollapsed}"></i> | |
163 | - </a> | |
164 | - </div> | |
165 | - </div> | |
166 | - <div id="metadadosDocumentoGedCollapsed" collapse="widgetCredencialProcessoIsCollapsed" class="widget-body"> | |
167 | - <div class="widget-main clearfix"> | |
168 | - <div id="historicoCredencialProcesso" class="page-content clearfix"> | |
169 | - <div class="col-md-12"> | |
170 | - <div class="row"> | |
171 | - <div class="col-sm-12"> | |
172 | - <div class="panel panel-default"> | |
173 | - <div class="panel-heading clearfix"></div> | |
174 | - <table class="table table-striped table-bordered table-hover"> | |
175 | - <thead> | |
176 | - <tr> | |
177 | - <th class="text-center"><translate>ECM.LABEL.USUARIO_GRUPO</translate></th> | |
178 | - <th class="text-center"><translate>LABEL.UNIDADE</translate></th> | |
179 | - <th class="text-center"><translate>ECM.LABEL.CREDENCIADOR</translate></th> | |
180 | - <th class="text-center"><translate>ECM.LABEL.CREDENCIADO_EM</translate></th> | |
181 | - <th class="text-center"><translate>ECM.LABEL.DESCREDENCIADOR</translate></th> | |
182 | - <th class="text-center"><translate>ECM.LABEL.DATA_DESCREDENCIAMENTO</translate></th> | |
183 | - </tr> | |
184 | - </thead> | |
185 | - <tbody> | |
186 | - <tr ng-repeat="historicoCredencialProcesso in historicos"> | |
187 | - | |
188 | - <td class="text-center">{{historicoCredencialProcesso.credencialProcesso.grupo.nome}} {{historicoCredencialProcesso.credencialProcesso.usuario.username}}</td> | |
189 | - <td class="text-center">{{historicoCredencialProcesso.unidadeUsuarioCredenciado}}</td> | |
190 | - <td class="text-center">{{historicoCredencialProcesso.credencialProcesso.autor.username}}</td> | |
191 | - <td class="text-center">{{historicoCredencialProcesso.credencialProcesso.dataCriacao | date:'dd-MM-yyyy HH:mm'}}</td> | |
192 | - <td class="text-center">{{historicoCredencialProcesso.descredenciador.username}}</td> | |
193 | - <td class="text-center">{{historicoCredencialProcesso.dataDescredenciado | date:'dd-MM-yyyy HH:mm'}}</td> | |
194 | - | |
195 | - </tr> | |
196 | - <tr ng-hide="historicos.length > 0"> | |
197 | - <td colspan="6" class="text-center"><translate>LABEL.TABELA_VAZIA</translate></td> | |
198 | - </tr> | |
199 | - </tbody> | |
200 | - </table> | |
201 | - </div> | |
202 | - </div> | |
203 | - </div> | |
204 | - </div> | |
205 | - </div> | |
206 | - </div> | |
207 | - </div> | |
208 | - </div> | |
209 | - | |
210 | - </form> | |
211 | - | |
212 | -</div> |