This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
@@ -1741,7 +1741,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
|
||||
CveEstatusPersonal As Integer, CveSubProyecto As Integer, CveClienteAsignado As Integer, HorarioTrabajo As String, CveSupervisor As Integer,
|
||||
CveTipoPeriodo As Integer, CveMetodoPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer,
|
||||
FechaIFinContrato As String, FechaFFinContrato As String, FechaIIngreso As String, FechaFIngreso As String, SqlStr As String, NCaracteristicas As Integer,
|
||||
CveEmpresa As Integer, Optional TopSelect As Integer = 10000) As Boolean
|
||||
CveEmpresa As Integer, Optional TopSelect As Integer = 10000, Optional EsReserva As Integer = -1) As Boolean
|
||||
|
||||
Dim Retorno As Boolean = False
|
||||
SqlDataAdapter("PA_RH_Personal2Get")
|
||||
@@ -1777,6 +1777,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
|
||||
.Add("@NCaracteristicas", SqlDbType.Int).Value = NCaracteristicas
|
||||
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
|
||||
.Add("@TopSelect", SqlDbType.Int).Value = TopSelect
|
||||
.Add("@EsReserva", SqlDbType.Int).Value = EsReserva
|
||||
End With
|
||||
|
||||
Try
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
|
||||
<style>
|
||||
#C_GvCaracteristicas_LtlCaracteristica_0{
|
||||
min-width: 275px!important;
|
||||
#C_GvCaracteristicas_LtlCaracteristica_0 {
|
||||
min-width: 275px !important;
|
||||
}
|
||||
</style>
|
||||
</asp:Content>
|
||||
@@ -133,90 +133,104 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-right"><b>Estatus:</b></td>
|
||||
<td colspan="5">
|
||||
<td>
|
||||
<asp:DropDownList ID="DdlEstatus" runat="server" AppendDataBoundItems="true" DataTextField="EstatusPersonal" DataValueField="CveEstatusPersonal" Class="table-group-action-input form-control input-inline input-small input-sm" Style="width: 100px !important;">
|
||||
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</td>
|
||||
<td class="text-right"><b>clasificación:</b></td>
|
||||
<td>
|
||||
<asp:DropDownList ID="ddlclasificacion" runat="server" Width="100%" CssClass="select2me" AppendDataBoundItems="true" DataTextField="Genero" DataValueField="CveGenero" ValidationGroup="GrpGuardar">
|
||||
<asp:ListItem Text="Todos" Value="-1" Selected="True" ></asp:ListItem>
|
||||
<asp:ListItem Text="Activos" Value="0"></asp:ListItem>
|
||||
<asp:ListItem Text="Reserva" Value="1"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr style="vertical-align:top;"><td colspan="2">
|
||||
|
||||
<asp:GridView ID="GvCrt1" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
|
||||
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
|
||||
<Columns>
|
||||
<asp:TemplateField>
|
||||
<ItemStyle BorderStyle="None" />
|
||||
<ItemTemplate>
|
||||
<asp:Panel ID="PnlClasif" Visible="False" runat="server">
|
||||
<div style="width: 100%" class="SubTotales">
|
||||
<b><asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
|
||||
</div>
|
||||
</asp:Panel>
|
||||
<div style="width:105px!important; display: inline-block; text-align:right;">
|
||||
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
|
||||
</div>
|
||||
<div style="display: inline-block;">
|
||||
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField ="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm" ></asp:DropDownList>
|
||||
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
|
||||
|
||||
</td>
|
||||
<tr style="vertical-align: top;">
|
||||
<td colspan="2">
|
||||
<asp:GridView ID="GvCrt2" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
|
||||
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
|
||||
<Columns>
|
||||
<asp:TemplateField>
|
||||
<ItemStyle BorderStyle="None" />
|
||||
<ItemTemplate>
|
||||
<asp:Panel ID="PnlClasif" Visible="False" runat="server">
|
||||
<div style="width: 100%" class="SubTotales">
|
||||
<b><asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
|
||||
</div>
|
||||
</asp:Panel>
|
||||
<div style="width:110px!important; display: inline-block;">
|
||||
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
|
||||
|
||||
<asp:GridView ID="GvCrt1" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
|
||||
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
|
||||
<Columns>
|
||||
<asp:TemplateField>
|
||||
<ItemStyle BorderStyle="None" />
|
||||
<ItemTemplate>
|
||||
<asp:Panel ID="PnlClasif" Visible="False" runat="server">
|
||||
<div style="width: 100%" class="SubTotales">
|
||||
<b>
|
||||
<asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
|
||||
</div>
|
||||
<div style="display: inline-block;">
|
||||
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField ="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm" ></asp:DropDownList>
|
||||
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
</asp:Panel>
|
||||
<div style="width: 105px!important; display: inline-block; text-align: right;">
|
||||
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
|
||||
</div>
|
||||
<div style="display: inline-block;">
|
||||
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm"></asp:DropDownList>
|
||||
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
|
||||
|
||||
</td>
|
||||
<td colspan="2">
|
||||
<asp:GridView ID="GvCrt3" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
|
||||
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
|
||||
<Columns>
|
||||
<asp:TemplateField>
|
||||
<ItemStyle BorderStyle="None" />
|
||||
<ItemTemplate>
|
||||
<asp:Panel ID="PnlClasif" Visible="False" runat="server">
|
||||
<div style="width: 100%" class="SubTotales">
|
||||
<b><asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
|
||||
</div>
|
||||
</asp:Panel>
|
||||
<div style="width:110px!important; display: inline-block; text-align:right;">
|
||||
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
|
||||
<asp:GridView ID="GvCrt2" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
|
||||
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
|
||||
<Columns>
|
||||
<asp:TemplateField>
|
||||
<ItemStyle BorderStyle="None" />
|
||||
<ItemTemplate>
|
||||
<asp:Panel ID="PnlClasif" Visible="False" runat="server">
|
||||
<div style="width: 100%" class="SubTotales">
|
||||
<b>
|
||||
<asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
|
||||
</div>
|
||||
<div style="display: inline-block;">
|
||||
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField ="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm" ></asp:DropDownList>
|
||||
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
|
||||
</asp:Panel>
|
||||
<div style="width: 110px!important; display: inline-block;">
|
||||
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
|
||||
</div>
|
||||
<div style="display: inline-block;">
|
||||
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm"></asp:DropDownList>
|
||||
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
</td>
|
||||
<td colspan="2">
|
||||
<asp:GridView ID="GvCrt3" runat="server" GridLines="None" BorderWidth="0" CssClass="table table-hover table-advance Widthall" AutoGenerateColumns="False"
|
||||
DataKeyNames="CveCaracteristica,Caracteristica" ShowHeader="False">
|
||||
<Columns>
|
||||
<asp:TemplateField>
|
||||
<ItemStyle BorderStyle="None" />
|
||||
<ItemTemplate>
|
||||
<asp:Panel ID="PnlClasif" Visible="False" runat="server">
|
||||
<div style="width: 100%" class="SubTotales">
|
||||
<b>
|
||||
<asp:Literal ID="LblCaracteristica" runat="server" Text=""></asp:Literal></b>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
</asp:Panel>
|
||||
<div style="width: 110px!important; display: inline-block; text-align: right;">
|
||||
<asp:Literal ID="LtlCrt" runat="server" Text='<%# Eval("Caracteristica", "<b>{0}:</b>")%>'></asp:Literal>
|
||||
</div>
|
||||
<div style="display: inline-block;">
|
||||
<asp:DropDownList ID="DdlValor" runat="server" Visible="false" DataValueField="CveCaracteristicaOpcion" DataTextField="CaracteristicaOpcion" Width="100px" CssClass="form-control input-inline input-sm"></asp:DropDownList>
|
||||
<asp:TextBox CssClass="form-control input-sm" ID="TxtValor" runat="server" CausesValidation="true" MaxLength="50" Visible="false" Width="100px"></asp:TextBox>
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td style="text-align: center;" colspan="6">
|
||||
<asp:Button ID="BtnBuscar" runat="server" Text="Buscar" ValidationGroup="GrpBuscar" class="btn btn-primary" /> <asp:Button ID="BtnNuevoPersonal" runat="server" Text="Nuevo" OnClientClick="window.opener.location='/RH/Personal.aspx';window.close(); return false;" class="btn btn-success" /></td>
|
||||
@@ -226,7 +240,7 @@
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
|
||||
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
|
||||
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<table id="TblBusqueda" runat="server" border="0" visible="false">
|
||||
<tr>
|
||||
|
||||
@@ -166,7 +166,7 @@ Partial Class RH_PopUpBuscarPersonal
|
||||
If ObjPersonal.GetPersonal2(-1, Codigo, Nombre, NSS, RFC, DdlTurnos.SelectedValue.ToEntero, DdlPuestos.SelectedValue.ToEntero, DdlDepartamentos.SelectedValue.ToEntero,
|
||||
DdlRuta.SelectedValue.ToEntero, DdlEscolaridad.SelectedValue.ToEntero, DdlEstadoCivil.SelectedValue.ToEntero, DdlGenero.SelectedValue.ToEntero,
|
||||
DdlEstatus.SelectedValue.ToEntero, DdlSubProyecto.SelectedValue.ToEntero, DdlClienteAsignado.SelectedValue.ToEntero, Horario, CveSupervisor,
|
||||
-1, -1, -1, -1, -1, "-1", "-1", "-1", "-1", StrFiltroCaracteristica, 1, UsuarioActual.CveEmpresa) Then
|
||||
-1, -1, -1, -1, -1, "-1", "-1", "-1", "-1", StrFiltroCaracteristica, 1, UsuarioActual.CveEmpresa, EsReserva:=ddlclasificacion.SelectedValue.ToEntero()) Then
|
||||
If ObjPersonal.DtResultados.Rows.Count > 0 Then
|
||||
LtlTotalRegistros.Text = ObjPersonal.DtResultados.Rows.Count.ToString.FormatoNumero(0)
|
||||
GV.DataSource = ObjPersonal.DtResultados
|
||||
|
||||
Reference in New Issue
Block a user