Merge pull request '58010 - Falha seleção Bloqueio - ADM' (#13) from AL-1845 into master

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/13
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master 1.0.9
Valdir Cordeiro 2022-12-06 13:52:39 +00:00
commit bc566ef7c8
4 changed files with 226 additions and 185 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>
<packaging>war</packaging>
<distributionManagement>

View File

@ -15,8 +15,6 @@ import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Button;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox;
@ -103,15 +101,8 @@ public class BusquedaConfRestricaoCanalVentaController extends MyGenericForwardC
lsTipoPtoVta = tipoPtoVtaService.obtenerTodos();
super.doAfterCompose(comp);
cmbRuta.setItemRenderer(new MyComboRutaRenderer());
confRestricaoCanalVentaList.setItemRenderer(new RenderConfRestricaoCanalVenta());
confRestricaoCanalVentaList.addEventListener("onDoubleClick", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
ConfRestricaoCanalVenta conf = (ConfRestricaoCanalVenta) confRestricaoCanalVentaList.getSelected();
verConfRestricaoCanalVenta(conf);
}
});
confRestricaoCanalVentaList.setItemRenderer(new RenderConfRestricaoCanalVenta(confRestricaoCanalVentaList, this));
refreshLista();
}

View File

@ -1,38 +1,74 @@
package com.rjconsultores.ventaboletos.web.utilerias.render;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
import org.zkoss.util.resource.Labels;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.ListitemRenderer;
import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta;
import com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional.BusquedaConfRestricaoCanalVentaController;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
public class RenderConfRestricaoCanalVenta implements ListitemRenderer {
private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
private MyListbox confRestricaoCanalVentaList;
private BusquedaConfRestricaoCanalVentaController telaPrincipal;
public RenderConfRestricaoCanalVenta() {
super();
}
public RenderConfRestricaoCanalVenta(MyListbox confList, BusquedaConfRestricaoCanalVentaController telaMae) {
super();
confRestricaoCanalVentaList = confList;
telaPrincipal = telaMae;
}
public void render(Listitem lstm, Object o) throws Exception {
ConfRestricaoCanalVenta confRestricaoCanalVenta = (ConfRestricaoCanalVenta) o;
EventListener doubleClick = new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
verConfRestricaoCanalVenta(confRestricaoCanalVenta);
}
};
Listcell lc = new Listcell();
lc = new Listcell(confRestricaoCanalVenta.getConfRestricaoCanalVentaId().toString() == null ? "-" : confRestricaoCanalVenta.getConfRestricaoCanalVentaId().toString());
lc.addEventListener("onDoubleClick", doubleClick);
lc.setParent(lstm);
lc = new Listcell(confRestricaoCanalVenta.getRuta() == null ? "-" : MyComboRutaRenderer.buscarDescricaoComboRuta(confRestricaoCanalVenta.getRuta()));
lc.setParent(lstm);
lc = new Listcell(confRestricaoCanalVenta.getDescConfRestricaoCanalVenta() == null ? "-" : confRestricaoCanalVenta.getDescConfRestricaoCanalVenta());
lc.addEventListener("onDoubleClick", doubleClick);
lc.setParent(lstm);
lc = new Listcell(confRestricaoCanalVenta.getCorridaId() == null ? "-" : confRestricaoCanalVenta.getCorridaId().toString());
lc.addEventListener("onDoubleClick", doubleClick);
lc.setParent(lstm);
lc = new Listcell(confRestricaoCanalVenta.getFecCorrida() == null ? "-" : sdf.format(confRestricaoCanalVenta.getFecCorrida()));
lc.addEventListener("onDoubleClick", doubleClick);
lc.setParent(lstm);
lc = new Listcell(buscarDescricaoVigencia(confRestricaoCanalVenta));
lc.addEventListener("onDoubleClick", doubleClick);
lc.setParent(lstm);
lc.setParent(lstm);
lstm.setAttribute("data", confRestricaoCanalVenta);
@ -45,4 +81,18 @@ public class RenderConfRestricaoCanalVenta implements ListitemRenderer {
return " - ";
}
@SuppressWarnings({ "rawtypes", "unchecked" })
private void verConfRestricaoCanalVenta(ConfRestricaoCanalVenta conf) {
if (conf == null) {
return;
}
Map args = new HashMap();
args.put("confRestricaoCanalVenta", conf);
args.put("confRestricaoCanalVentaList", confRestricaoCanalVentaList);
telaPrincipal.openWindow("/gui/esquema_operacional/editarConfRestricaoCanalVenta.zul",
Labels.getLabel("editarConfRestricaoCanalVentaController.window.title"),
args, PantallaUtileria.MODAL);
}
}

View File

@ -147,7 +147,7 @@
</toolbar>
<paging id="pagingConfRestricaoCanalVenta" pageSize="20" />
<listbox id="confRestricaoCanalVentaList"
<listbox id="confRestricaoCanalVentaList" nonselectableTags="*"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
multiple="true" checkmark="true" vflex="true" height="95%">
<listhead sizable="true">