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

--FIX nomina

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2025-03-12 13:56:19 -07:00
parent 7a7213771c
commit 02a1def92d
2 changed files with 300 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
Nomina/Nomina.aspx
View File

@@ -817,7 +817,6 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<asp:LinkButton ID="LnkGuardarASistencia" OnClick="LnkGuardarASistencia_Click" CssClass="btn btn-primary" runat="server">Guardar</asp:LinkButton> <asp:LinkButton ID="LnkGuardarASistencia" OnClick="LnkGuardarASistencia_Click" CssClass="btn btn-primary" runat="server">Guardar</asp:LinkButton>
</div> </div>
@@ -2186,29 +2185,23 @@
</div> </div>
</div> </div>
<div id="ModalMovtoPermanente" class="modal ADS fade" role="dialog"> </ContentTemplate>
<Triggers>
<%--<asp:PostBackTrigger ControlID="BtnImprimirsobrerecibo" />--%>
</Triggers>
</asp:UpdatePanel>
</div>
<div id="ModalMovtoPermanente" class="modal ADS fade" role="dialog">
<asp:UpdatePanel ID="UpMovtosPermanentesModal" UpdateMode="Conditional" class="modal-dialog" runat="server"> <asp:UpdatePanel ID="UpMovtosPermanentesModal" UpdateMode="Conditional" class="modal-dialog" runat="server">
<ContentTemplate> <ContentTemplate>
<div class="modal-content"> <div class="modal-content" style="max-width: 600px;">
<div class="modal-header "> <div class="modal-header ">
<button type="button" class="close" onclick="$('#ModalMovtoPermanente').modal('hide');return;">&times;</button> <button type="button" class="close" onclick="$('#ModalMovtoPermanente').modal('hide');return;">&times;</button>
<h4 class="modal-title">Movimiento permanente</h4> <h4 class="modal-title">Movimiento permanente</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<asp:Panel runat="server" Visible="false" CssClass="portlet light xspadding bordered " ID="pnlAddupMovto"> <asp:Panel runat="server" Visible="false" ID="pnlAddupMovto">
<div class="portlet-title">
<div class="caption ">
<i class="icon-pin font-yellow-gold"></i>
<span class="caption-subject font-yellow-gold bold uppercase">
<asp:Literal ID="LtlMovtoPermanenteaddup" runat="server"></asp:Literal></span>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
</div>
</div>
<div class="portlet-body ">
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtDescripcion" CssClass="form-control" runat="server"></asp:TextBox> <asp:TextBox ID="TxtDescripcion" CssClass="form-control" runat="server"></asp:TextBox>
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="TxtDescripcion" CssClass="help-block errorimput" <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="TxtDescripcion" CssClass="help-block errorimput"
@@ -2310,10 +2303,12 @@
<asp:CheckBox ID="ChkPermEsAcumulado" CssClass="chksino " Text=" " runat="server" /> <asp:CheckBox ID="ChkPermEsAcumulado" CssClass="chksino " Text=" " runat="server" />
</div> </div>
</div> </div>
</div>
</asp:Panel>
<asp:GridView ID="GVMovtoPermanenteSaldos" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall" AutoGenerateColumns="False" </asp:Panel>
<br />
<div class="row">
<div class="col-md-12">
<asp:GridView ID="GVMovtoPermanenteSaldos" runat="server" GridLines="None" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" BorderWidth="1" BorderColor="#D3D3D3" CellSpacing="0" Width="100%" AutoGenerateColumns="False" data-heighterror="600" EmptyDataText="No se encontraron registros"
DataKeyNames="CveTipo,Nombre,Concepto,CveMovtoPermanente,FechaFin,CvePeriodo,NoPagos,ImportePagos,Pagado,Total,Saldo,Fecha"> DataKeyNames="CveTipo,Nombre,Concepto,CveMovtoPermanente,FechaFin,CvePeriodo,NoPagos,ImportePagos,Pagado,Total,Saldo,Fecha">
<Columns> <Columns>
<asp:TemplateField HeaderText="Nombre"> <asp:TemplateField HeaderText="Nombre">
@@ -2321,26 +2316,6 @@
<asp:Label ID="lblnombre" runat="server" Text='<%# Eval("Nombre")%>'> </asp:Label> <asp:Label ID="lblnombre" runat="server" Text='<%# Eval("Nombre")%>'> </asp:Label>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<%--<asp:TemplateField HeaderText="Concepto">
<ItemTemplate>
<asp:Label ID="lblconcepto" runat="server" Text='<%# Eval("Concepto")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Cve Movto Permanente">
<ItemTemplate>
<asp:Label ID="lblcveMovtoPermanente" runat="server" Text='<%# Eval("CveMovtoPermanente")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>--%>
<%--<asp:TemplateField HeaderText="Fecha Fin">
<ItemTemplate>
<asp:Label ID="lblfechaFin" runat="server" Text='<%# Eval("FechaFin")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>--%>
<%--<asp:TemplateField HeaderText="Cve Periodo">
<ItemTemplate>
<asp:Label ID="lblcvePeriodo" runat="server" Text='<%# Eval("CvePeriodo")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>--%>
<asp:TemplateField HeaderText="Fecha"> <asp:TemplateField HeaderText="Fecha">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="lblfecha" runat="server" Text='<%# Eval("Fecha")%>'> </asp:Label> <asp:Label ID="lblfecha" runat="server" Text='<%# Eval("Fecha")%>'> </asp:Label>
@@ -2374,24 +2349,19 @@
</Columns> </Columns>
</asp:GridView> </asp:GridView>
</div> </div>
</div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<asp:LinkButton ID="LnkAddMovto" OnClick="LnkAddMovto_Click" ValidationGroup="GrpGuardarMovyoPerma" CssClass="btn btn-primary" runat="server">Guardar</asp:LinkButton> <asp:LinkButton ID="LnkAddMovto" OnClick="LnkAddMovto_Click" ValidationGroup="GrpGuardarMovyoPerma" CssClass="btn btn-primary" runat="server">Guardar</asp:LinkButton>
<asp:LinkButton ID="LnkUpMovto" OnClick="LnkUpMovto_Click" ValidationGroup="GrpGuardarMovyoPerma" CssClass="btn btn-success" runat="server">Actualizar</asp:LinkButton> <asp:LinkButton ID="LnkUpMovto" OnClick="LnkUpMovto_Click" ValidationGroup="GrpGuardarMovyoPerma" CssClass="btn btn-success" runat="server">Actualizar</asp:LinkButton>
<button type="button" class="btn btn-danger" onclick="$('#ModalMovtoPermanente').modal('hide');return;">Cancelar</button> <button type="button" class="btn btn-danger" onclick="$('#ModalMovtoPermanente').modal('hide');return;">Cancelar</button>
</div> </div>
</div> </div>
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>
</div> </div>
</ContentTemplate>
<Triggers>
<%--<asp:PostBackTrigger ControlID="BtnImprimirsobrerecibo" />--%>
</Triggers>
</asp:UpdatePanel>
</div>
<div id="ModalUpConcepto" class="modal ADS fade" role="dialog"> <div id="ModalUpConcepto" class="modal ADS fade" role="dialog">
<asp:UpdatePanel class="modal-dialog " runat="server" ID="UPpanelModalUpConcepto" UpdateMode="Conditional"> <asp:UpdatePanel class="modal-dialog " runat="server" ID="UPpanelModalUpConcepto" UpdateMode="Conditional">
@@ -2525,12 +2495,11 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div style="text-align: right;"> <div style="text-align: right;">
<input type="text" id="TxtBusquedaNPT" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusquedaNPT','{0}')", GVNominaPendiente.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" /> <input type="text" id="TxtBusquedaNPT" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusquedaNPT','{0}')", GVNominaPendiente.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusquedaNPT','{0}')", GVNominaPendiente.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm font-bold yellow-gold"><i class="icon-magnifier"></i></a> <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusquedaNPT','{0}')", GVNominaPendiente.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm font-bold yellow-gold"><i class="icon-magnifier"></i></a>
</div> </div>
<asp:GridView ID="GVNominaPendiente" runat="server" CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" DataKeyNames="CvePeriodo,CvePersonal,CveNomina" <asp:GridView ID="GVNominaPendiente" runat="server" CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" DataKeyNames="CvePeriodo,CvePersonal,CveNomina"
Style="text-align: center;" GridLines="None" data-rows="1" data-heighterror="500" ShowHeaderWhenEmpty="true" ShowHeader="true" AutoGenerateColumns="false" Style="text-align: center;" GridLines="None" data-rows="1" data-heighterror="500" ShowHeaderWhenEmpty="true" ShowHeader="true" AutoGenerateColumns="false"
OnRowDataBound="GVNominaPendiente_RowDataBound"> OnRowDataBound="GVNominaPendiente_RowDataBound">
@@ -5208,9 +5177,6 @@
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="portlet light bordered xspadding" id="portletpersonalizarxls"> <div class="portlet light bordered xspadding" id="portletpersonalizarxls">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption font-green"> <div class="caption font-green">
@@ -5285,7 +5251,6 @@
</asp:TemplateField> </asp:TemplateField>
</Columns> </Columns>
</asp:GridView> </asp:GridView>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<asp:LinkButton ID="LnkFormatoPersonalizado" OnClick="LnkFormatoPersonalizado_Click" runat="server" CssClass="btn btn-primary" ValidationGroup="grpno-validacion"> Descargar</asp:LinkButton> <asp:LinkButton ID="LnkFormatoPersonalizado" OnClick="LnkFormatoPersonalizado_Click" runat="server" CssClass="btn btn-primary" ValidationGroup="grpno-validacion"> Descargar</asp:LinkButton>

