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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@20941 d1611594-4594-4d17-8e1d-87c2c4800839

master
gleimar 2012-08-31 20:40:37 +00:00
parent 53d09c54d5
commit 1ce4bc4aa9
8 changed files with 12 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueKmController.java
View File

@ -98,22 +98,16 @@ public class BusquedaTaxaEmbarqueKmController extends MyGenericForwardComposer {
private void refreshLista() {
HibernateSearchObject<OrgaoConcedente> taxaEmbarqueKmBusqueda =
new HibernateSearchObject<OrgaoConcedente>(OrgaoConcedente.class,
pagingTaxaEmbarqueKm.getPageSize());
HibernateSearchObject<OrgaoConcedente> taxaEmbarqueKmBusqueda =new HibernateSearchObject<OrgaoConcedente>(OrgaoConcedente.class,pagingTaxaEmbarqueKm.getPageSize());
taxaEmbarqueKmBusqueda.addFilterEqual("activo", Boolean.TRUE);
if (!txtOrgao.getValue().equals("")) {
taxaEmbarqueKmBusqueda.addFilterLike("descOrgao",
"%" + txtOrgao.getText().trim().concat("%"));
taxaEmbarqueKmBusqueda.addFilterLike("descOrgao","%" + txtOrgao.getText().trim().concat("%"));
}
taxaEmbarqueKmBusqueda.addSortAsc("descOrgao");
plwOrgao.init(taxaEmbarqueKmBusqueda, taxaEmbarqueKmList, pagingTaxaEmbarqueKm);
if (taxaEmbarqueKmList.getData().length == 0) {

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueParadaController.java
View File

@ -88,11 +88,8 @@ public class BusquedaTaxaEmbarqueParadaController extends MyGenericForwardCompos
Map args = new HashMap();
args.put("parada", s);
//args.put("taxaEmbarqueParadaList", taxaEmbarqueParadaList);
openWindow("/gui/tarifas/editarTaxaEmbarqueParada.zul",
Labels.getLabel("busquedaTaxaEmbarqueParadaController.window.title"),
args, MODAL);
openWindow("/gui/tarifas/editarTaxaEmbarqueParada.zul",Labels.getLabel("busquedaTaxaEmbarqueParadaController.window.title"),args, MODAL);
}
private void refreshLista() {

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java
View File

@ -126,8 +126,7 @@ public class EditarTaxaEmbarqueKmController extends MyGenericForwardComposer {
taxaEmbarqueKmList.setItemRenderer(new RenderTaxaEmbarqueKm());
lsTaxaEmbarqueKm = new ArrayList<TaxaEmbarqueKm>();
if (orgao != null
&& orgao.getOrgaoConcedenteId() != null) {
if (orgao != null && orgao.getOrgaoConcedenteId() != null) {
lsTaxaEmbarqueKm = taxaEmbarqueKmService.buscarPorOrgao(orgao);
taxaEmbarqueKmList.setData(lsTaxaEmbarqueKm);
cmbOrgao.setDisabled(Boolean.TRUE);

29
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java
View File

@ -120,7 +120,6 @@ public class EditarTaxaEmbarqueParadaController extends MyGenericForwardComposer
super.doAfterCompose(comp);
parada = (Parada) Executions.getCurrent().getArg().get("parada");
//taxaEmbarqueParada = (TaxaEmbarqueParada) Executions.getCurrent().getArg().get("taxaEmbarqueParada");
taxaEmbarqueParadaList.setItemRenderer(new RenderTaxaEmbarqueParada());
lsTaxaEmbarqueParada = new ArrayList<TaxaEmbarqueParada>();
@ -171,34 +170,6 @@ public class EditarTaxaEmbarqueParadaController extends MyGenericForwardComposer
}
}
// public void onClick$btnApagar(Event ev) throws InterruptedException {
// try {
// int resp = Messagebox.show(
// Labels.getLabel("editarTaxaEmbarqueParadaController.MSG.borrarPergunta"),
// Labels.getLabel("editarTaxaEmbarqueParadaController.window.title"),
// Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
//
// if (resp == Messagebox.YES) {
//
// taxaEmbarqueParadaService.borrar(taxaEmbarqueParada);
//
// Messagebox.show(
// Labels.getLabel("editarTaxaEmbarqueParadaController.MSG.borrarOK"),
// Labels.getLabel("editarTaxaEmbarqueParadaController.window.title"),
// Messagebox.OK, Messagebox.INFORMATION);
//
// taxaEmbarqueParadaList.removeItem(taxaEmbarqueParada);
//
// closeWindow();
// }
// } catch (Exception ex) {
// log.error(ex);
// Messagebox.show(
// Labels.getLabel("MSG.Error"),
// Labels.getLabel("editarTaxaEmbarqueParadaController.window.title"),
// Messagebox.OK, Messagebox.ERROR);
// }
// }
public void onClick$rdNo(Event ev) {
txtKm.setConstraint("");
txtKm.setText("");

2
web/WEB-INF/i3-label_pt_BR.label
View File

@ -7,7 +7,7 @@
# <controler>. <id>. <propiedade> = XXX
#Versao do VentaBoleto:
versao = ADM_20120829_1RC59
versao = ADM_20120831_1RC60
# MSG Defaut:
MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100

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

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaSeguroKm" title="${c:l('busquedaSeguroKmController.window.title')}"
apply="${busquedaSeguroKmController}" contentStyle="overflow:auto"
height="500px" width="750px" border="normal" >
height="450px" width="500px" border="normal" >
<toolbar>
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px"
tooltiptext="${c:l('busquedaSeguroKmController.btnRefresh.tooltiptext')}" />

9
web/gui/tarifas/busquedaTaxaEmbarqueKm.zul
View File

@ -7,22 +7,19 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaTaxaEmbarqueKm" title="${c:l('busquedaTaxaEmbarqueKmController.window.title')}"
apply="${busquedaTaxaEmbarqueKmController}" contentStyle="overflow:auto"
height="500px" width="750px" border="normal" >
height="450px" width="500px" border="normal" >
<toolbar>
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px"
tooltiptext="${c:l('busquedaTaxaEmbarqueKmController.btnRefresh.tooltiptext')}" />
<separator orient="vertical" />
<button id="btnNovo" image="/gui/img/add.png" width="35px"
tooltiptext="${c:l('busquedaTaxaEmbarqueKmController.btnNovo.tooltiptext')}" />
<separator orient="vertical" />
<button id="btnCerrar" onClick="winBusquedaTaxaEmbarqueKm.detach()" image="/gui/img/exit.png" width="35px"
tooltiptext="${c:l('busquedaTaxaEmbarqueKmController.btnCerrar.tooltiptext')}"/>
</toolbar>
<grid fixedLayout="true">
<columns>
<column width="30%" />
<column width="70%" />
<column width="20%" />
<column width="80%" />
</columns>
<rows>
<row>

11
web/gui/tarifas/busquedaTaxaEmbarqueParada.zul
View File

@ -7,16 +7,11 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaTaxaEmbarqueParada" title="${c:l('busquedaTaxaEmbarqueParadaController.window.title')}"
apply="${busquedaTaxaEmbarqueParadaController}" contentStyle="overflow:auto"
height="500px" width="750px" border="normal" >
height="450px" width="500px" border="normal" >
<toolbar>
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px"
tooltiptext="${c:l('busquedaTaxaEmbarqueParadaController.btnRefresh.tooltiptext')}" />
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px" tooltiptext="${c:l('busquedaTaxaEmbarqueParadaController.btnRefresh.tooltiptext')}" />
<separator orient="vertical" />
<button id="btnNovo" image="/gui/img/add.png" width="35px"
tooltiptext="${c:l('busquedaTaxaEmbarqueParadaController.btnNovo.tooltiptext')}" />
<separator orient="vertical" />
<button id="btnCerrar" onClick="winBusquedaTaxaEmbarqueParada.detach()" image="/gui/img/exit.png" width="35px"
tooltiptext="${c:l('busquedaTaxaEmbarqueParadaController.btnCerrar.tooltiptext')}"/>
<button id="btnCerrar" onClick="winBusquedaTaxaEmbarqueParada.detach()" image="/gui/img/exit.png" width="35px" tooltiptext="${c:l('busquedaTaxaEmbarqueParadaController.btnCerrar.tooltiptext')}"/>
</toolbar>
<grid fixedLayout="true">