From 1a0d47688c7959154aa365c64b5671cd407ae99f Mon Sep 17 00:00:00 2001
From: geovane.filho <geovane.filho@centralit.com.br>
Date: Mon, 18 Apr 2016 17:33:10 -0300
Subject: [PATCH] Redmine $4483 Bloqueando exclusão de transferência interna durante o fechamento do mês de referência.

---
 citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/TransferenciaController.java             | 21 +++++++++++++++++++++
 citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js     | 21 ++++++++++++++-------
 citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaListController.js | 19 +++++++++++++------
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/TransferenciaController.java b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/TransferenciaController.java
index b8709fa..f78a79f 100644
--- a/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/TransferenciaController.java
+++ b/citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/TransferenciaController.java
@@ -402,6 +402,27 @@ public class TransferenciaController extends GenericController<Transferencia>{
 			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(transferenciaService.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;
+		}
+	}
 
 	@RequestMapping(value = "/validarTransferenciaMesmoDia", method = RequestMethod.POST)
 	@ResponseBody
diff --git a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js
index 2ed2906..b2df9e9 100644
--- a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js
+++ b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaController.js
@@ -441,13 +441,20 @@ citApp.controller('TransferenciaController', ['$scope', '$filter', '$timeout', '
 			message: $translate.instant("MSG.CONFIRMA_EXCLUSAO"),
 			callback: function () {
 				$scope.setLoadingRemove(true);
-				TransferenciaRepository.remove($scope.transferencia).then(function() {
-					$scope.showAlert('success', $translate.instant('MSG.EXCLUSAO_SUCESSO'), " ", false);
-					angular.element('#searchTransferencia').scope().fetchResult();
-					$scope.$showPageSearchWorkspace($scope.workspace);
-					angular.element('#searchTransferencia').scope().listaSelecionados = [];
-					$scope.$modalConfirmInstance.dismiss('cancel');
-					$scope.setLoading(false);
+				TransferenciaRepository.remove($scope.transferencia).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.showAlert('success', $translate.instant('MSG.EXCLUSAO_SUCESSO'), " ", false);
+						angular.element('#searchTransferencia').scope().fetchResult();
+						$scope.$showPageSearchWorkspace($scope.workspace);
+						angular.element('#searchTransferencia').scope().listaSelecionados = [];
+						$scope.$modalConfirmInstance.dismiss('cancel');
+						$scope.setLoading(false);
+					}
 				});
 
 			}
diff --git a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaListController.js b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaListController.js
index ad88e81..909db85 100644
--- a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaListController.js
+++ b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaListController.js
@@ -97,12 +97,19 @@ citApp.controller('TransferenciaListController', ['$scope', '$filter', '$transla
 				callback: function () {
 					$scope.setLoadingRemove(true);
 
-					TransferenciaRepository.remove(transferencia).then(function() {
-						$scope.showAlert('success', $translate.instant('MSG.EXCLUSAO_SUCESSO'), " ", false);
-						$scope.listaSelecionados = [];
-						$scope.fetchResult();
-						$scope.$modalConfirmInstance.dismiss('cancel');
-						$scope.setLoading(false);
+					TransferenciaRepository.remove(transferencia).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.showAlert('success', $translate.instant('MSG.EXCLUSAO_SUCESSO'), " ", false);
+							$scope.listaSelecionados = [];
+							$scope.fetchResult();
+							$scope.$modalConfirmInstance.dismiss('cancel');
+							$scope.setLoading(false);
+						}
 					});
 
 				}
--
libgit2 0.21.2