--

Transportes/RepContratosCalendario.aspx.vb

@@ -11,8 +11,8 @@ Partial Class RepContratosCalendario
 #End Region
 
     Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
-        txtFechaI.Text = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd").Replace(" ", "T")
-        txtFechaF.Text = DateTime.Now.AddDays(7).ToString("yyyy-MM-dd").Replace(" ", "T")
+        txtFechaI.Text = DateTime.Now.AddMonths(-1).ToString("MM/dd/yyyy").Replace(" ", "T")
+        txtFechaF.Text = DateTime.Now.AddDays(7).ToString("MM/dd/yyyy").Replace(" ", "T")
 
         If Not IsPostBack Then
             CargaCombos()
@@ -66,6 +66,9 @@ Partial Class RepContratosCalendario
         DdlChofer.DataSource = GlobalDTRHPersonal(185)
         DdlChofer.DataBind()
         DdlChofer.Items.Insert(0, New ListItem("-", ""))
+        DdlChofer1.DataSource = GlobalDTRHPersonal(185)
+        DdlChofer1.DataBind()
+        DdlChofer1.Items.Insert(0, New ListItem("-", ""))
 
     End Sub
 
@@ -80,25 +83,26 @@ Partial Class RepContratosCalendario
     End Sub
 
     Protected Sub Consultar(sender As Object, e As EventArgs)
-        If DdlClientesConsulta.SelectedValue = "" Then
-            Alert("Debe seleccionar al cliente", TipoMensaje.MsgAdvertencia)
-            Exit Sub
+        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 estatus As String = ""
+        Dim nombreEstatus As String = ""
+        Dim innerEstatus As String = ""
+        If (DdlEstatusConsulta.SelectedValue <> "") Then
+            estatus = $"C.CveContratosEstatus = {DdlEstatusConsulta.SelectedValue} AND"
+            nombreEstatus = ", CE.ContratoEstatus As ContratoEstatus1"
+            innerEstatus = "INNER JOIN Con_ContratosEstatus CE with(nolock) ON CE.CveContratoEstatus = 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 cliente As Integer = DdlClientesConsulta.SelectedValue.ToEntero
-        Dim estatus As Integer = DdlEstatusConsulta.SelectedValue.ToEntero
-        Dim fechaInicial As DateTime = txtFechaI.Text.ToDate
-        Dim fechaFinal As DateTime = txtFechaF.Text.ToDate
 
-        Dim query As String = "SELECT *,  ISNULL(Cli.NombreComercial,'') AS NombreComercial, RH.NombreCompleto AS NombreCompleto FROM Con_Contratos C LEFT JOIN Clientes Cli with(nolock) ON Cli.CveCliente = C.CveCliente LEFT JOIN RH_Personal RH with(nolock) ON C.CveChofer = RH.CvePersonal WHERE C.CveCliente = @Cliente AND EstatusContrato = @Estatus AND FechaInicial BETWEEN @FechaInicial AND @FechaFinal"
+        Dim query As String = $"SELECT *,  ISNULL(Cli.NombreComercial,'') AS NombreCompleto {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)
-                command.Parameters.AddWithValue("@Cliente", cliente)
-                command.Parameters.AddWithValue("@Estatus", estatus)
-                command.Parameters.AddWithValue("@FechaInicial", fechaInicial)
-                command.Parameters.AddWithValue("@FechaFinal", fechaFinal)
-
                 connection.Open()
                 Dim reader As SqlDataReader = command.ExecuteReader()
                 GvContratos.DataSource = reader
@@ -109,11 +113,12 @@ Partial Class RepContratosCalendario
         UpTitulos.Update()
     End Sub
     Protected Sub UpdateContrato(sender As Object, e As EventArgs)
-
+        Dim fechaS As Date = TxtFechaSalida.Text.ToDate
+        Dim fechaR As Date = TxtFechaRegreso.Text.ToDate
         Dim ObjContratos As New ClsContratos
         ObjContratos.IniciaTransacSQL()
 
-        If ObjContratos.UpdateContratoAF(CveContrato.Value.ToEntero, DdlAF.SelectedValue.ToEntero, DdlChofer.SelectedValue.ToEntero, UsuarioActual.CveEmpresa) Then
+        If ObjContratos.UpdateContratos(CveContrato.Value.ToEntero, "", TxtDescripcion.Text, "", -1, DdlClientes.SelectedValue.ToEntero, -1, fechaS, fechaR, TxtUbicacion.Text, "", 10, -1, -1, -1, -1, "", "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, TxtAnticipo.Text.ToDecimal, TxtPesos.Text.ToDecimal, TxtDolares.Text.ToDecimal, -1, 0, CveContratoTipo:=2, CveContratosEstatus:=1, CveChofer:=DdlChofer.SelectedValue.ToEntero, CveTipoAF:=DdlTipoAF.SelectedValue.ToEntero, CveAF:=DdlTipoAF.SelectedValue.ToEntero) Then
             ObjContratos.Commit()
             Alert("Actualizado Correctamente.")
         Else
@@ -129,8 +134,8 @@ Partial Class RepContratosCalendario
         TxtObservaciones.Text = GvRow.DataKey("Observaciones")
         TxtDescripcion.Text = GvRow.DataKey("DescripcionContrato")
         TxtUbicacion.Text = GvRow.DataKey("Ubicacion")
-        TxtFechaSalida.Text = GvRow.DataKey("FechaInicial").ToDateTime.ToString("yyyy-MM-dd HH:mm:ss").Replace(" ", "T")
-        TxtFechaRegreso.Text = GvRow.DataKey("FechaFinal").ToDateTime.ToString("yyyy-MM-dd HH:mm:ss").Replace(" ", "T")
+        TxtFechaSalida.Text = GvRow.DataKey("FechaInicial").ToDateTime.ToString("MM/dd/yyyy")
+        TxtFechaRegreso.Text = GvRow.DataKey("FechaFinal").ToDateTime.ToString("MM/dd/yyyy")
         DdlClientes.SelectedValue = GvRow.DataKey("CveCliente")
         DdlAF.SelectedValue = GvRow.DataKey("CveAF")
         DdlChofer.SelectedValue = GvRow.DataKey("CveChofer")