This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
@@ -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
|
||||
|
||||
@@ -219,7 +219,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox ID="TxtAntiguedad" runat="server" Enabled="false" Text="--" CausesValidation="True" CssClass="form-control"></asp:TextBox>
|
||||
<asp:Label runat="server" Text="Antiguedad: " AssociatedControlID="TxtAntiguedad"></asp:Label>
|
||||
<asp:Label runat="server" Text="Antigüedad: " AssociatedControlID="TxtAntiguedad"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
@@ -251,12 +251,12 @@
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 text-center">
|
||||
Separación unica
|
||||
Separación única
|
||||
<br />
|
||||
<asp:CheckBox ID="chkSeparacionUnica" CssClass="chksino" Text=" " runat="server" />
|
||||
</div>
|
||||
<div class="col-md-4 text-center">
|
||||
Prima de antiguedad
|
||||
Prima de antigüedad
|
||||
<br />
|
||||
<asp:CheckBox ID="chkPrimaantiguedad" CssClass="chksino" Text=" " runat="server" />
|
||||
</div>
|
||||
|
||||
@@ -78,6 +78,7 @@
|
||||
.isOnlyBisibleD td:nth-last-child(-n+3) a {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.isOnlyBisibleO td:nth-last-child(-n+3) a {
|
||||
color: #999;
|
||||
}
|
||||
@@ -135,6 +136,7 @@
|
||||
</style>
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
|
||||
Acumulados de Nóminas
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="HB" runat="Server">
|
||||
</asp:Content>
|
||||
@@ -168,10 +170,14 @@
|
||||
<label class="col-md-1 mediocol">del:</label>
|
||||
<div class="col-md-1">
|
||||
<%--<asp:TextBox ID="TxtPeriodoInicio" Text="0" CssClass="form-control" runat="server"></asp:TextBox>--%>
|
||||
<div class="form-group input-iconright">
|
||||
<asp:TextBox ID="TxtRpdFechaInicio" CssClass="form-control input-sm ADSMaskDate" Style="width: 118px" runat="server"></asp:TextBox>
|
||||
|
||||
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 138px !important; padding: 0px; margin-bottom: -10px;">
|
||||
<asp:TextBox ID="TxtRpdFechaInicio" CssClass="form-control input-sm ADSMaskDate" Style="width: 80px" runat="server"></asp:TextBox>
|
||||
<span class="input-group-btn ">
|
||||
<asp:LinkButton ID="LnkRpdFechaInicio" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
|
||||
</span>
|
||||
<ajax:MaskedEditExtender ID="MaskedEditExtender3" runat="server" TargetControlID="TxtRpdFechaInicio" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CalendarExtender3" TargetControlID="TxtRpdFechaInicio" PopupPosition="BottomRight" Enabled="True" Format="dd/MM/yyyy"></ajax:CalendarExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CalendarExtender3" TargetControlID="TxtRpdFechaInicio" PopupButtonID="LnkRpdFechaInicio" PopupPosition="BottomRight" Enabled="True" Format="dd/MM/yyyy"></ajax:CalendarExtender>
|
||||
<asp:RequiredFieldValidator ID="rfvRpdFechaInicio" runat="server" ControlToValidate="TxtRpdFechaInicio" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Inicio''</b> es necesario, por favor ingréselo." ValidationGroup="VGReporterepperde"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender1" runat="server" HighlightCssClass="vco" TargetControlID="rfvRpdFechaInicio"></ajax:ValidatorCalloutExtender>
|
||||
</div>
|
||||
@@ -179,10 +185,13 @@
|
||||
<label class="col-md-1 mediocol">al:</label>
|
||||
<div class="col-md-1">
|
||||
<%--<asp:TextBox ID="TxtPeriodoFin" Text="99" CssClass="form-control" runat="server"></asp:TextBox>--%>
|
||||
<div class="form-group input-iconright">
|
||||
<asp:TextBox ID="TxtRpdFechaFin" CssClass="form-control input-sm ADSMaskDate" Style="width: 118px" runat="server"></asp:TextBox>
|
||||
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 138px !important; padding: 0px; margin-bottom: -10px;">
|
||||
<asp:TextBox ID="TxtRpdFechaFin" CssClass="form-control input-sm ADSMaskDate" Style="width: 80px" runat="server"></asp:TextBox>
|
||||
<span class="input-group-btn ">
|
||||
<asp:LinkButton ID="LnkFechaFin" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
|
||||
</span>
|
||||
<ajax:MaskedEditExtender ID="MaskedEditExtender5" runat="server" TargetControlID="TxtRpdFechaFin" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CalendarExtender4" TargetControlID="TxtRpdFechaFin" PopupPosition="BottomRight" Enabled="True" Format="dd/MM/yyyy"></ajax:CalendarExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CalendarExtender4" TargetControlID="TxtRpdFechaFin" PopupButtonID="LnkFechaFin" PopupPosition="BottomRight" Enabled="True" Format="dd/MM/yyyy"></ajax:CalendarExtender>
|
||||
<asp:RequiredFieldValidator ID="rfvRpdFechaFin" runat="server" ControlToValidate="TxtRpdFechaFin" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Fin''</b> es necesario, por favor ingréselo." ValidationGroup="VGReporterepperde"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender2" runat="server" HighlightCssClass="vco" TargetControlID="rfvRpdFechaFin"></ajax:ValidatorCalloutExtender>
|
||||
</div>
|
||||
@@ -268,9 +277,6 @@
|
||||
<asp:UpdatePanel ID="UpDatos" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
|
||||
<ajax:TabContainer ID="Tab" runat="server" Width="100%" AutoPostBack="True">
|
||||
<ajax:TabPanel ID="TabNominas" runat="server" HeaderText="Acumulados nómina">
|
||||
<ContentTemplate>
|
||||
|
||||
<div class="portlet light xspadding bordered " id="pnldl">
|
||||
<div class="portlet-title">
|
||||
@@ -443,11 +449,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</ajax:TabPanel>
|
||||
|
||||
</ajax:TabContainer>
|
||||
</ContentTemplate>
|
||||
|
||||
</asp:UpdatePanel>
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -719,7 +719,9 @@
|
||||
|
||||
|
||||
<div>
|
||||
<asp:GridView ID="GvPersonalAltas" runat="server" AutoGenerateColumns="False" CssClass="table table-striped table-advance table-hover Widthall" GridLines="None">
|
||||
<asp:GridView ID="GvPersonalAltas" runat="server" AutoGenerateColumns="False" OnRowDataBound="GvPersonalAltas_RowDataBound"
|
||||
CssClass="table table-striped table-advance table-hover Widthall" GridLines="None"
|
||||
DataKeyNames="CvePersonalAltas,FechaInicio,FechaFin">
|
||||
<Columns>
|
||||
<asp:BoundField HeaderText="Fecha Inicio" DataField="FechaInicio" DataFormatString="{0:d}">
|
||||
<ItemStyle Width="150px" />
|
||||
@@ -742,6 +744,64 @@
|
||||
<AlternatingRowStyle CssClass="TextoAlterno" />
|
||||
<HeaderStyle CssClass="Titulos" />
|
||||
</asp:GridView>
|
||||
|
||||
|
||||
|
||||
<div id="ModalUpAltas" class="modal ADS fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content" >
|
||||
<div class="modal-header "> <button type="button" class="close" data-dismiss="modal">×</button><h4 class="modal-title">Actualiazar alta</h4></div>
|
||||
<div class="modal-body">
|
||||
<asp:UpdatePanel runat="server" ID="UpAltasUpdate" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright calendarlinealinput" style=" width: 100px !important">
|
||||
|
||||
<div class="input-group input-sm date date-picker" data-date-format="dd/mm/yyyy" style=" width: 160px;">
|
||||
<asp:TextBox ID="TxtFechaInicioUA" runat="server" CausesValidation="true" CssClass="form-control input-sm"></asp:TextBox>
|
||||
<span class="input-group-btn ">
|
||||
<asp:LinkButton ID="LnkFechaInicioUA" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
|
||||
</span>
|
||||
<ajax:MaskedEditExtender ID="MEEFechaInicioUA" runat="server" TargetControlID="TxtFechaInicioUA" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CeeFechaInicioUA" TargetControlID="TxtFechaInicioUA" PopupButtonID="LnkFechaInicioUA" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
|
||||
<label>Fecha Inicial</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright " style=" width: 100px !important">
|
||||
<div class="input-group input-sm date date-picker" data-date-format="dd/mm/yyyy" style=" width: 160px;">
|
||||
<asp:TextBox ID="TxtFechaFinUA" runat="server" CausesValidation="true" CssClass="form-control input-sm"></asp:TextBox>
|
||||
<span class="input-group-btn ">
|
||||
<asp:LinkButton ID="LnkFechaFinUA" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
|
||||
</span>
|
||||
<ajax:MaskedEditExtender ID="MeeFechaFinUA" runat="server" TargetControlID="TxtFechaFinUA" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CeeFechaFinUA" TargetControlID="TxtFechaFinUA" PopupButtonID="LnkFechaFinUA" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
|
||||
<label>Fecha Final</label>
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<asp:UpdatePanel runat="server">
|
||||
<ContentTemplate>
|
||||
|
||||
<asp:Button ID="LnkUpAltas" runat="server" Text="Actualizar" OnClick="LnkUpAltas_Click" class="btn btn-primary" />
|
||||
<button type="button" class="btn btn-danger" data-dismiss="modal">Cancelar</button>
|
||||
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -266,6 +266,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user