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

FIXES BUG #6467 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45986 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-07-13 22:09:50 +00:00
parent 61f3517ae7
commit 54c6f7d0b3
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java
View File

@ -566,7 +566,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose
if (mExcel != null) {
Map args = new HashMap();
args.put("mExcel", mExcel);
args.put("componentePreco", cmbComponentePreco.getValue());
// args.put("componentePreco", cmbComponentePreco.getValue());
openWindow("/gui/tarifas/modificacionMasivaTarifasUpload.zul",
Labels.getLabel("modificacionMasivaTarifasController.window.title"), args, MODAL);

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

@ -82,6 +82,8 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
private Combobox cmbVigenciaTarifa;
private Label lbVigencia;
private String componentePreco;
private Combobox cmbComponentePreco;
private List<String> lsComponentePreco;
private static Logger log = Logger.getLogger(ModificacionMasivaTarifasUploadController.class);
@Override
@ -90,11 +92,12 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
super.doAfterCompose(comp);
mExcel = (Media) Executions.getCurrent().getArg().get("mExcel");
componentePreco = (String) Executions.getCurrent().getArg().get("componentePreco");
//componentePreco = (String) Executions.getCurrent().getArg().get("componentePreco");
lsVigenciaTarifa = vigenciaTarifaService.obtenerTodos();
lbVigencia.setVisible(Boolean.FALSE);
cmbVigenciaTarifa.setVisible(Boolean.FALSE);
setLsComponentePreco(EnumTarifaPedagio.obterBundleValues());
vigenciaTarifa();
@ -113,6 +116,7 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
}
public void onClick$btnSalvar(Event ev) throws IOException, InterruptedException {
componentePreco = cmbComponentePreco.getValue();
if (rdVigenciaAtual.isChecked()) {
salvarNuevos(false);
} else {
@ -152,6 +156,15 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
if (row == null) {
continue;
}
if (componentePreco.equals(EnumTarifaPedagio.TARIFA.getDescricao())) {
if (null == row.getCell(CELL_NOVO_PRECIO)) {
continue;
}
} else {
if (null == row.getCell(CELL_NOVO_PEAJE)) {
continue;
}
}
Cell cellIdTarifa = row.getCell(CELL_ID_TARIFA);
BigDecimal bdId = new BigDecimal(cellIdTarifa.getNumericCellValue());
@ -161,7 +174,6 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
BigDecimal bdPeaje = new BigDecimal(cellPeaje != null ? cellPeaje.getNumericCellValue() : 0.0);
Tarifa tarifa = tarifaService.obtenerID(idTarifa);
tarifa.setImportepedagio(bdPeaje);
if (tarifa != null) {
Tramo tramo = tarifa.getTramo();
@ -440,4 +452,20 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC
public void setLbVigencia(Label lbVigencia) {
this.lbVigencia = lbVigencia;
}
public Combobox getCmbComponentePreco() {
return cmbComponentePreco;
}
public void setCmbComponentePreco(Combobox cmbComponentePreco) {
this.cmbComponentePreco = cmbComponentePreco;
}
public List<String> getLsComponentePreco() {
return lsComponentePreco;
}
public void setLsComponentePreco(List<String> lsComponentePreco) {
this.lsComponentePreco = lsComponentePreco;
}
}

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

@ -43,6 +43,12 @@
mold="rounded" buttonVisible="true" width="90%"
model="@{winModificacionMasivaTarifaUpload$composer.lsVigenciaTarifa}"/>
</row>
<row>
<label value="${c:l('modificacionMasivaTarifasController.componentePreco.label')}"/>
<combobox id="cmbComponentePreco" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
mold="rounded" buttonVisible="true" width="28%" value="${c:l('busquedaTarifaController.lhPrecio.label')}"
model="@{winModificacionMasivaTarifaUpload$composer.lsComponentePreco}"/>
</row>
<row spans="2" align="center">
<button id="btnSalvar" label="${c:l('modificacionMasivaTarifasUploadController.MSG.salvar')}"/>
</row>