From 1c37b3f33e7147c9f851d6c3b70a9d1f4790167d Mon Sep 17 00:00:00 2001
From: rakcsle <rakcsle.rakcsle@gmail.com>
Date: Sat, 30 Nov 2024 13:43:28 -0700
Subject: [PATCH] Vya Ajustes  CatRutas,  RepContratoCalendario Cronograma 
 viajes  que inician en fin de mes y terminan iniciando el mes siguiente

---
 Transportes/CatRutas.aspx                  |  4 ++--
 Transportes/RepContratoDetalle.aspx        | 16 ++++++++--------
 Transportes/RepContratos.aspx              | 16 ++++++++--------
 Transportes/RepContratosCalendario.aspx.vb |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Transportes/CatRutas.aspx b/Transportes/CatRutas.aspx
index b0ebd7c68..e9c1e951d 100644
--- a/Transportes/CatRutas.aspx
+++ b/Transportes/CatRutas.aspx
@@ -49,7 +49,7 @@
                         <ContentTemplate>                      
 
                             <div class="row">
-                                <div class="col-md-6">
+                                <div class="col-md-8">
 
                                     <div class="row" style="margin-right: 10px; margin-top: 10px;" align="right">
                                         <input type="text" id="TxtBusqueda1" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda1','{0}')", GvDestinos.ClientID) %>"
@@ -80,7 +80,7 @@
                                                 </ItemTemplate>
                                             </asp:TemplateField>
 
-                                           <asp:TemplateField HeaderText="Dirección" >
+                                           <asp:TemplateField HeaderText="Dirección" ItemStyle-Width="400px" >
                                                 <ItemTemplate>
                                                     <asp:Literal ID="LtlEstado" runat="server" Text='<%# Eval("Direccion") %>'></asp:Literal>
                                                 </ItemTemplate>
diff --git a/Transportes/RepContratoDetalle.aspx b/Transportes/RepContratoDetalle.aspx
index 3cea65576..eb614cc9a 100644
--- a/Transportes/RepContratoDetalle.aspx
+++ b/Transportes/RepContratoDetalle.aspx
@@ -230,18 +230,18 @@
                                             <div class="col-md-8">
                                                 <div class="input-group">
 
-                                                  <%--  <asp:TextBox ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="True"
+                                                    <asp:TextBox ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="True"
                                                         Width="100%"
-                                                        type="datetime"></asp:TextBox>--%>
+                                                        type="datetime"></asp:TextBox>
 
-                                                    <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
+                                                    <%--<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
                                                             <asp:TextBox Width="80px" ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10"></asp:TextBox>
                                                             <span class="input-group-btn ">
                                                                 <asp:LinkButton ID="LnkTxtFechaSalida" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
                                                             </span>
                                                         </div>
                                                         <ajax:MaskedEditExtender ID="MEETxtFechaSalida" runat="server" TargetControlID="TxtFechaSalida" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                        <ajax:CalendarExtender runat="server" ID="CalTxtFechaSalida" TargetControlID="TxtFechaSalida" PopupButtonID="LnkTxtFechaSalida" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                                        <ajax:CalendarExtender runat="server" ID="CalTxtFechaSalida" TargetControlID="TxtFechaSalida" PopupButtonID="LnkTxtFechaSalida" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>--%>
 
                                                     <asp:RequiredFieldValidator ID="RFVTxtFechaSalida" runat="server" ControlToValidate="TxtFechaSalida"
                                                         Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Salida''</b> es necesario, por favor ingréselo."
@@ -261,18 +261,18 @@
                                             <div class="col-md-8">
                                                 <div class="input-group">
 
-                                                    <%--<asp:TextBox ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="True"
+                                                    <asp:TextBox ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="True"
                                                         Width="100%"
-                                                        type="datetime"></asp:TextBox>--%>
+                                                        type="datetime"></asp:TextBox>
 
-                                                    <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
+                                                    <%--<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
                                                         <asp:TextBox Width="80px" ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10"></asp:TextBox>
                                                         <span class="input-group-btn ">
                                                             <asp:LinkButton ID="LnkTxtFechaRegreso" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
                                                         </span>
                                                     </div>
                                                     <ajax:MaskedEditExtender ID="MEETxtFechaRegreso" runat="server" TargetControlID="TxtFechaRegreso" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                    <ajax:CalendarExtender runat="server" ID="CalTxtFechaRegreso" TargetControlID="TxtFechaRegreso" PopupButtonID="LnkTxtFechaRegreso" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                                    <ajax:CalendarExtender runat="server" ID="CalTxtFechaRegreso" TargetControlID="TxtFechaRegreso" PopupButtonID="LnkTxtFechaRegreso" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>--%>
 
 
                                                     <asp:RequiredFieldValidator ID="RFVTxtFechaRegreso" runat="server" ControlToValidate="TxtFechaRegreso"
