diff --git a/Transportes/RepContratosCalendario.aspx b/Transportes/RepContratosCalendario.aspx index e66c9fddb..685c6b7ea 100644 --- a/Transportes/RepContratosCalendario.aspx +++ b/Transportes/RepContratosCalendario.aspx @@ -92,7 +92,7 @@ <%-- Filtro Visible - Consulta --%>
- +
@@ -290,14 +290,14 @@
- +
- +
@@ -314,8 +314,7 @@
+ Rows="2" >
@@ -323,15 +322,14 @@
+ Rows="2" >
- +
@@ -339,7 +337,7 @@
+ Width="100%">
@@ -348,7 +346,7 @@
+ Width="100%">
diff --git a/Transportes/RepContratosCalendario.aspx.vb b/Transportes/RepContratosCalendario.aspx.vb index e6d9bd88d..589ba314d 100644 --- a/Transportes/RepContratosCalendario.aspx.vb +++ b/Transportes/RepContratosCalendario.aspx.vb @@ -20,7 +20,7 @@ Partial Class RepContratosCalendario Public Property Contrato As String Get - Return ViewState("Contrato").ToString() + Return IfNull(ViewState("Contrato"), "").ToString() End Get Set(value As String) ViewState("Contrato") = value @@ -29,10 +29,11 @@ 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).ToShortDateString - txtFechaF.Text = DateTime.Now.AddDays(7).ToShortDateString + If Not IsPostBack Then + txtFechaI.Text = DateTime.Now.AddMonths(-1).ToShortDateString + txtFechaF.Text = DateTime.Now.AddDays(7).ToShortDateString InicializaCombos() InicializaCalendar() CargaDatos() @@ -54,6 +55,7 @@ Partial Class RepContratosCalendario ObjContratos.Dispose() GvContratos.DataBind() + UpTitulos.Update() End Sub Private Sub InicializaCalendar() @@ -122,6 +124,7 @@ Partial Class RepContratosCalendario Dim ObjContratos As New ClsContratos ObjContratos.IniciaTransacSQL() + If Contrato.ToEntero <= 0 Then Contrato = CveContrato.Value If ObjContratos.UpdateContratos(Contrato.ToEntero, TxtFolio.Text, TxtDescripcion.Text, "", -1, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDate, TxtFechaRegreso.Text.ToDate, 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:=34, CveContratosEstatus:=DdlEstatusContrato.SelectedValue.ToEntero, CveChofer:=DdlChofer.SelectedValue.ToEntero, CveChofer2:=DdlChofer2.SelectedValue.ToEntero, CveTipoAF:=DdlTipoAF.SelectedValue.ToEntero, CveAF:=DdlAF.SelectedValue.ToEntero, CantidadPasajeros:=TxtCantidadPasajeros.Text.ToEntero) Then ObjContratos.Commit() Alert("Actualizado Correctamente.") @@ -185,4 +188,7 @@ Partial Class RepContratosCalendario ObjContratos.Dispose() End Sub + Protected Sub BtnConsultar_Click(sender As Object, e As EventArgs) + CargaDatos() + End Sub End Class