diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index d8aa2d0f5..2fc71f5d3 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -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 diff --git a/RH/PopUpBuscarPersonal.aspx b/RH/PopUpBuscarPersonal.aspx index 06d8b2306..9bf6f2f1b 100644 --- a/RH/PopUpBuscarPersonal.aspx +++ b/RH/PopUpBuscarPersonal.aspx @@ -4,8 +4,8 @@ @@ -133,90 +133,104 @@ Estatus: - + + clasificación: + + + + + + + + + - - - - - - - - -
- -
-
-
-   -
-
- - -
-
-
-
-
- - - + - - - - - - -
- -
-
-
- + + + + + + + +
+ +
-
- - -
-
-
-
-
+ +
+   +
+
+ + +
+ + + + + + - - - - - - -
- -
-
-
- + + + + + + +
+ +
-
- - + +
+ +
+
+ + +
+ + + + + + + + + + + + +
+ +
-
-
-
-
+ +
+ +
+
+ + +
+ + + + - +   @@ -226,7 +240,7 @@ - + diff --git a/RH/PopUpBuscarPersonal.aspx.vb b/RH/PopUpBuscarPersonal.aspx.vb index eec974cf1..3e59a99ec 100644 --- a/RH/PopUpBuscarPersonal.aspx.vb +++ b/RH/PopUpBuscarPersonal.aspx.vb @@ -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