diff --git a/Transportes/RepContratos.aspx b/Transportes/RepContratos.aspx
index dab036b52..714f7e723 100644
--- a/Transportes/RepContratos.aspx
+++ b/Transportes/RepContratos.aspx
@@ -350,18 +350,18 @@
                                         <div class="col-md-8">
                                             <div class="input-group">
 
-                                              <%--  <asp:TextBox ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="True" type="datetime-local"
+                                                <asp:TextBox ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="True" type="datetime-local"
                                                     Width="100%"
-                                                     ></asp:TextBox>--%>
+                                                     ></asp:TextBox>
 
-                                                <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
+                                                <%--<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
                                                     <asp:TextBox Width="80px" ID="TxtFechaSalida" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10"></asp:TextBox>
                                                     <span class="input-group-btn ">
                                                         <asp:LinkButton ID="LnkTxtFechaSalida" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
                                                     </span>
                                                 </div>
                                                 <ajax:MaskedEditExtender ID="MEETxtFechaSalida" runat="server" TargetControlID="TxtFechaSalida" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                <ajax:CalendarExtender runat="server" ID="CalendarExtender1" TargetControlID="TxtFechaSalida" PopupButtonID="LnkTxtFechaSalida" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                                <ajax:CalendarExtender runat="server" ID="CalendarExtender1" TargetControlID="TxtFechaSalida" PopupButtonID="LnkTxtFechaSalida" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>--%>
 
                                                 <asp:RequiredFieldValidator ID="RFVTxtFechaSalida" runat="server" ControlToValidate="TxtFechaSalida"
                                                     Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Salida''</b> es necesario, por favor ingréselo."
@@ -380,20 +380,20 @@
                                         <div class="col-md-8">
                                             <div class="input-group">
 
-                                             <%--   <asp:TextBox ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="True" type="datetime-local"
+                                                <asp:TextBox ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="True" type="datetime-local"
                                                     Width="100%"
-                                                     ></asp:TextBox>--%>
+                                                     ></asp:TextBox>
 
 
 
-                                                <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
+                                                <%--<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 100px !important; padding: 0px;">
                                                     <asp:TextBox Width="80px" ID="TxtFechaRegreso" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="10"></asp:TextBox>
                                                     <span class="input-group-btn ">
                                                         <asp:LinkButton ID="LnkTxtFechaRegreso" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
                                                     </span>
                                                 </div>
                                                 <ajax:MaskedEditExtender ID="MEETxtFechaRegreso" runat="server" TargetControlID="TxtFechaRegreso" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                <ajax:CalendarExtender runat="server" ID="CalendarExtender2" TargetControlID="TxtFechaRegreso" PopupButtonID="LnkTxtFechaRegreso" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                                <ajax:CalendarExtender runat="server" ID="CalendarExtender2" TargetControlID="TxtFechaRegreso" PopupButtonID="LnkTxtFechaRegreso" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>--%>
 
                                                 <asp:RequiredFieldValidator ID="RFVTxtFechaRegreso" runat="server" ControlToValidate="TxtFechaRegreso"
                                                     Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Regreso''</b> es necesario, por favor ingréselo."
diff --git a/Transportes/RepContratosCalendario.aspx.vb b/Transportes/RepContratosCalendario.aspx.vb
index 431afcfd1..9a2787f34 100644
--- a/Transportes/RepContratosCalendario.aspx.vb
+++ b/Transportes/RepContratosCalendario.aspx.vb
@@ -64,7 +64,7 @@ Partial Class RepContratosCalendario
         Dim CveCliente As Integer = DdlCliente.SelectedValue.ToEntero
         If CveCliente = 0 Then CveCliente = -1
 
-        If ObjContratos.GetContratosReporte(UsuarioActual.CveEmpresa, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate,
+        If ObjContratos.GetContratosReporte(UsuarioActual.CveEmpresa, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate.AddDays(6),
                                                 DdlCliente.SelectedValue.ToEntero,
                                                 CveSubProyecto:=DdlSubProyectos.SelectedValue.ToEntero,
                                                 CveEstatus:=DdlEstatusConsulta.SelectedValue.ToEntero,