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

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2021-08-11 08:15:47 -07:00
parent 086026d9ca
commit 95ee5f11b6
8 changed files with 182 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
Nomina/Nomina.aspx
View File

@@ -1359,9 +1359,9 @@
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright" style=" padding-top: 0px;">
<asp:Label runat="server" AssociatedControlID="DdlFormapagovacaciones" style=" padding-bottom: 0px;margin-bottom: 0px;">Forma de pago</asp:Label><br />
<asp:DropDownList ID="DdlFormapagovacaciones" DataValueField="Cve" style=" margin-top: -4px;" DataTextField="Texto" Width="100%" CssClass="form-control select2me " runat="server">
<div class="form-group form-md-line-input input-iconright" style="padding-top: 0px;">
<asp:Label runat="server" AssociatedControlID="DdlFormapagovacaciones" Style="padding-bottom: 0px; margin-bottom: 0px;">Forma de pago</asp:Label><br />
<asp:DropDownList ID="DdlFormapagovacaciones" DataValueField="Cve" Style="margin-top: -4px;" DataTextField="Texto" Width="100%" CssClass="form-control select2me " runat="server">
<asp:ListItem Text="Pagadas por anticipado" Value="1" Selected="True"></asp:ListItem>
<asp:ListItem Text="Por pagar" Value="2"></asp:ListItem>
<asp:ListItem Text="Trabajadas" Value="3"></asp:ListItem>
@@ -1374,7 +1374,7 @@
</div>
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtVacDiasExtra" CssClass="form-control input-sm " runat="server"></asp:TextBox>
<asp:TextBox ID="TxtVacDiasExtra" CssClass="form-control input-sm " runat="server"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtVacDiasExtra">Días extras</asp:Label>
</div>
</div>
@@ -1382,27 +1382,28 @@
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox ID="TxtVacEjercicio" CssClass="form-control input-sm " Text="2021" runat="server"></asp:TextBox>
<asp:TextBox ID="TxtVacEjercicio" CssClass="form-control input-sm " Text="2021" runat="server"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtVacEjercicio">Ejercicio</asp:Label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div style="padding-top: 0px; padding-bottom: 0px;">
¿Prima Vacacional?
</div>
<asp:CheckBox ID="ChkVacPrimaVacacional" CssClass="chksino " Text=" " runat="server" />
</div>
<div class="col-md-6">
<div class="col-md-6">
<div style="padding-top: 0px; padding-bottom: 0px;">
¿Cobrar IMSS?
<div class="col-md-6">
<div style="padding-top: 0px; padding-bottom: 0px;">
¿Cobrar IMSS?
</div>
<asp:CheckBox ID="ChkVacCobrarIMSS" CssClass="chksino " Text=" " runat="server" />
</div>
<asp:CheckBox ID="ChkVacCobrarIMSS" CssClass="chksino " Text=" " runat="server" />
</div></div>
</div>
</div>
<div class="text-right">
<asp:LinkButton ID="LnkSRVacacionesUP" OnClick="LnkSRVacacionesUP_Click" Visible="false" CssClass="btn btn-success" ValidationGroup="VG_Vacaciones" runat="server">Actualizar</asp:LinkButton>
@@ -1687,20 +1688,45 @@
<asp:ListItem Value="-1" Text="Seleccione"></asp:ListItem>
</asp:DropDownList>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtmcImporte" runat="server" MaxLength="10"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtmcImporte" Enabled="false" Text="Importe"></asp:Label>
<i></i>
<div class="row">
<div class="col-md-9"></div>
<div class="col-md-3">Calcular automatico</div>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtmcImporteGrabado" runat="server" MaxLength="10"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtmcImporteGrabado" Enabled="false" Text="Gravado"></asp:Label>
<i></i>
<div class="row">
<div class="col-md-9">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="Txtmcvalor" runat="server" MaxLength="10"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="Txtmcvalor" Enabled="false" Text="Valor"></asp:Label>
<i></i>
</div>
</div>
<div class="col-md-3 text-center">
<asp:CheckBox ID="ChkCalAutomaticoV" OnCheckedChanged="ChkCalAutomaticoV_CheckedChanged" AutoPostBack="true" runat="server" />
</div>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="Txtmcvalor" runat="server" MaxLength="10"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="Txtmcvalor" Enabled="false" Text="Valor"></asp:Label>
<i></i>
<div class="row">
<div class="col-md-9">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtmcImporte" runat="server" MaxLength="10"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtmcImporte" Enabled="false" Text="Importe"></asp:Label>
<i></i>
</div>
</div>
<div class="col-md-3 text-center">
<asp:CheckBox ID="ChkCalAutomatico" OnCheckedChanged="ChkCalAutomatico_CheckedChanged" AutoPostBack="true" runat="server" />
</div>
</div>
<div class="row">
<div class="col-md-9">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtmcImporteGrabado" runat="server" MaxLength="10"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtmcImporteGrabado" Enabled="false" Text="Gravado"></asp:Label>
<i></i>
</div>
</div>
<div class="col-md-3 text-center">
<asp:CheckBox ID="ChkCalAutomaticoG" OnCheckedChanged="ChkCalAutomaticoG_CheckedChanged" AutoPostBack="true" runat="server" />
</div>
</div>
</div>
<div class="modal-footer">
@@ -2257,17 +2283,16 @@
</asp:DropDownList>
<asp:Label runat="server" AssociatedControlID="DdlTipoPeriodoCM">Tipo Periodo:</asp:Label>
</div>
<div class="row">
<div class="col-sm-3 bold">Salario Diario</div>
<div class="col-sm-3">
<asp:Label ID="LblSalarioDiarioSimula" runat="server"></asp:Label>
</div>
<div class="col-sm-3 bold"> </div>
<div class="col-sm-3 bold"></div>
<div class="col-sm-3">
</div>
</div>
</div>
<%--<table class="table table-striped table-hover Widthall GvConceptossimulador">
</table>--%>

