diff --git a/Transportes/RepContratos.aspx b/Transportes/RepContratos.aspx index bea5d7eca..aab73242d 100644 --- a/Transportes/RepContratos.aspx +++ b/Transportes/RepContratos.aspx @@ -8,7 +8,7 @@ - + --%> -
  • - Agregar Contrato + + +
  • + Agregar Contrato
    • + +
  • Generar PDF
    • @@ -60,86 +64,116 @@ <%-- Filtros --%> -
    -
    -
    - - -
    + + +
    +
    +
    + + +
    +
    +
    + +
    + Fecha Inicio: +
    +
    +
    + + + + +
    + + + + + + +
    +
    + Fecha Fin: + +
    +
    +
    + + + + +
    + + + + + + +
    -
    - - -
    + +
    + + <%-- + + --%> +
    -
    - - -
    + + +
    + + +
    + +
    -
    - -
    - - +
    -
    -
    - - -
    -
    + - -
    - -
    - - -
    -
    - -
    +     +     <%-- Listado de Contratos --%> @@ -149,7 +183,7 @@ - + diff --git a/Transportes/RepContratos.aspx.vb b/Transportes/RepContratos.aspx.vb index 33482ca77..378662391 100644 --- a/Transportes/RepContratos.aspx.vb +++ b/Transportes/RepContratos.aspx.vb @@ -1,7 +1,5 @@ Option Explicit On Option Strict On -Imports System.Data -Imports System.Data.SqlClient Imports Extensiones Imports Extensiones.ModExtensiones Imports Microsoft.Reporting.WebForms @@ -10,14 +8,7 @@ Partial Class ListadoContratos Inherits ClsPaginas #Region "Propiedad" - Private Property DtAvanceDocumento As DataTable - Get - Return CType(ViewState("DtAvanceDocumento"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtAvanceDocumento") = value - End Set - End Property + #End Region Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load txtFechaI.Text = DateTime.Now.AddMonths(-1).ToString("MM/dd/yyyy").Replace(" ", "T") @@ -38,7 +29,7 @@ Partial Class ListadoContratos DdlTIpoUnidad.DataBind() DdlTIpoUnidad.Items.Insert(0, New ListItem("-", "")) 'Lista Chofer' - DdlChofer.DataSource = GlobalDTRHPersonal(188) + DdlChofer.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa) DdlChofer.DataBind() DdlChofer.Items.Insert(0, New ListItem("-", "")) End Sub @@ -60,7 +51,7 @@ Partial Class ListadoContratos Dim ObjFolio As New ClsGralFolios If ObjFolio.GetFolios("Con", UsuarioActual.CveEmpresa, CveSubProyecto:=CveSubProyecto) Then If ObjFolio.DtResultados.Rows.Count > 0 Then - Dim drr As DataRow = ObjFolio.DtResultados.FiltroPrimero("") + Dim drr As Data.DataRow = ObjFolio.DtResultados.FiltroPrimero("") LbFolio.Text = $"{drr("Serie").ToString}-{drr("FActual").ToString}" End If End If @@ -123,7 +114,7 @@ Partial Class ListadoContratos Dim Imagen As New IO.FileInfo($"{UsuarioActual.Empresa.Ruta}/Logo.png") Dim logouri As String = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa) Dim Cliente As String = If(DdlClientes.SelectedValue = "-1", "", $" Cliente: {DdlClientes.SelectedText}") - Dim dt As DataTable = ObjContratos.DtResultados + Dim dt As Data.DataTable = ObjContratos.DtResultados Dim params As New List(Of ReportParameter) From { New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa), New ReportParameter("FechaInicio", "-1"), @@ -142,7 +133,7 @@ Partial Class ListadoContratos Dim fechaInicial As String = txtFechaI.Text Dim fechaFinal As String = txtFechaF.Text - Dim cliente As String = If(DdlClientesConsulta.SelectedValue = "", "", $"C.CveCliente = {DdlClientesConsulta.SelectedValue} AND") + Dim cliente As String = If(DdlClientes.SelectedValue = "", "", $"C.CveCliente = {DdlClientes.SelectedValue} AND") Dim estatus As String = "" Dim nombreEstatus As String = "" Dim innerEstatus As String = "" @@ -174,36 +165,21 @@ Partial Class ListadoContratos End If - Dim intervalo As String = If(DdlEstatusConsulta.SelectedValue = "" And DdlClientesConsulta.SelectedValue = "", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'") + 'Dim intervalo As String = If(DdlEstatusConsulta.SelectedValue = "" And DdlClientes.SelectedValue = "", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'") - Dim query As String = $"SELECT *, ISNULL(Cli.NombreComercial,'') AS NombreComercial {nombreEstatus} FROM Con_Contratos C LEFT JOIN Clientes Cli with(nolock) ON Cli.CveCliente = C.CveCliente {innerEstatus} WHERE {cliente} {estatus} {intervalo}" + 'Dim query As String = $"SELECT *, ISNULL(Cli.NombreComercial,'') AS NombreComercial {nombreEstatus} FROM Con_Contratos C LEFT JOIN Clientes Cli with(nolock) ON Cli.CveCliente = C.CveCliente {innerEstatus} WHERE {cliente} {estatus} {intervalo}" - Using connection As New SqlConnection(ConfigurationManager.ConnectionStrings("Conexion").ConnectionString) - Using command As New SqlCommand(query, connection) - connection.Open() - Dim reader As SqlDataReader = command.ExecuteReader() - GvContratos.DataSource = reader - GvContratos.DataBind() - End Using - End Using + 'Using connection As New SqlConnection(ConfigurationManager.ConnectionStrings("Conexion").ConnectionString) + ' Using command As New SqlCommand(query, connection) + ' connection.Open() + ' Dim reader As SqlDataReader = command.ExecuteReader() + ' GvContratos.DataSource = reader + ' GvContratos.DataBind() + ' End Using + 'End Using UpTitulos.Update() End Sub - Protected Sub Expandir(sender As Object, e As EventArgs) - If PnExpandirConsulta.Visible Then - PnExpandirConsulta.Visible = False - BtnExpandir.Text = "↑" - Else - PnExpandirConsulta.Visible = True - BtnExpandir.Text = "↓" - End If - End Sub - - Protected Sub GoContratoDetalle(sender As Object, e As EventArgs) - Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) - Dim CveContrato As String = GvRow.DataKey("CveContrato") - Response.Redirect(String.Format("~/Transportes/RepContratoDetalle.aspx?CveContrato={0}", CveContrato)) - End Sub End Class diff --git a/Transportes/RepContratosCalendario.aspx b/Transportes/RepContratosCalendario.aspx index 271280696..471b4bdec 100644 --- a/Transportes/RepContratosCalendario.aspx +++ b/Transportes/RepContratosCalendario.aspx @@ -5,51 +5,7 @@ @@ -72,133 +28,163 @@ <%--Calendario Tab--%> -
    -
    -
    - - -
    -
    -
    - -
    - - - - + <%-- Filtros --%> + + +
    +
    +
    + + +
    +
    +
    + +
    + + + + -
    -
    -
    -
    +
    +
    +
    +
    - -
    + +
    -
    -
    -
    -
    -
    -

     

    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +

     

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +     +     + <%--Contratos Tab--%> - + - <%-- Filtros --%> -
    -
    -
    - - -
    + <%-- Filtros --%> + + +
    +
    +
    + + +
    +
    +
    + +
    + Fecha Inicio: +
    +
    +
    + + + + +
    + + + + + + +
    +
    + Fecha Fin: + +
    +
    +
    + + + + +
    + + + + + + +
    -
    - - -
    + +
    + + <%-- + + --%> +
    -
    - - -
    + + +
    + + +
    + +
    -
    - -
    - - +
    +
    - -
    - - -
    -
    - - -
    - -
    - - -
    -
    - -
    - -
    - - -
    -
    - -
    - -
    - - -
    -
    -     -
    +     +     <%-- Contratos --%> @@ -209,11 +195,11 @@ - + - + Fecha
    Salida @@ -229,7 +215,7 @@     - + @@ -263,7 +249,7 @@ - + @@ -274,7 +260,6 @@ -     diff --git a/Transportes/RepContratosCalendario.aspx.vb b/Transportes/RepContratosCalendario.aspx.vb index db3ce974e..057c83d93 100644 --- a/Transportes/RepContratosCalendario.aspx.vb +++ b/Transportes/RepContratosCalendario.aspx.vb @@ -54,9 +54,7 @@ Partial Class RepContratosCalendario DtAvance = ObjContratos.DtResultados If ObjContratos.GetContratosEstatus(UsuarioActual.CveEmpresa) Then - DdlEstatusConsulta.DataSource = ObjContratos.DtResultados - DdlEstatusConsulta.DataBind() - DdlEstatusConsulta.Items.Insert(0, New ListItem("-", "")) + DdlEstatusContrato.DataSource = ObjContratos.DtResultados DdlEstatusContrato.DataBind() @@ -84,13 +82,28 @@ Partial Class RepContratosCalendario DdlAF.Items.Insert(0, New ListItem("-", "")) 'Lista Chofer' - DdlChofer.DataSource = GlobalDTRHPersonal(185) + DdlChofer.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("", "NombreCompleto") DdlChofer.DataBind() DdlChofer.Items.Insert(0, New ListItem("-", "")) - DdlChofer2.DataSource = GlobalDTRHPersonal(185) + + DdlChofer2.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("", "NombreCompleto") DdlChofer2.DataBind() DdlChofer2.Items.Insert(0, New ListItem("-", "")) + DdlChoferFiltro.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("", "NombreCompleto") + DdlChoferFiltro.DataBind() + DdlChoferFiltro.Items.Insert(0, New ListItem("Todos", "")) + + DdlTipoUnidad.DataSource = GlobalDTTipoActivoFijo(UsuarioActual.CveEmpresa).FiltraParametros("MedidaVehicularClave IN (2,3)") + DdlTipoUnidad.DataBind() + DdlTipoUnidad.Items.Insert(0, New ListItem("Todos", "-1")) + + DdlEstatusConsulta.DataSource = GlobalDTContratosEstatus(UsuarioActual.CveEmpresa) + DdlEstatusConsulta.DataBind() + DdlEstatusConsulta.Items.Insert(0, New ListItem("Todos", "-1")) + + CargarCentrosDeCosto(Nothing, DdlSubProyectos, Nothing, LblSubProyecto) + End Sub Private Sub OnRowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvContratos.RowDataBound @@ -103,7 +116,6 @@ Partial Class RepContratosCalendario RegistraScript("$('#ModalActualizar').modal('show');") End Sub - Protected Sub UpdateContrato(sender As Object, e As EventArgs) Dim ObjContratos As New ClsContratos ObjContratos.IniciaTransacSQL() @@ -144,7 +156,7 @@ Partial Class RepContratosCalendario Dim fechaInicial As String = txtFechaI.Text Dim fechaFinal As String = txtFechaF.Text - Dim cliente As String = If(DdlClientesConsulta.SelectedValue = "", "", $"C.CveCliente = {DdlClientesConsulta.SelectedValue} AND") + Dim cliente As String = If(DdlClientes.SelectedValue = "", "", $"C.CveCliente = {DdlClientes.SelectedValue} AND") Dim estatus As String = "" Dim nombreEstatus As String = "" Dim innerEstatus As String = "" @@ -174,34 +186,9 @@ Partial Class RepContratosCalendario 'nombreTipoUnidad = ", CE.ContratoTipoUnidad As ContratoTipoUnidad1" 'innerTipoUnidad = " INNER JOIN Con_ContratosTipoUnidad CE with(nolock) ON CE.CveContratoTipoUnidad = C.CveContratosEstatus " End If - - - Dim intervalo As String = If(DdlEstatusConsulta.SelectedValue = "" And DdlClientesConsulta.SelectedValue = "", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'", $"FechaInicial BETWEEN '{fechaInicial}' AND '{fechaFinal}'") - - - Dim query As String = $"SELECT *, ISNULL(Cli.NombreComercial,'') AS NombreComercial {nombreEstatus} FROM Con_Contratos C LEFT JOIN Clientes Cli with(nolock) ON Cli.CveCliente = C.CveCliente {innerEstatus} WHERE {cliente} {estatus} {intervalo}" - - Using connection As New SqlConnection(ConfigurationManager.ConnectionStrings("Conexion").ConnectionString) - Using command As New SqlCommand(query, connection) - connection.Open() - Dim reader As SqlDataReader = command.ExecuteReader() - GvContratos.DataSource = reader - GvContratos.DataBind() - End Using - End Using - UpTitulos.Update() End Sub - Protected Sub Expandir(sender As Object, e As EventArgs) - If PnExpandirConsulta.Visible Then - PnExpandirConsulta.Visible = False - BtnExpandir.Text = "↑" - Else - PnExpandirConsulta.Visible = True - BtnExpandir.Text = "↓" - End If - End Sub Protected Sub LnkExcel_Click(sender As Object, e As EventArgs) Handles LnkExcel.Click GvContratos.ExportToExcel("ReporteCompras" & NowADS().ToShortDateString) End Sub @@ -226,9 +213,5 @@ Partial Class RepContratosCalendario Alert("No hay datos consultados", TipoMensaje.MsgAdvertencia) End If End Sub - Protected Sub GoContratoDetalle(sender As Object, e As EventArgs) - Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow) - Dim CveContrato As String = GvRow.DataKey("CveContrato") - Response.Redirect(String.Format("~/Transportes/RepContratoDetalle.aspx?CveContrato={0}", CveContrato)) - End Sub + End Class