From ed56e1cb7c73722bc49ec0cd6e5f85220854a280 Mon Sep 17 00:00:00 2001 From: geovane.filho Date: Mon, 18 Apr 2016 18:05:50 -0300 Subject: [PATCH] Redmine #4483 Bloqueando exclusão de conta contábil durante o fechamento do mês de referência --- cit-adm-materiais-web/src/main/java/br/com/centralit/controller/ContaContabilController.java | 22 ++++++++++++++++++++++ cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilController.js | 23 +++++++++++++++-------- cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilListController.js | 36 ++++++++++++++++++++++++++++++++++++ cit-adm-materiais-web/src/main/webapp/html/contaContabil/contaContabilList.html | 2 +- 4 files changed, 74 insertions(+), 9 deletions(-) diff --git a/cit-adm-materiais-web/src/main/java/br/com/centralit/controller/ContaContabilController.java b/cit-adm-materiais-web/src/main/java/br/com/centralit/controller/ContaContabilController.java index b28d285..f687289 100644 --- a/cit-adm-materiais-web/src/main/java/br/com/centralit/controller/ContaContabilController.java +++ b/cit-adm-materiais-web/src/main/java/br/com/centralit/controller/ContaContabilController.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -370,4 +371,25 @@ public class ContaContabilController extends GenericController { return responseBody; } } + + @RequestMapping(method = RequestMethod.DELETE, value = "/{id}") + @ResponseBody + public ResponseBodyWrapper delete(@PathVariable("id") Long id) { + + Organizacao organizacao = this.organizacaoService.find(this.getUsuario().getOrganizacao().getId()); + + if (!organizacao.getEmFechamento()) { + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(contaContabilService.removeById(id), getEditView()); + + return responseBody; + } else { + MyRetornoStatus retorno = new MyRetornoStatus(); + retorno.data = id; + retorno.mensagens.add(new MyMensagemRetorno(MyMensagemRetorno.TipoMensagemRetorno.warning, "MSG.ORGANIZACAO_EM_FECHAMENTO_MES")); + + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(retorno, getEditView()); + + return responseBody; + } + } } \ No newline at end of file diff --git a/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilController.js b/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilController.js index eb613ea..29a9eb0 100644 --- a/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilController.js +++ b/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilController.js @@ -36,14 +36,21 @@ citApp.controller('ContaContabilController', ['$scope', 'ContaContabilRepository $scope.$openModalConfirm({ message: $translate.instant('ADMINISTRACAODEMATERIAIS.MSG.CONFIRMA_EXCLUIR_CONTA_CONTABIL'), callback: function () { - ContaContabilRepository.remove(contaContabil).then(function() { - $scope.contaContabil = {}; - - $scope.$modalConfirmInstance.dismiss('cancel'); - $scope.showAlert("success", $translate.instant('ADMINISTRACAODEMATERIAIS.MSG.SUCESSO_CONTA_CONTABIL_EXCLUIDO')); - angular.element('#searchContaContabil').scope().fetchResult(); - - $scope.resetForm(); + ContaContabilRepository.remove(contaContabil).then(function(result) { + if (result.originalElement && result.originalElement.status != undefined && !result.originalElement.status && result.originalElement.mensagens) { + $scope.setLoading(false); + angular.forEach(result.originalElement.mensagens, function (mensagem) { + $scope.showAlert(mensagem.tipoMensagem, $translate.instant(mensagem.mensagem)); + }); + } else { + $scope.contaContabil = {}; + + $scope.$modalConfirmInstance.dismiss('cancel'); + $scope.showAlert("success", $translate.instant('ADMINISTRACAODEMATERIAIS.MSG.SUCESSO_CONTA_CONTABIL_EXCLUIDO')); + angular.element('#searchContaContabil').scope().fetchResult(); + + $scope.resetForm(); + } }); } }); diff --git a/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilListController.js b/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilListController.js index 3f11de5..c2c2515 100644 --- a/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilListController.js +++ b/cit-adm-materiais-web/src/main/webapp/assets/js/angular/custom/controller/ContaContabilListController.js @@ -58,6 +58,42 @@ citApp.controller('ContaContabilListController', ['$scope', 'ContaContabilReposi $scope.$showPageEditWorkspace($scope.workspace); }; + // MODAL DE CONFIRMAÇÃO E REMOÇÃO DO REGISTRO + $scope.remover = function(){ + + var contaContabil = $scope.contaContabilChecked; + + if(contaContabil) { + + $scope.$openModalConfirm({ + message: $translate.instant("MSG.CONFIRMA_EXCLUSAO"), + callback: function () { + $scope.setLoadingRemove(true); + + ContaContabilRepository.remove(contaContabil).then(function(result) { + if (result.originalElement && result.originalElement.status != undefined && !result.originalElement.status && result.originalElement.mensagens) { + $scope.setLoading(false); + angular.forEach(result.originalElement.mensagens, function (mensagem) { + $scope.showAlert(mensagem.tipoMensagem, $translate.instant(mensagem.mensagem)); + }); + } else { + $scope.$modalConfirmInstance.dismiss('cancel'); + $scope.showAlert('success', $translate.instant('MSG.REGISTRO_EXCLUIDO')); + $scope.fetchResult(); + $scope.setLoading(false); + } + }); + + } + }); + + } else { + + $scope.showAlert('warning', $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_SER_REMOVIDO')); + } + + }; + }]); diff --git a/cit-adm-materiais-web/src/main/webapp/html/contaContabil/contaContabilList.html b/cit-adm-materiais-web/src/main/webapp/html/contaContabil/contaContabilList.html index bf021f8..28271f5 100644 --- a/cit-adm-materiais-web/src/main/webapp/html/contaContabil/contaContabilList.html +++ b/cit-adm-materiais-web/src/main/webapp/html/contaContabil/contaContabilList.html @@ -17,7 +17,7 @@ LABEL.EDITAR - -- libgit2 0.21.2