Commit ada831a73ed8269d3e403abd11be139e85924384
1 parent
a846a4b0
Exists in
master
Redmine #4393 Correção de Erro Homologacao
Showing
3 changed files
with
17 additions
and
19 deletions
Show diff stats
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js
@@ -170,9 +170,8 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini | @@ -170,9 +170,8 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini | ||
170 | 170 | ||
171 | $scope.findAutoCompleteAssunto = function(value){ | 171 | $scope.findAutoCompleteAssunto = function(value){ |
172 | 172 | ||
173 | - return PlanoClassificacaoRepository.findAssuntoAutoComplete(value).then(function(result) { | ||
174 | - | ||
175 | - return result; | 173 | + return PlanoClassificacaoRepository.findAssuntoAutoComplete(value).then(function(result) { |
174 | + return result; | ||
176 | }); | 175 | }); |
177 | }; | 176 | }; |
178 | 177 | ||
@@ -298,9 +297,9 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini | @@ -298,9 +297,9 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini | ||
298 | 297 | ||
299 | }; | 298 | }; |
300 | 299 | ||
301 | - $scope.update_select = function(sugestao) { | 300 | +/* $scope.update_select = function(sugestao) { |
302 | console.log($scope.selection); | 301 | console.log($scope.selection); |
303 | - }; | 302 | + };*/ |
304 | 303 | ||
305 | $scope.setAssunto = function(itens){ | 304 | $scope.setAssunto = function(itens){ |
306 | 305 |
cit-ecm-web/src/main/webapp/html/classificarProcessoDocumento/classificarProcessoDocumento.html
@@ -65,14 +65,14 @@ | @@ -65,14 +65,14 @@ | ||
65 | </div> | 65 | </div> |
66 | 66 | ||
67 | <div class="row" ng-show='!processo.aprovado'> | 67 | <div class="row" ng-show='!processo.aprovado'> |
68 | - <div class="col-md-6"> | 68 | + <div class="col-md-4"> |
69 | <label-select ng-id="processo.nivelAcesso" ng-label="ECM.LABEL.NIVEL_ACESSO" ng-model="processo.nivelAcesso" | 69 | <label-select ng-id="processo.nivelAcesso" ng-label="ECM.LABEL.NIVEL_ACESSO" ng-model="processo.nivelAcesso" |
70 | form="classificarDocumentoclassificarDocumentoProcessoForm" ng-obrigatorio="true" | 70 | form="classificarDocumentoclassificarDocumentoProcessoForm" ng-obrigatorio="true" |
71 | ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao for nivelAcessoTipoProcesso" track-by="track by nivelAcessoTipoProcesso.id" | 71 | ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao for nivelAcessoTipoProcesso" track-by="track by nivelAcessoTipoProcesso.id" |
72 | ng-list="nivelAcessoList" /> | 72 | ng-list="nivelAcessoList" /> |
73 | </div> | 73 | </div> |
74 | 74 | ||
75 | - <div class="col-md-6" ng-show="processo.nivelAcesso.nivelAcesso.codigo == 0"> | 75 | + <div class="col-md-4" ng-show="processo.nivelAcesso.nivelAcesso.codigo == 0"> |
76 | <div class="form-group"> | 76 | <div class="form-group"> |
77 | <label class="control-label block" | 77 | <label class="control-label block" |
78 | ng-class="{'has-error': classificarDocumentoProcessoForm['processo.sigilo.id'].$error.required && (!classificarDocumentoProcessoForm['processo.sigilo.id'].$pristine || classificarDocumentoProcessoForm.$submitted)}"> | 78 | ng-class="{'has-error': classificarDocumentoProcessoForm['processo.sigilo.id'].$error.required && (!classificarDocumentoProcessoForm['processo.sigilo.id'].$pristine || classificarDocumentoProcessoForm.$submitted)}"> |
@@ -81,19 +81,17 @@ | @@ -81,19 +81,17 @@ | ||
81 | class='fa fa-warning red' tooltip="{{$translate.instant('LABEL.SIGILO') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}" tooltip-placement='top'></i> | 81 | class='fa fa-warning red' tooltip="{{$translate.instant('LABEL.SIGILO') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}" tooltip-placement='top'></i> |
82 | </label> | 82 | </label> |
83 | 83 | ||
84 | - <div class="col-md-6"> | ||
85 | <label-select ng-id="processo.sigilo" ng-model="processo.sigilo" form="classificarDocumentoProcessoForm" | 84 | <label-select ng-id="processo.sigilo" ng-model="processo.sigilo" form="classificarDocumentoProcessoForm" |
86 | ng-custom-options="sigilo.originalElement as sigilo.tipoSigilo.descricao for sigilo" | 85 | ng-custom-options="sigilo.originalElement as sigilo.tipoSigilo.descricao for sigilo" |
87 | track-by="track by sigilo.id" ng-list="sigilos" /> | 86 | track-by="track by sigilo.id" ng-list="sigilos" /> |
88 | </div> | 87 | </div> |
89 | - </div> | ||
90 | </div> | 88 | </div> |
91 | 89 | ||
92 | - <div class="col-md-6"> | 90 | + <div class="col-md-4"> |
93 | <label-input-checkbox ng-model="aprovado" ng-label="ECM.LABEL.APROVAR"></label-input-checkbox> | 91 | <label-input-checkbox ng-model="aprovado" ng-label="ECM.LABEL.APROVAR"></label-input-checkbox> |
94 | </div> | 92 | </div> |
95 | - | ||
96 | </div> | 93 | </div> |
94 | + | ||
97 | </fieldset> | 95 | </fieldset> |
98 | <!-- fim informações do processo --> | 96 | <!-- fim informações do processo --> |
99 | 97 |
cit-ecm-web/src/main/webapp/html/processo/processoEdit.html
@@ -81,26 +81,27 @@ | @@ -81,26 +81,27 @@ | ||
81 | 81 | ||
82 | </div> | 82 | </div> |
83 | </div> | 83 | </div> |
84 | - | 84 | + |
85 | <div class="row" ng-show='processo.tipoProcesso.id'> | 85 | <div class="row" ng-show='processo.tipoProcesso.id'> |
86 | <div class="col-md-6"> | 86 | <div class="col-md-6"> |
87 | <div class="form-group"> | 87 | <div class="form-group"> |
88 | <div class="input-group"> | 88 | <div class="input-group"> |
89 | - <select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple ng-id="sugestao" ng-disabled='assuntoSelecionado.id' ng-multiple="true" | ||
90 | - ng-options="sugestao as sugestao.assunto for sugestao in assuntos" track-by="track by sugestao.id"> | ||
91 | - </select> <span ng-show="sugestoes" ng-if="!processo.id" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" | ||
92 | - ng-mouseover="$hover = true" ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i> | ||
93 | - </span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i> | ||
94 | - </span> | 89 | + <select class="form-control typeahead-wide" ng-model="sugestoes" ng-change="setAssunto(sugestoes)" multiple id="sugestoes" ng-disabled='assuntoSelecionado.id' ng-multiple="false" |
90 | + ng-options="sugestao as sugestao.assunto for sugestao in assuntos track by sugestao.id"> | ||
91 | + </select> <span ng-show="sugestoes" class="input-group-addon" ng-click="sugestoes = null" ng-class="{'hover-directive' : (($hover == true) && !disabled)}" ng-mouseover="$hover = true" | ||
92 | + ng-mouseout="$hover = false"> <i class="fa fa-eraser bigger-110"></i> | ||
93 | + </span> <span class="input-group-addon" style="visibility: hidden;"> <i class="fa fa-search bigger-110"></i></span> | ||
95 | </div> | 94 | </div> |
95 | + | ||
96 | </div> | 96 | </div> |
97 | </div> | 97 | </div> |
98 | </div> | 98 | </div> |
99 | + | ||
99 | <div class="row" ng-show='processo.tipoProcesso.id'> | 100 | <div class="row" ng-show='processo.tipoProcesso.id'> |
100 | 101 | ||
101 | <div class="col-md-6"> | 102 | <div class="col-md-6"> |
102 | <label-select ng-id="processo.nivelAcesso" ng-label="ECM.LABEL.NIVEL_ACESSO" ng-model="processo.nivelAcesso" ng-custom-change='setHipoteseLegal(processo.nivelAcesso.id)' form="processoForm" | 103 | <label-select ng-id="processo.nivelAcesso" ng-label="ECM.LABEL.NIVEL_ACESSO" ng-model="processo.nivelAcesso" ng-custom-change='setHipoteseLegal(processo.nivelAcesso.id)' form="processoForm" |
103 | - ng-obrigatorio="true" ng-disabled="!edit" ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao for nivelAcessoTipoProcesso" | 104 | + ng-obrigatorio="true" ng-disabled="!edit" ng-custom-options="nivelAcessoTipoProcesso.originalElement as nivelAcessoTipoProcesso.nivelAcesso.descricao for nivelAcessoTipoProcesso " |
104 | track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" show-selecione='false'/> | 105 | track-by="track by nivelAcessoTipoProcesso.id" ng-list="nivelAcessoList" show-selecione='false'/> |
105 | </div> | 106 | </div> |
106 | 107 |