Download as
Browse Code »

Commit 63fb8bb67d19bf9bf0ef28afef43f41520425ccc

Authored by erick.sato
1 parent e9db0c59
Exists in master

[Redmine Atendimento #4685]Correção definiçao detentor

Showing 5 changed files with 42 additions and 6 deletions   Show diff stats
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/viewHelper/DefinicaoDetentorVH.java 0 → 100644
  Diff comments   View file @63fb8bb
... ... @@ -0,0 +1,31 @@
  1 +package br.com.centralit.api.viewHelper;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +public class DefinicaoDetentorVH implements Serializable {
  7 +
  8 + /** Atributo serialVersionUID. */
  9 + private static final long serialVersionUID = 2342505270077662292L;
  10 +
  11 + private List<Long> idsBens;
  12 +
  13 + private Long idEstruturaDetentor;
  14 +
  15 + public List<Long> getIdsBens() {
  16 + return idsBens;
  17 + }
  18 +
  19 + public void setIdsBens(List<Long> idsBens) {
  20 + this.idsBens = idsBens;
  21 + }
  22 +
  23 + public Long getIdEstruturaDetentor() {
  24 + return idEstruturaDetentor;
  25 + }
  26 +
  27 + public void setIdEstruturaDetentor(Long idEstruturaDetentor) {
  28 + this.idEstruturaDetentor = idEstruturaDetentor;
  29 + }
  30 +
  31 +}
... ...
citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/DefinicaoDetentorController.java
  Diff comments   View file @63fb8bb
... ... @@ -41,6 +41,7 @@ import br.com.centralit.api.service.DominioService;
41 41 import br.com.centralit.api.service.EstruturaOrganizacionalService;
42 42 import br.com.centralit.api.service.InternacionalizacaoService;
43 43 import br.com.centralit.api.service.UsuarioService;
  44 +import br.com.centralit.api.viewHelper.DefinicaoDetentorVH;
44 45 import br.com.centralit.framework.controller.GenericController;
45 46 import br.com.centralit.framework.controller.ReportController;
46 47 import br.com.centralit.framework.json.ResponseBodyWrapper;
... ... @@ -283,9 +284,9 @@ public class DefinicaoDetentorController extends GenericController&lt;DefinicaoDete
283 284 * @param idsBens
284 285 * @return boolean
285 286 */
286   - @RequestMapping(method = RequestMethod.GET, value = "/validarTransferenciaDefinicao")
  287 + @RequestMapping(method = RequestMethod.POST, value = "/validarTransferenciaDefinicao")
287 288 @ResponseBody
288   - public boolean validarTransferenciaDefinicao(@RequestParam(value = "idEstruturaDetentor") Long idEstruturaDetentor, @RequestParam(value = "idsBens") List<Long> idsBens) {
289   - return this.definicaoDetentorService.validarTransferenciaDefinicao(idEstruturaDetentor,idsBens);
  289 + public boolean validarTransferenciaDefinicao(@RequestBody DefinicaoDetentorVH detentorVH) {
  290 + return this.definicaoDetentorService.validarTransferenciaDefinicao(detentorVH.getIdEstruturaDetentor(),detentorVH.getIdsBens());
290 291 }
291 292 }
... ...
citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java
  Diff comments   View file @63fb8bb
... ... @@ -748,6 +748,7 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
748 748 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.SELECIONE_ALTERAR_STATUS", "Selecione um status para realizar a alteração.", dominio, modulo));
749 749 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_VIDA_UTIL_CONTA_CONTABIL", "Carregar vida útil configurada na conta contábil do material", dominio, modulo));
750 750 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_TAXA_RESIDUAL_CONTA_CONTABIL", "Carregar taxa residual configurada na conta contábil do material", dominio, modulo));
  751 + internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DESEJA_ENCERRAR_PARTICIPACAO_DE", "Deseja encerrar a participação de ", dominio, modulo));
751 752 }
752 753  
753 754 }
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/DefinicaoDetentorController.js
  Diff comments   View file @63fb8bb
... ... @@ -123,7 +123,10 @@ citApp.controller(&#39;DefinicaoDetentorController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;Definica
123 123 }
124 124  
125 125 if($scope.definicaoDetentor.colaborador.estruturaOrganizacional){
126   - DefinicaoDetentorRepository.validarTransferenciaDefinicao($scope.definicaoDetentor.colaborador.estruturaOrganizacional.id, $scope.listaBemPatrimonialTemp).then(function(result){
  126 +
  127 + var definicaoDetentorVH = {idEstruturaDetentor : $scope.definicaoDetentor.colaborador.estruturaOrganizacional.id, idsBens : $scope.listaBemPatrimonialTemp};
  128 +
  129 + DefinicaoDetentorRepository.validarTransferenciaDefinicao(definicaoDetentorVH).then(function(result){
127 130 if(result) {
128 131 $scope.$openModal('modal-realizaTransferencia', 'mr');
129 132 } else {
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/repository/DefinicaoDetentorRepository.js
  Diff comments   View file @63fb8bb
... ... @@ -4,8 +4,8 @@ citApp.factory(&#39;DefinicaoDetentorRepository&#39;, [&#39;RestangularPatrimonio&#39;, &#39;Abstrac
4 4  
5 5 function DefinicaoDetentorRepository() {
6 6  
7   - this.validarTransferenciaDefinicao = function(idEstruturaDetentor, idsBens) {
8   - return this.restangular.one(this.route+'/validarTransferenciaDefinicao').get({idEstruturaDetentor: idEstruturaDetentor, idsBens : idsBens}).then();
  7 + this.validarTransferenciaDefinicao = function(definicaoDetentor) {
  8 + return this.restangular.all(this.route+"/validarTransferenciaDefinicao").post(definicaoDetentor);
9 9 };
10 10  
11 11 AbstractRepository.call(this, restangularPatrimonio, 'rest/definicaoDetentor');
... ...