diff --git a/pom.xml b/pom.xml
index 38b817028..f30a6ae7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.165.1
+ 1.165.2
war
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java
index 471337416..c89899e39 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java
@@ -7,11 +7,15 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.sql.DataSource;
import javax.xml.bind.DatatypeConverter;
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -34,6 +38,7 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.TrustStrategy;
+import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
@@ -101,6 +106,9 @@ public class CotizarExpresoController extends MyGenericForwardComposer{
@Autowired
private LogAuditoriaService logAuditoriaService;
+ @Autowired
+ private DataSource dataSource;
+
SolicitudExpreso expreso;
SolicitudExpreso expresoClone;
@@ -116,9 +124,10 @@ public class CotizarExpresoController extends MyGenericForwardComposer{
private MyTextbox txtSitioRecogidaIda;
private MyTextbox txtSitioRecogidaRegreso;
private MyTextbox archivoCotizacionPath;
+ private MyTextbox txtObservaciones;
- private List lsOrigen;
- private List lsDestino;
+ private List lsOrigen;
+ private List lsDestino;
private Combobox cmbOrigen;
private Combobox cmbDestino;
@@ -131,16 +140,22 @@ public class CotizarExpresoController extends MyGenericForwardComposer{
@Override
public void doAfterCompose(Component comp) throws Exception {
- List listParadas = paradaService.obtenerTodos();
+ StringBuilder sQuery = new StringBuilder();
+ sQuery.append("SELECT DESCPARADA FROM PARADA WHERE INDDISPONIBLETOTALBUS = 0");
- lsOrigen = new ArrayList();
- lsOrigen.addAll(listParadas);
+ Connection conn = dataSource.getConnection();
- lsDestino = new ArrayList();
- lsDestino.addAll(listParadas);
+ PreparedStatement stmt = conn.prepareStatement(sQuery.toString());
- //lsOrigen = paradaService.obtenerTodos();
- //lsDestino = paradaService.obtenerTodos();
+ ResultSet rset = stmt.executeQuery();
+
+ lsOrigen = new ArrayList();
+ lsDestino = new ArrayList();
+
+ while(rset.next()) {
+ lsOrigen.add(rset.getString("DESCPARADA"));
+ lsDestino.add(rset.getString("DESCPARADA"));
+ }
super.doAfterCompose(comp);
@@ -171,6 +186,7 @@ public class CotizarExpresoController extends MyGenericForwardComposer{
txtFechaRegreso.setValue(expreso.getFechaHoraRegreso() == null ? "" : expreso.getFechaHoraRegreso().toString());
txtSitioRecogidaIda.setValue(expreso.getDescSitioPartidaIda() == null ? "" : expreso.getDescSitioPartidaIda());
txtSitioRecogidaRegreso.setValue(expreso.getDescSitioPartidaRegreso() == null ? "" : expreso.getDescSitioPartidaRegreso());
+ txtObservaciones.setValue(expreso.getDescObservacionIda() == null ? "" : expreso.getDescObservacionIda());
refreshLista();
}
@@ -323,19 +339,19 @@ public class CotizarExpresoController extends MyGenericForwardComposer{
this.cmbOrigen = cmbOrigen;
}
- public List getLsOrigen() {
+ public List getLsOrigen() {
return lsOrigen;
}
- public void setLsOrigen(List lsOrigen) {
+ public void setLsOrigen(List lsOrigen) {
this.lsOrigen = lsOrigen;
}
- public List getLsDestino() {
+ public List getLsDestino() {
return lsDestino;
}
- public void setLsDestino(List lsDestino) {
+ public void setLsDestino(List lsDestino) {
this.lsDestino = lsDestino;
}
diff --git a/web/gui/expressos/cotizarExpreso.zul b/web/gui/expressos/cotizarExpreso.zul
index b2ae1a38e..5419de186 100644
--- a/web/gui/expressos/cotizarExpreso.zul
+++ b/web/gui/expressos/cotizarExpreso.zul
@@ -10,7 +10,7 @@
title="${c:l('winCotizarExpresso.title')}"
border="normal"
height="484px"
- width="712px"
+ width="1012px"
position="center"
mode="overlapped"
apply="${cotizarExpresoController}">
@@ -24,10 +24,10 @@
-
-
-
-
+
+
+
+
@@ -39,6 +39,7 @@
@@ -77,6 +78,14 @@
disabled="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
+
+
+
+