diff --git a/App_Code/ClsDestinos.vb b/App_Code/ClsDestinos.vb deleted file mode 100644 index ffca8e5a6..000000000 --- a/App_Code/ClsDestinos.vb +++ /dev/null @@ -1,152 +0,0 @@ -Imports System.Data -Imports System.Data.SqlClient -Imports Extensiones - -Public Class ClsDestinos - Implements IDisposable - -#Region "Campos" - 'SQL - Private SqlConexion As SqlConnection - Private SqlAdapter As SqlDataAdapter - Private SqlCommand As SqlCommand - Private SqlTransacc As SqlTransaction - Private Data As DataTable - Private DSet As New DataSet - - Private disposedValue As Boolean = False ' Para detectar llamadas redundantes - 'REGISTRAR CONEXIÓN - Private CveConexion As Integer = 0 - Public ReadOnly Property DtResultados() As DataTable - Get - DtResultados = Data - End Get - End Property - -#End Region - -#Region "Propiedades" - Public Property CveDestino As Integer - Public Property CveUsuario As Integer - Public Property CveEmpresa As Integer - Public Property Destino As String - Public Property Estatus As Boolean - Public Property EsNacional As Boolean - Public Property FechaIng As DateTime -#End Region - -#Region "Funciones básicas" - Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing) - - If TransaccionCompartida Is Nothing Then - SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString - Try - SqlConexion.Open() - Catch ex As Exception - OnError("Ocurrió un error al intentar conectarse a la base de datos.", ex) - End Try - Else - SqlConexion = TransaccionCompartida.Connection - SqlTransacc = TransaccionCompartida - End If - - SqlAdapter = New SqlDataAdapter("", SqlConexion) - ConexionAdd() - End Sub - Private Sub DataAdapter(StrSQL As String, Optional TipoComando As CommandType = CommandType.StoredProcedure) - With SqlAdapter.SelectCommand - .Parameters.Clear() - .CommandText = StrSQL - .CommandType = TipoComando - End With - If Not SqlTransacc Is Nothing Then SqlAdapter.SelectCommand.Transaction = SqlTransacc - Data = New DataTable - End Sub -#Region "Conexiones" - - Private Sub ConexionAdd() - If ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then - Try - DataAdapter("PA_Sis_RegistrarConexion") - With SqlAdapter.SelectCommand.Parameters - .Add("@Clase", SqlDbType.VarChar).Value = Me.GetType().Name - .Add("@Modulo", SqlDbType.VarChar).Value = String.Format("{0}?{1}", HttpContext.Current.Request.Url.AbsolutePath.ToString, HttpContext.Current.Request.QueryString.ToString) - .Add("@IDConexion", SqlDbType.Int).Direction = ParameterDirection.Output - End With - SqlAdapter.Fill(Data) - CveConexion = SqlAdapter.SelectCommand.Parameters("@IDConexion").Value.ToString.ToEntero - Catch ex As Exception - OnError("Ocurrió un error registrar la conexión.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End Try - - End If - End Sub - - Private Sub ConexionClose() - If CveConexion > 0 AndAlso ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then - - DataAdapter(String.Format("UPDATE Sis_Conexiones SET FechaCierre = GETDATE() WHERE CveConexion = {0}", CveConexion), CommandType.Text) - - Try - SqlAdapter.Fill(Data) - - Catch ex As Exception - OnError("Ocurrió un error registrar la conexión.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End Try - CveConexion = 0 - End If - - End Sub -#End Region - Public Function IniciaTransacSQL() As SqlTransaction - If SqlTransacc Is Nothing Then SqlTransacc = SqlConexion.BeginTransaction() - Return SqlTransacc - End Function - Public Sub RollBack() - SqlTransacc.Rollback() - End Sub - Public Sub Commit() - SqlTransacc.Commit() - End Sub - Protected Overridable Sub Dispose(ByVal disposing As Boolean) - If Not disposedValue Then - If disposing Then - If Not Data Is Nothing Then Data.Dispose() : Data = Nothing - If Not DSet Is Nothing Then DSet.Dispose() : DSet = Nothing - If Not SqlAdapter Is Nothing Then SqlAdapter.Dispose() : SqlAdapter = Nothing - If Not SqlCommand Is Nothing Then SqlCommand.Dispose() : SqlCommand = Nothing - If Not SqlTransacc Is Nothing Then SqlTransacc.Dispose() : SqlTransacc = Nothing - If SqlConexion.State <> ConnectionState.Closed Then SqlConexion.Close() - If Not SqlConexion Is Nothing Then SqlConexion.Dispose() : SqlConexion = Nothing - - End If - End If - disposedValue = True - End Sub - Public Sub Dispose() Implements IDisposable.Dispose - ConexionClose() - Dispose(True) - GC.SuppressFinalize(Me) - End Sub -#End Region - Public Function GetDestinos(Optional CveRuta As Integer = 0) As Boolean - Dim Retorno As Boolean = False - DataAdapter("PA_Trans_DestinosGet") - If CveRuta <> 0 Then - With SqlAdapter.SelectCommand.Parameters - .Add("@CveRuta", SqlDbType.Int).Value = CveRuta - End With - End If - - Try - SqlAdapter.Fill(Data) - Retorno = True - Catch ex As Exception - OnError("Ocurrió un error al obtener los destino.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) - End Try - - Return Retorno - End Function - -End Class diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 4574ac667..64be87ff7 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -9621,9 +9621,9 @@ Public Class ClsPaginas #End Region #Region "Transportes" - PaginaDict.Add("/Transportes/ListadoContratos.aspx".ToUpper(), 598) - PaginaDict.Add("/Transportes/ListadoViajes.aspx".ToUpper(), 599) - PaginaDict.Add("/Transportes/ListadoBoletos.aspx".ToUpper(), 600) + PaginaDict.Add("/Transportes/RepContratos.aspx".ToUpper(), 598) + PaginaDict.Add("/Transportes/RepViajes.aspx".ToUpper(), 599) + PaginaDict.Add("/Transportes/RepBoletos.aspx".ToUpper(), 600) PaginaDict.Add("/Transportes/Boletos.aspx".ToUpper(), 601) #End Region 'Antes de aquí. diff --git a/App_Code/ClsTransportes.vb b/App_Code/ClsTransportes.vb index 6705d9007..061c528a7 100644 --- a/App_Code/ClsTransportes.vb +++ b/App_Code/ClsTransportes.vb @@ -241,7 +241,7 @@ Public Class ClsTransportes #End Region #Region "Boletos" - Public Function AddViajesPasajeros(CveViaje As Integer, CveDestinoOrigen As Integer, CveDestinoFinal As Integer, Importe As Decimal, Asiento As Integer, Nombre As String, Visa As String, Celular As String, Sexo As Boolean, Observacion As String, CveUsuario As Integer) As Integer + Public Function AddViajesPasajeros(CveViaje As Integer, CveDestinoOrigen As Integer, CveDestinoFinal As Integer, Importe As Decimal, Asiento As Integer, Nombre As String, Visa As String, Celular As String, Sexo As Boolean, Observacion As String, CveUsuario As Integer, CveVendedor As Integer) As Integer Dim Retorno As Integer = -1 DataAdapter("PA_Trans_ViajesPasajerosAdd") @@ -259,6 +259,7 @@ Public Class ClsTransportes .Add("@Sexo", SqlDbType.Bit).Value = Sexo .Add("@Observacion", SqlDbType.VarChar).Value = Observacion .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveVendedor", SqlDbType.Int).Value = CveVendedor End With @@ -299,7 +300,7 @@ Public Class ClsTransportes Public Function UpdateViajesPasajeros(CveViajePasajero As Integer, Optional Estatus As Boolean = True, Optional Activar As Boolean = False) As Boolean Dim Retorno As Boolean = False - DataAdapter("PA_Trans_ViajesPasajerosUpdate") + DataAdapter("PA_Trans_ViajesPasajerosUpdate") With SqlAdapter.SelectCommand.Parameters .Add("@CveViajePasajero", SqlDbType.Int).Value = CveViajePasajero .Add("@Estatus", SqlDbType.Int).Value = Estatus @@ -316,6 +317,8 @@ Public Class ClsTransportes End Function #End Region + +#Region "Destinos" Public Function GetDestinos(Optional CveRuta As Integer = 0) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Trans_DestinosGet") @@ -334,6 +337,7 @@ Public Class ClsTransportes Return Retorno End Function +#End Region #Region "Tarifas" Public Function GetDestinosTarifas(CveDestinoOrigen As Integer, CveDestinoFinal As Integer) As Boolean diff --git a/Transportes/Boletos.aspx b/Transportes/Boletos.aspx index 715652dba..a7201422a 100644 --- a/Transportes/Boletos.aspx +++ b/Transportes/Boletos.aspx @@ -67,14 +67,14 @@ - +<%--
  • Viajes
  • -
    +
    --%> diff --git a/Transportes/Boletos.aspx.vb b/Transportes/Boletos.aspx.vb index cb4840b0e..8958a0446 100644 --- a/Transportes/Boletos.aspx.vb +++ b/Transportes/Boletos.aspx.vb @@ -154,7 +154,7 @@ Partial Class Boletos Try AsientoSeleccionado = AsientoSeleccionado.Replace("A", "") - Dim retorno As Integer = ObjTransporte.AddViajesPasajeros(CveViaje, DdlPartida.SelectedValue.ToEntero, DdlDestino.SelectedValue.ToEntero, Importe, AsientoSeleccionado.ToEntero, TxtNombre.Text, TxtVisa.Text, TxtCelular.Text, CBool(RblSexo.SelectedValue), TxtObservaciones.Text, UsuarioActual.CveUsuario) + Dim retorno As Integer = ObjTransporte.AddViajesPasajeros(CveViaje, DdlPartida.SelectedValue.ToEntero, DdlDestino.SelectedValue.ToEntero, Importe, AsientoSeleccionado.ToEntero, TxtNombre.Text, TxtVisa.Text, TxtCelular.Text, CBool(RblSexo.SelectedValue), TxtObservaciones.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) If retorno > 1 Then ObjTransporte.Commit() diff --git a/Transportes/ListadoBoletos.aspx b/Transportes/RepBoletos.aspx similarity index 97% rename from Transportes/ListadoBoletos.aspx rename to Transportes/RepBoletos.aspx index f178089be..a8ad845e8 100644 --- a/Transportes/ListadoBoletos.aspx +++ b/Transportes/RepBoletos.aspx @@ -1,5 +1,5 @@ <%@ Page Language="VB" Title="Transportes V&A - Boletos" AutoEventWireup="false" - MasterPageFile="~/Site.master" CodeFile="ListadoBoletos.aspx.vb" + MasterPageFile="~/Site.master" CodeFile="RepBoletos.aspx.vb" Inherits="ListadoBoletos" EnableEventValidation="true" %> @@ -14,9 +14,9 @@ - +<%-- - +--%>
    @@ -107,8 +107,6 @@
    - -
    diff --git a/Transportes/ListadoBoletos.aspx.vb b/Transportes/RepBoletos.aspx.vb similarity index 98% rename from Transportes/ListadoBoletos.aspx.vb rename to Transportes/RepBoletos.aspx.vb index 24a41e814..5c6020137 100644 --- a/Transportes/ListadoBoletos.aspx.vb +++ b/Transportes/RepBoletos.aspx.vb @@ -28,7 +28,7 @@ Partial Class ListadoBoletos Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not IsPostBack Then If Request.QueryString("CveViaje") Is Nothing Then - Response.Redirect("/Transportes/ListadoViajes.aspx") + Response.Redirect("/Transportes/RepViajes.aspx") End If CveViaje = Request.QueryString("CveViaje").ToEntero Ruta = Request.QueryString("Ruta") diff --git a/Transportes/ListadoContratos.aspx b/Transportes/RepContratos.aspx similarity index 99% rename from Transportes/ListadoContratos.aspx rename to Transportes/RepContratos.aspx index 9f37b10b0..49169da2a 100644 --- a/Transportes/ListadoContratos.aspx +++ b/Transportes/RepContratos.aspx @@ -1,5 +1,5 @@ <%@ Page Language="VB" AutoEventWireup="false" Title="Transportes V&A - Contratos" MasterPageFile="~/Site.master" - CodeFile="ListadoContratos.aspx.vb" + CodeFile="RepContratos.aspx.vb" Inherits="ListadoContratos" %> @@ -38,14 +38,14 @@
  • Agregar Contrato
  • -
  • - + Contratos
  • - Viajes -
  • + --%> diff --git a/Transportes/ListadoContratos.aspx.vb b/Transportes/RepContratos.aspx.vb similarity index 100% rename from Transportes/ListadoContratos.aspx.vb rename to Transportes/RepContratos.aspx.vb diff --git a/Transportes/ListadoViajes.aspx b/Transportes/RepViajes.aspx similarity index 99% rename from Transportes/ListadoViajes.aspx rename to Transportes/RepViajes.aspx index 791cbfd9e..45d4d170c 100644 --- a/Transportes/ListadoViajes.aspx +++ b/Transportes/RepViajes.aspx @@ -1,5 +1,5 @@ <%@ Page Language="VB" Title="Transportes V&A - Viajes" AutoEventWireup="false" MasterPageFile="~/Site.master" - CodeFile="ListadoViajes.aspx.vb" + CodeFile="RepViajes.aspx.vb" Inherits="ListadoViajes" %> @@ -27,14 +27,14 @@
  • Agregar viaje
  • -
  • +<%--
  • Contratos
  • Viajes -
  • + --%>
    diff --git a/Transportes/ListadoViajes.aspx.vb b/Transportes/RepViajes.aspx.vb similarity index 97% rename from Transportes/ListadoViajes.aspx.vb rename to Transportes/RepViajes.aspx.vb index 9a0ca63a4..980136983 100644 --- a/Transportes/ListadoViajes.aspx.vb +++ b/Transportes/RepViajes.aspx.vb @@ -1,6 +1,5 @@ Option Explicit On Option Strict On -Imports ADSNetLibrary.SIGAPI.Helpers Imports Extensiones.ModExtensiones Partial Class ListadoViajes @@ -58,7 +57,7 @@ Partial Class ListadoViajes ObjRutas.Dispose() 'Lista Destinos' - Dim ObjDestinos As New ClsDestinos() + Dim ObjDestinos As New ClsTransportes() If ObjDestinos.GetDestinos() Then If ObjDestinos.DtResultados.Rows.Count > 0 Then @@ -72,8 +71,9 @@ Partial Class ListadoViajes End If End If ObjRutas.Dispose() + 'Lista Chofer' - DdlChofer.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa) + DdlChofer.DataSource = GlobalDTRHPersonal(185) DdlChofer.DataBind() DdlChofer.Items.Insert(0, New ListItem("Seleccione Chofer", "")) @@ -256,7 +256,7 @@ Partial Class ListadoViajes Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) Dim CveViaje As String = GvRow.DataKey("CveViaje") Dim Ruta As String = GvRow.DataKey("Ruta") - Response.Redirect(String.Format("~/Transportes/ListadoBoletos.aspx?CveViaje={0}&Ruta={1}", CveViaje, Ruta)) + Response.Redirect(String.Format("~/Transportes/RepBoletos.aspx?CveViaje={0}&Ruta={1}", CveViaje, Ruta)) End Sub End Class