fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #7144 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53141 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-02-22 20:08:25 +00:00
parent dc12ff25ac
commit 3e44eab998
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java
View File

@ -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());

2
web/gui/tarifas/modificacionMasivaTarifasUpload.zul
View File

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winModificacionMasivaTarifaUpload" border="normal"
apply="${modificacionMasivaTarifasUploadController}"
width="700px" height="220px" contentStyle="overflow:auto"
width="580px" height="275px" contentStyle="overflow:auto"
title="${c:l('editarTarifaController.window.title')}">
<toolbar>
<hbox spacing="5px" style="padding:1px" align="right">