From 48700476ddec74b8e23235acca19227304cdc963 Mon Sep 17 00:00:00 2001
From: Ronan Tavares Camargo <ronan.camargo@centralit.com.br>
Date: Tue, 12 Apr 2016 17:40:23 -0300
Subject: [PATCH] Redmine #4451

---
 cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/TermoReferenciaServiceImpl.java      | 13 ++++++++++++-
 cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaController.js     |  7 ++++---
 cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaListController.js | 22 ++++++++++++++++------
 cit-contratos-web/src/main/webapp/html/termoReferencia/termoReferenciaList.html                        |  2 +-
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/TermoReferenciaServiceImpl.java b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/TermoReferenciaServiceImpl.java
index 757c3ec..1624b3d 100644
--- a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/TermoReferenciaServiceImpl.java
+++ b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/TermoReferenciaServiceImpl.java
@@ -29,6 +29,7 @@ import br.com.centralit.api.model.TermoReferenciaObservacao;
 import br.com.centralit.api.model.TermoReferenciaPenalidade;
 import br.com.centralit.api.model.TermoReferenciaSancao;
 import br.com.centralit.api.service.ConfiguracaoParametroSistemaService;
+import br.com.centralit.api.service.ContratoService;
 import br.com.centralit.api.service.DominioService;
 import br.com.centralit.api.service.InternacionalizacaoService;
 import br.com.centralit.api.service.ParceiroService;
@@ -39,6 +40,7 @@ import br.com.centralit.api.service.TermoReferenciaService;
 import br.com.centralit.api.service.UsuarioService;
 import br.com.centralit.framework.controller.ReportController;
 import br.com.centralit.framework.exception.BusinessException;
+import br.com.centralit.framework.exception.CodigoErro;
 import br.com.centralit.framework.model.Dominio;
 import br.com.centralit.framework.model.Usuario;
 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl;
@@ -121,6 +123,9 @@ public class TermoReferenciaServiceImpl extends GenericServiceImpl<TermoReferenc
 	//TODO - Ciro 21/01/2016- Substituir esta dependencia por chamada rest
 	@Autowired
 	private InternacionalizacaoService internacionalizacaoService;
+	
+	@Autowired
+	private ContratoService contratoService;
 
 	private Dominio idioma;
 
@@ -157,7 +162,8 @@ public class TermoReferenciaServiceImpl extends GenericServiceImpl<TermoReferenc
 
 	@Override
 	public boolean removeById(Long id) {
-
+		validarExclusao(id);
+		
 		TermoReferencia termoReferencia = find(id);
 		if (CollectionUtils.isNotEmpty(termoReferencia.getPenalidades())){
 			penalidadeService.removeList((List<TermoReferenciaPenalidade>) termoReferencia.getPenalidades());
@@ -170,6 +176,11 @@ public class TermoReferenciaServiceImpl extends GenericServiceImpl<TermoReferenc
 		}
 		return termoReferenciaDao.removeById(id);
 	}
+	
+	private void validarExclusao(Long id) {
+		Boolean isVinculado = contratoService.existeVinculo("termoReferencia.id", id);
+		lancarBusinessException("VALIDACAO.REMOCAO_COM_VINCULO", CodigoErro.REGRA_NEGOCIO.getValue(), isVinculado);
+	}
 
 	private void montarObjetoTermoReferencia(TermoReferencia termoReferencia) {
 
diff --git a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaController.js b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaController.js
index a12964e..e079405 100644
--- a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaController.js
+++ b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaController.js
@@ -689,19 +689,20 @@ citApp.controller('TermoReferenciaController', ['$scope',
     };
 
   // MODAL QUE CONFIRMA REMOVER TERMO
-  $scope.remove = function(termo){
+  $scope.remover = function(termo){
     $scope.$openModalConfirm({
       message: $translate.instant('MSG.CONFIRMA_EXCLUIR_TERMO_REFERENCIA'),
       callback: function () {
         TermoReferenciaRepository.remove(termo).then(function() {
           $scope.termoReferencia = {};
 
-          $scope.$modalConfirmInstance.dismiss('cancel');
           $scope.showAlert("success", $translate.instant('MSG.SUCESSO_EXCLUSAO_TERMO_REFERENCIA'));
           angular.element('#searchTermoReferencia').scope().fetchResult();
 
-          $scope.resetForm();
         });
+        
+        $scope.$modalConfirmInstance.dismiss('cancel');
+        $scope.resetForm();
       }
     });
   };
diff --git a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaListController.js b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaListController.js
index 1948918..3abf41c 100644
--- a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaListController.js
+++ b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaListController.js
@@ -81,17 +81,13 @@ citApp.controller('TermoReferenciaListController', ['$scope', 'TermoReferenciaRe
 			$scope.showAlert('warning', $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_VISUALIZACAO'));
 			$scope.setLoadingGet(false);
 			return;
-		} else if (edit && $scope.termoReferenciaChecked.dataTermoGerado){
-			$scope.showAlert('warning', $translate.instant('MSG.TERMO_REFERENCIA_JA_GERADO'));
-			$scope.setLoadingGet(false);
-			return;
 		}
 		angular.element('#editTermoReferencia').scope().getTermo(termo.id, edit);
 		$scope.$showPageEditWorkspace($scope.workspace);
 	};
 
 	// MODAL QUE CONFIRMA REMOVER Do termo
-	$scope.remove = function(){
+	$scope.remover = function(){
 		var termo = $scope.termoReferenciaChecked;
 
 		if(termo === null) {
@@ -99,7 +95,21 @@ citApp.controller('TermoReferenciaListController', ['$scope', 'TermoReferenciaRe
 			return ;
 		}
 
-		angular.element('#editTermoReferencia').scope().remove(termo);
+	    $scope.$openModalConfirm({
+	        message: $translate.instant('MSG.CONFIRMA_EXCLUIR_TERMO_REFERENCIA'),
+	        callback: function () {
+	          TermoReferenciaRepository.remove(termo).then(function() {
+	            $scope.termoReferencia = {};
+
+	            $scope.showAlert("success", $translate.instant('MSG.SUCESSO_EXCLUSAO_TERMO_REFERENCIA'));
+	            angular.element('#searchTermoReferencia').scope().fetchResult();
+
+	          });
+	          
+	          $scope.$modalConfirmInstance.dismiss('cancel');
+	          $scope.resetForm();
+	        }
+	      });
 	};
 
 	$scope.gerarRelatorioTermoReferencia = function (edit) {
diff --git a/cit-contratos-web/src/main/webapp/html/termoReferencia/termoReferenciaList.html b/cit-contratos-web/src/main/webapp/html/termoReferencia/termoReferenciaList.html
index bd5d6c4..0e15e7a 100644
--- a/cit-contratos-web/src/main/webapp/html/termoReferencia/termoReferenciaList.html
+++ b/cit-contratos-web/src/main/webapp/html/termoReferencia/termoReferenciaList.html
@@ -20,7 +20,7 @@
 					<translate>LABEL.EDITAR</translate>
 				</button>
 				
-				<button title="{{$translate.instant('LABEL.REMOVER')}}" alt="{{$translate.instant('LABEL.REMOVER')}}" class="btn btn-clear" ng-click="remove();" type="button"
+				<button title="{{$translate.instant('LABEL.REMOVER')}}" alt="{{$translate.instant('LABEL.REMOVER')}}" class="btn btn-clear" ng-click="remover();" type="button"
 						ng-show="true">
 					<i class="fa fa-times red"></i>
 					<translate>LABEL.REMOVER</translate>
--
libgit2 0.21.2