-

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