64
Nomina/Nomina.aspx.cs
View File

@@ -1823,11 +1823,33 @@ public partial class Nomina_Nomina2 : ClsPaginas
TxtmcImporte.Text = "";
TxtmcImporteGrabado.Text = "";
Txtmcvalor.Text = "";
ChkCalAutomaticoG.Checked = false;
ChkCalAutomatico.Checked = false;
ChkCalAutomaticoV.Checked = false;
if (CveConcepto > 0)
{
DataRow drow = dtempleadosConceptos.FiltroPrimero(string.Format("CveConcepto={0} AND CvePersonal ={1}", CveConcepto, CvePersonal));
if (drow != null)
{
int TipoCalculo = drow["Estatus"].ToString().ToEntero();
ChkCalAutomaticoG.Checked = true;
ChkCalAutomatico.Checked = true;
ChkCalAutomaticoV.Checked = true;
if (TipoCalculo >= 5)
{
TipoCalculo -= 5;
ChkCalAutomaticoG.Checked = false;
}
if (TipoCalculo >= 3)
{
TipoCalculo -= 3;
ChkCalAutomatico.Checked = false;
}
if (TipoCalculo >= 1)
{
ChkCalAutomaticoV.Checked = false;
}
TxtmcImporte.Text = string.Format("{0:N2}", drow["Importe"]);
TxtmcImporteGrabado.Text = string.Format("{0:N2}", drow["ImporteGravado"]);
Txtmcvalor.Text = string.Format("{0:N2}", drow["Valor"]);
@@ -1841,12 +1863,30 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
UPpanelModalUpConcepto.Update();
ChkCalAutomaticoV_CheckedChanged(ChkCalAutomaticoV, null);
ChkCalAutomatico_CheckedChanged(ChkCalAutomatico, null);
ChkCalAutomaticoG_CheckedChanged(ChkCalAutomaticoG, null);
}
protected void ChkCalAutomaticoV_CheckedChanged(object sender, EventArgs e)
{
Txtmcvalor.Enabled = !ChkCalAutomaticoV.Checked;
}
protected void ChkCalAutomatico_CheckedChanged(object sender, EventArgs e)
{
TxtmcImporte.Enabled = !ChkCalAutomatico.Checked;
}
protected void ChkCalAutomaticoG_CheckedChanged(object sender, EventArgs e)
{
TxtmcImporteGrabado.Enabled = !ChkCalAutomaticoG.Checked;
}
protected void BtnAceptarMC_Click(object sender, EventArgs e)
{
int chkImporte = 1;
int chkImporteGravado = 1;
int chkImporteValor = 1;
int chkImporte = ChkCalAutomatico.Checked? 0:1;
int chkImporteGravado = ChkCalAutomaticoG.Checked ? 0 : 1;
int chkImporteValor = ChkCalAutomaticoV.Checked ? 0 : 1;
bool continuar = true;
int CveNomina = 0;
double Total = 0;
@@ -1858,12 +1898,15 @@ public partial class Nomina_Nomina2 : ClsPaginas
CvePersonal = DdlmcPersonal.SelectedValue.ToEntero();
}
int CveConcepto = DdlmcConceptos.SelectedValue.ToEntero();
if (CveConcepto > 0 && CvePersonal > 0)
{
decimal ImporteConcepto = TxtmcImporte.Text.Replace("$", "").Replace(",", "").ToDecimal();
decimal ImporteGravadoConcepto = TxtmcImporteGrabado.Text.Replace("$", "").Replace(",", "").ToDecimal();
decimal ImporteGravadoConcepto = ChkCalAutomaticoG.Checked ? 0.0m : TxtmcImporteGrabado.Text.Replace("$", "").Replace(",", "").ToDecimal();
decimal ImporteExentoConcepto = ImporteConcepto - ImporteGravadoConcepto;
decimal ImporteValor = Txtmcvalor.Text.Replace("$", "").Replace(",", "").ToDecimal();
if ((ImporteConcepto>= 0 && ImporteGravadoConcepto<= ImporteConcepto)|| (ImporteConcepto < 0 && ImporteGravadoConcepto >= ImporteConcepto))
{
if (CveConcepto > 0 && CvePersonal > 0)
{
using (ClsNominas objNomina = new ClsNominas())
{
@@ -1933,6 +1976,11 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
Alert("Debe seleccionar un concepto.", TipoMensaje.MsgAdvertencia);
}
}
}
else
{
Alert("el importe gravado no puede ser mayor al importe total, en caso de que el importe total sea negativo no puede ser menor.",TipoMensaje.MsgAdvertencia );
}
}
@@ -5728,7 +5776,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
VacFolioActual = VacFolioActual + 1;
ClsRH objRH = new ClsRH();
// Dim continuar As Boolean = objRH.SolicitudVacacionesAdd(CvePersonal, fInicio, fFin, 0, UsuarioActual.CveUsuario, VacCveSupervisor, VacFolioActual, motivoVacaciones)
bool continuar = objRH.SolicitudVacacionesAdd(SRCvePersonal, fInicio, fFin, 0, UsuarioActual.CveUsuario, VacCveSupervisor, VacFolioActual, FechaPago: fechapago, diasinabiles: diasinhabil, CveTipoPago: DdlFormapagovacaciones.SelectedValue.ToEntero(), diasExtras: TxtVacDiasExtra.Text.ToEntero());//
bool continuar = objRH.SolicitudVacacionesAdd(SRCvePersonal, fInicio, fFin, 0, UsuarioActual.CveUsuario, VacCveSupervisor, VacFolioActual, FechaPago: fechapago,
diasinabiles: diasinhabil, CveTipoPago: DdlFormapagovacaciones.SelectedValue.ToEntero(), diasExtras: TxtVacDiasExtra.Text.ToEntero());
if (objRH.DtResultados.Rows.Count > 0)
{
string ShowError = objRH.DtResultados.Rows[0]["ShowError"].ToString();
@@ -6733,4 +6782,5 @@ public partial class Nomina_Nomina2 : ClsPaginas
LnkSRVacacionesADD.Visible = true;
}
}