AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
rrene
2024-05-07 10:19:06 -07:00
parent 2db67a928f 277255fc68
commit ae540ebaa3
4 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
App_Code/CalendarEvent.vb
View File

@@ -36,6 +36,7 @@ Public Class CalendarEvent
Public Property CvePersonal As Integer
Public Property CvePersonal2 As Integer
Public Property CveCliente As Integer
Public Property NombreComercial As String
Public Property CveProveedor As Integer
Public Property CveOS As Integer
Public Property CveOSDetalle As Integer

2
Ashx/CargaEventos.ashx
View File

@@ -464,6 +464,7 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState
cevent.allDay = False
cevent.NombreAcercamiento = dr("Ubicacion").ToString
cevent.CveCliente = dr("CveCliente").ToString.ToEntero
cevent.NombreComercial = dr("NombreComercial").ToString
cevent.CvePersonal = dr("CveChofer").ToString.ToEntero
cevent.CvePersonal2 = dr("CveChofer2").ToString.ToEntero
cevent.CveEventoEstatus = dr("CveContratosEstatus").ToString.ToEntero
@@ -530,6 +531,7 @@ Public Class CargaEventos : Implements IHttpHandler, IRequiresSessionState
cevent.end = If(tipoVista = "fecha", String.Format("{0:s}", dr("FechaInicial").ToString.ToDateTime.AddHours(1)), String.Format("{0:s}", dr("FechaFinal").ToString.ToDateTime))
cevent.allDay = False
cevent.CveCliente = dr("CveCliente").ToString.ToEntero
cevent.NombreComercial = dr("NombreComercial").ToString
cevent.NombreAcercamiento = dr("Ubicacion").ToString
cevent.CveActivoFijo = dr("CveAF").ToString.ToEntero
cevent.CvePersonal = dr("CveChofer").ToString.ToEntero

16
Transportes/RepContratosCalendario.aspx
View File

@@ -380,7 +380,7 @@
<div class="col-md-8">
<asp:DropDownList ID="DdlTipoAF" DataValueField="CveTipoActivoFijo"
DataTextField="TipoActivoFijo" Class="form-control input-inline"
Width="100%" runat="server" Enabled="false">
Width="100%" runat="server" Enabled="true">
</asp:DropDownList>
</div>
</div>
@@ -389,7 +389,7 @@
<label class="col-md-4">Unidad</label>
<div class="col-md-8">
<asp:DropDownList ID="DdlAF" DataValueField="CveActivoFijo"
DataTextField="Descripcion" Class="table-group-action-input form-control input-inline select2me"
DataTextField="Descripcion" Class="form-control select2me"
Width="100%" runat="server">
</asp:DropDownList>
</div>
@@ -401,6 +401,7 @@
<asp:DropDownList ID="DdlChofer" AppendDataBoundItems="true" DataValueField="CvePersonal"
DataTextField="NombreCompleto" Class="table-group-action-input form-control input-inline select2me"
Width="100%" runat="server">
<asp:ListItem Value="-1" Selected="True">Seleccione</asp:ListItem>
</asp:DropDownList>
</div>
</div>
@@ -469,6 +470,8 @@
</ContentTemplate>
</asp:UpdatePanel>
</div>
<asp:HiddenField runat="server" ID="HidModClienteNombre" ClientIDMode="Static" />
<asp:HiddenField runat="server" ID="HidModCveCliente" ClientIDMode="Static" />
</asp:Content>
<asp:Content ID="Content5" ContentPlaceHolderID="JS" runat="Server">
@@ -665,6 +668,15 @@
$('#<%=TxtAnticipo.ClientID%>').val(event.Anticipo);
$('#<%=CveContrato.ClientID%>').val(event.id);
if (event.NombreComercial !== null) {
$('#HidModClienteNombre').val('');
} else {
$('#HidModClienteNombre').val(event.NombreComercial);
}
$('#HidModCveCliente').val(event.CveCliente);
$('#<%=BtnModal.ClientID%>').click();
}

28
Transportes/RepContratosCalendario.aspx.vb
View File

@@ -122,10 +122,14 @@ Partial Class RepContratosCalendario
'Lista Chofer'
DdlChofer.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa)
DdlChofer.DataBind()
DdlChofer.Items.Insert(0, New ListItem("-", ""))
DdlChofer.Items.Insert(0, New ListItem("Seleccione", ""))
DdlChofer.SelectedValueExist(-1)
DdlChofer2.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa)
DdlChofer2.DataBind()
DdlChofer2.Items.Insert(0, New ListItem("-", ""))
DdlChofer2.Items.Insert(0, New ListItem("Seleccione", ""))
DdlChofer2.SelectedValueExist(-1)
DdlChoferFiltro.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("", "NombreCompleto")
DdlChoferFiltro.DataBind()
@@ -148,7 +152,7 @@ Partial Class RepContratosCalendario
DdlSubProyectos.Items.Insert(0, New ListItem("Todos", "-1"))
'CargarCentrosDeCosto(Nothing, DdlSubProyectos, Nothing, LblSubProyecto)
UpModal.Update()
End Sub
Private Sub OnRowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvContratos.RowDataBound
@@ -157,7 +161,23 @@ Partial Class RepContratosCalendario
e.Row.BackColor = Drawing.ColorTranslator.FromHtml(BackgroundColor)
End If
End Sub
Protected Sub MostrarModal(sender As Object, e As System.EventArgs)
Protected Sub MostrarModal(sender As Object, e As System.EventArgs)
If HidModClienteNombre.Value = "" Then
HidModClienteNombre.Value = GlobalDTCliente(UsuarioActual.CveEmpresa, -1, HidModCveCliente.Value.ToEntero).FiltroPrimeroValor("NombreComercial")
End If
DdlClientes.SelectedText = HidModClienteNombre.Value
DdlClientes.SelectedValue = HidModCveCliente.Value
DdlClientes.txtText.Value = HidModClienteNombre.Value
DdlClientes.txtValue.Value = HidModCveCliente.Value
UpModal.Update()
RegistraScript("$('#ModalActualizar').modal('show');")
End Sub