17
Nomina/Nomina.aspx.cs
View File

@@ -7678,7 +7678,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
pnlAddupMovto.Visible = true; pnlAddupMovto.Visible = true;
LnkAddMovto.Visible = true; LnkAddMovto.Visible = true;
LnkUpMovto.Visible = false; LnkUpMovto.Visible = false;
LtlMovtoPermanenteaddup.Text = "Agregar Movimiento"; //LtlMovtoPermanenteaddup.Text = "Agregar Movimiento";
TxtDescripcion.Text = ""; TxtDescripcion.Text = "";
TxtValor.Text = ""; TxtValor.Text = "";
@@ -7688,7 +7688,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
ChkEstatus.Visible = true; ChkEstatus.Visible = true;
ChkEstatus.Checked = true; ChkEstatus.Checked = true;
UpMovtosPermanentesModal.Update(); UpMovtosPermanentesModal.Update();
RegistraScript("$('#ModalMovtoPermanente').modal()"); RegistraScript("$('#ModalMovtoPermanente').modal({backdrop: 'static', keyboard: false});");
} }
@@ -7831,9 +7831,18 @@ public partial class Nomina_Nomina2 : ClsPaginas
TxtVecesAplicar.Text = vecesAplicar.ToString(); TxtVecesAplicar.Text = vecesAplicar.ToString();
TxtMontoLimite.Text = montoLimite.ToString(); TxtMontoLimite.Text = montoLimite.ToString();
TxtFechaAplicacion.Text = $"{fechaInicioAplicacion:dd/MM/yyyy}"; TxtFechaAplicacion.Text = $"{fechaInicioAplicacion:dd/MM/yyyy}";
if (CveCuenta > 0)
{
DdlCtaContable.SelectedValueExist(CveCuenta); DdlCtaContable.SelectedValueExist(CveCuenta);
}
else
{
DdlCtaContable.SelectedValueExist("-1");
}
ChkEstatus.Checked = estatus; ChkEstatus.Checked = estatus;
RegistraScript("$('#ModalMovtoPermanente').modal()"); RegistraScript("$('#ModalMovtoPermanente').modal({backdrop: 'static', keyboard: false});");
pnlAddupMovto.Visible = true; pnlAddupMovto.Visible = true;
@@ -8195,7 +8204,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
} }
} }
UpModalAsistencia.Update(); UpModalAsistencia.Update();
RegistraScript("$('#DModalModAsistencia').modal();"); RegistraScript("$('#DModalModAsistencia').modal({backdrop: 'static', keyboard: false});");
} }
protected void LnkSimulador_Click(object sender, EventArgs e) protected void LnkSimulador_Click(object sender, EventArgs e)