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 e4130cb66..377cd4cda 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 @@ -120,15 +120,10 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC public void onClick$btnSalvar(Event ev) throws IOException, InterruptedException { componentePreco = cmbComponentePreco.getValue(); - boolean salvarNuevos = false; - if (rdSalvarNuevos.isChecked()) - salvarNuevos = true; - - if (rdVigenciaAtual.isChecked()) { - salvarNuevos(salvarNuevos); - } else { - cmbVigenciaTarifa.getValue(); - salvarNuevos(salvarNuevos); + if (rdSalvarNuevos.isChecked()) { + salvarNuevos(false); + } else if (rdNoSalvarNuevos.isChecked()) { + salvarNuevos(true); } } @@ -159,19 +154,19 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC for (int r = 0; r < rows; r++) { Row row = sheet.getRow(r); - + if (row == null || (row.getCell(0).getCellType() == Cell.CELL_TYPE_STRING && (row.getCell(0).getStringCellValue().startsWith("Linha") || row.getCell(0).getStringCellValue().isEmpty()))) { continue; } - - if (row.getCell(0).getCellType() == Cell.CELL_TYPE_STRING && row.getCell(0).getStringCellValue().equalsIgnoreCase("id")){ + + if (row.getCell(0).getCellType() == Cell.CELL_TYPE_STRING && row.getCell(0).getStringCellValue().equalsIgnoreCase("id")) { continue; } - - if (row.getCell(0).getCellType() == Cell.CELL_TYPE_BLANK){ + + if (row.getCell(0).getCellType() == Cell.CELL_TYPE_BLANK) { continue; } - + if (componentePreco.equals(EnumTarifaPedagio.TARIFA.getDescricao())) { if (null == row.getCell(CELL_NOVO_PRECIO)) { continue; @@ -378,19 +373,19 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC for (int r = 0; r < rows; r++) { Row row = sheet.getRow(r); - + if (row == null || (row.getCell(0).getCellType() == Cell.CELL_TYPE_STRING && (row.getCell(0).getStringCellValue().startsWith("Linha") || row.getCell(0).getStringCellValue().isEmpty()))) { continue; } - - if (row.getCell(0).getCellType() == Cell.CELL_TYPE_STRING && row.getCell(0).getStringCellValue().equalsIgnoreCase("id")){ + + if (row.getCell(0).getCellType() == Cell.CELL_TYPE_STRING && row.getCell(0).getStringCellValue().equalsIgnoreCase("id")) { continue; } - - if (row.getCell(0).getCellType() == Cell.CELL_TYPE_BLANK){ + + if (row.getCell(0).getCellType() == Cell.CELL_TYPE_BLANK) { continue; } - + Cell cellIdTarifa = row.getCell(CELL_ID_TARIFA); BigDecimal bdId = new BigDecimal(cellIdTarifa.getNumericCellValue()); diff --git a/web/gui/tarifas/modificacionMasivaTarifasUpload.zul b/web/gui/tarifas/modificacionMasivaTarifasUpload.zul index 75cff3a58..cd25ab85e 100644 --- a/web/gui/tarifas/modificacionMasivaTarifasUpload.zul +++ b/web/gui/tarifas/modificacionMasivaTarifasUpload.zul @@ -7,7 +7,7 @@