From a744894bd36471f225a95469ed8239e7370e5f34 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Fri, 9 Jul 2021 17:30:04 -0700 Subject: [PATCH] --- App_Code/ClsNominas.vb | 3 - Nomina/Finiquito.aspx | 6 +- Nomina/ReportedeAcumulados.aspx | 367 +++++++++++++++-------------- Nomina/ReportedeAcumulados.aspx.cs | 2 +- RH/Personal.aspx | 62 ++++- RH/Personal.aspx.vb | 72 +++++- vwd.webinfo | 6 + 7 files changed, 326 insertions(+), 192 deletions(-) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 9da716735..5143dad1e 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -2279,8 +2279,6 @@ Public Class ClsNominas .Add("@RegimenContratacion", SqlDbType.Int).Value = RegimenContratacion .Add("@CvePersonal", SqlDbType.Decimal).Value = CvePersonal End With - - SqlAdapter.Fill(DTSet) retorno = True Catch sqEx As SqlException @@ -2303,7 +2301,6 @@ Public Class ClsNominas .Add("@Tipo", SqlDbType.Int).Value = Tipo .Add("@Fecha", SqlDbType.Date).Value = FechaCalculo End With - SqlAdapter.Fill(DTSet) retorno = True Catch sqEx As SqlException diff --git a/Nomina/Finiquito.aspx b/Nomina/Finiquito.aspx index 0d915c274..9b5a83db9 100644 --- a/Nomina/Finiquito.aspx +++ b/Nomina/Finiquito.aspx @@ -219,7 +219,7 @@
- +
@@ -251,12 +251,12 @@
- Separación unica + Separación única
- Prima de antiguedad + Prima de antigüedad
diff --git a/Nomina/ReportedeAcumulados.aspx b/Nomina/ReportedeAcumulados.aspx index bbe05b491..65f0577e0 100644 --- a/Nomina/ReportedeAcumulados.aspx +++ b/Nomina/ReportedeAcumulados.aspx @@ -10,7 +10,7 @@ } } - + .GvConceptos tr td a { color: #5b9bd1; } @@ -74,10 +74,11 @@ .isOnlyBisibleP td:nth-child(-n+3) a { color: #999; } - + .isOnlyBisibleD td:nth-last-child(-n+3) a { color: #999; } + .isOnlyBisibleO td:nth-last-child(-n+3) a { color: #999; } @@ -135,6 +136,7 @@ + Acumulados de Nóminas @@ -168,10 +170,14 @@
<%----%> -
- + +
+ + + + - +
@@ -179,10 +185,13 @@
<%----%> -
- +
+ + + + - +
@@ -268,186 +277,178 @@ - - - -
-
-
- - Acumulados nómina -
+
+
+
+ + Acumulados nómina +
-
- - -
-
-
-
-
-
- - -
-
-
- - - - - - - - - - - Nombre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - -
+
+ + +
+
+
- - +
+
+ + +
+
+
+ + - + + + + + + + + Nombre + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + +
+
- diff --git a/Nomina/ReportedeAcumulados.aspx.cs b/Nomina/ReportedeAcumulados.aspx.cs index 1d522d6ea..5cbbc8a75 100644 --- a/Nomina/ReportedeAcumulados.aspx.cs +++ b/Nomina/ReportedeAcumulados.aspx.cs @@ -159,7 +159,7 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas { DdlTipoPeriodo.DataSource = GlobalDTTipoPeriodo.FiltraParametros("Estatus = 'Activo'"); DdlTipoPeriodo.DataBind(); - DdlTipoPeriodo.Items.Insert(0, new ListItem("Seleccione", "-1")); + DdlTipoPeriodo.Items.Insert(0, new ListItem("Todos", "-1")); if (DdlTipoPeriodo.Items.Count > 0) { DdlTipoPeriodo.SelectedIndex = 0; diff --git a/RH/Personal.aspx b/RH/Personal.aspx index 0fb0c0b62..76908b21e 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -719,7 +719,9 @@
- + @@ -742,6 +744,64 @@ + + + + + +
diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index 09e4f08bb..da16a8d97 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -6507,12 +6507,82 @@ Partial Class RH_Personal + Property CvePersonalAltas As Integer + Get + If ViewState("CvePersonalAltas") Is Nothing Then + Return 0 + Else + Return DirectCast(ViewState("CvePersonalAltas"), Integer) + End If + End Get + Set(value As Integer) + ViewState("CvePersonalAltas") = value + End Set + End Property Protected Sub LnkUpAltass_Click(sender As Object, e As EventArgs) - + Dim GvRow As GridViewRow = DirectCast((DirectCast(sender, LinkButton)).NamingContainer, GridViewRow) + CvePersonalAltas = GvRow.DataKey("CvePersonalAltas").ToEntero() + TxtFechaInicioUA.Text = String.Format("{0:dd/MM/yyyy}", GvRow.DataKey("FechaInicio").ToDateTime()) + Dim fechafin As DateTime = GvRow.DataKey("FechaFin").ToDateTime() + If fechafin.Year < 1900 Then + TxtFechaFinUA.Text = "" + Else + TxtFechaFinUA.Text = String.Format("{0:dd/MM/yyyy}", fechafin) + End If + UpAltasUpdate.Update() + RegistraScript("$('#ModalUpAltas').modal();") End Sub Protected Sub LnkDAltas_Click(sender As Object, e As EventArgs) + Dim GvRow As GridViewRow = DirectCast((DirectCast(sender, LinkButton)).NamingContainer, GridViewRow) + CvePersonalAltas = GvRow.DataKey("CvePersonalAltas").ToEntero() + Dim strquery As String = String.Format("DELETE [RH_PersonalAltas] WHERE CvePersonalAltas ={0} AND [CvePersonal] ={1}", CvePersonalAltas, CvePersonal) + Using objbase As New ClsClaseBase + If (objbase.runQuerystr(strquery)) Then + Using objrh As New ClsRH() + If objrh.GetPersonalAltas(CvePersonal) Then + GvPersonalAltas.DataSource = objrh.DtResultados + GvPersonalAltas.DataBind() + UpDatos.Update() + End If + End Using + Alert("Alta eliminada") + End If + End Using + End Sub + + Protected Sub LnkUpAltas_Click(sender As Object, e As EventArgs) + + Dim strfin As String = "" + Dim fechafin As DateTime = TxtFechaFinUA.Text.ToDateTime() + If fechafin.Year < 1900 Then + strfin = ",[FechaFin]=null" + Else + strfin = String.Format(",[FechaFin]='{0:yyyy-MM-dd}'", fechafin) + + End If + Dim strquery As String = String.Format("UPDATE [RH_PersonalAltas] SET [FechaInicio]='{2:yyyy-MM-dd}' {3} WHERE CvePersonalAltas ={0} AND [CvePersonal] ={1}", CvePersonalAltas, CvePersonal, TxtFechaInicioUA.Text.ToDateTime(), strfin) + Using objbase As New ClsClaseBase + If (objbase.runQuerystr(strquery)) Then + Using objrh As New ClsRH() + If objrh.GetPersonalAltas(CvePersonal) Then + GvPersonalAltas.DataSource = objrh.DtResultados + GvPersonalAltas.DataBind() + UpDatos.Update() + End If + End Using + Alert("Alta actualizada") + End If + End Using + End Sub + + Protected Sub GvPersonalAltas_RowDataBound(sender As Object, e As GridViewRowEventArgs) + If e.Row.RowType = DataControlRowType.DataRow Then + e.Row.FCLinkButton("LnkUpAltass").Visible = UsuarioActual.TienePermisoProceso(327) + e.Row.FCLinkButton("LnkDAltas").Visible = e.Row.FCLinkButton("LnkUpAltass").Visible + End If End Sub End Class + diff --git a/vwd.webinfo b/vwd.webinfo index aa2858f6e..a4b7678ae 100644 --- a/vwd.webinfo +++ b/vwd.webinfo @@ -266,6 +266,12 @@ + + + + + +