From b7997c166fd00110b026233ab21e30507105f8ea Mon Sep 17 00:00:00 2001
From: "eduardo.dicarde" <eduardo.dicarde@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 5 Jul 2016 23:42:45 +0000
Subject: [PATCH] fixes bug #7578

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57628 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ModificacionMasivaTarifasController.java  | 42 +++++++++++--------
 ...ficacionMasivaTarifasUploadController.java | 17 ++------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java
index be18c1438..aeb830aa1 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java
@@ -666,31 +666,37 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
 		HSSFSheet sheet1 = null;
 		String ruta = "";
 		int contRow = 0;
-		int contPlan = 0;
 		
 		for (int i = 0; i < lsRutaCombinacion.size(); i++) {
 			Object[] obj = (Object[]) lsRutaCombinacion.get(i);
 
-			if (!ruta.equals(obj[4].toString().concat(obj[12].toString()))) {
-
-				ruta = obj[4].toString().concat(obj[12].toString());
-				String sheetName = "";
-				if (obj[4].toString().length() > 26) {
-					sheetName = (obj[12].toString().concat("-").concat(obj[4].toString().substring(0, 26)));
-				} else {
-					sheetName = (obj[12].toString().concat("-").concat(obj[4].toString()));
-				}
-				sheetName = sheetName.replaceAll("/", "-");
-				
-				sheetName += ++contPlan;
-				
-				log.debug("Aba: " + sheetName);
-				sheet1 = wb.createSheet(sheetName);
-				contRow = 1;
+			String sheetName = "";
 			
-				criarCabecalhoExcel(sheet1, estilo);
+			try{
+				if (!ruta.equals(obj[4].toString().concat(obj[12].toString()))) {
+					
+					ruta = obj[4].toString().concat(obj[12].toString());
+					String sentido = (obj[22].toString().equals("1"))?"IDA":"VOLTA";
+					
+					if (obj[4].toString().length() > 26) {
+						sheetName = (obj[12].toString().concat("-").concat(obj[4].toString().substring(0, obj[4].toString().length()).concat(" - ").concat(sentido)));
+					} else {
+						sheetName = (obj[12].toString().concat("-").concat(obj[4].toString()).concat(" - ").concat(sentido));
+					}
+					sheetName = sheetName.replaceAll("/", "-");
+					
+					log.debug("Aba: " + sheetName);
+					sheet1 = wb.createSheet(sheetName);
+					contRow = 1;
+					
+					criarCabecalhoExcel(sheet1, estilo);
+				}				
+			} catch(Exception exception){
+				System.err.println(sheetName);
+				continue;
 			}
 			
+			
 			popularPlanilha(sheet1, obj, estilo, coeficiente, contRow++);
 		}
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java
index 47f133323..ac9264971 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java
@@ -171,13 +171,11 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
 						continue;
 					}
 					
-					boolean retorno = false;
+					boolean retorno = true;
 					
-					if (componentePreco.equals(EnumTarifaPedagio.TODOS.getDescricao())){
-						retorno = validarTodosComponentes(row);
-					} else{
+					if (!componentePreco.equals(EnumTarifaPedagio.TODOS.getDescricao())){
 						retorno = validarComponenteEspecifico(row);
-					}
+					} 
 					
 					if (!retorno){
 						continue;
@@ -597,13 +595,4 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
 		
 		return true;
 	}
-	
-	private boolean validarTodosComponentes(Row row){
-		if (row.getCell(CELL_NOVO_PRECIO) == null || row.getCell(CELL_NOVO_PEAJE) == null || row.getCell(CELL_NOVO_TX_EMBARQUE) == null || 
-				row.getCell(CELL_NOVO_SEGURO) == null){
-			return false;
-		}
-		
-		return true;
-	}
 }