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

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
rrene
2022-10-29 12:04:53 -07:00
parent 80a9b368bf 31b67fcea5
commit 2565b008cd
4 changed files with 70 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Nomina/ReportedeAcumulados.aspx
View File

@@ -299,8 +299,8 @@
</div>
</div>
<div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom ">
<asp:GridView ID="GvNominas" runat="server" DataKeyNames="CvePersonal,Nombre,Codigo,Turno,Departamento,SubProyecto" AutoGenerateColumns="False" OnRowDataBound="GvNominas_RowDataBound"
CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" Style="text-align: center;" GridLines="None" data-cols="2" data-rows="2" data-heighterror="360">
<asp:GridView ID="GvNominas" runat="server" DataKeyNames="CvePersonal,Nombre,Codigo,Turno,Departamento,SubProyecto,RegistroPatronal" AutoGenerateColumns="False" OnRowDataBound="GvNominas_RowDataBound"
CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" Style="text-align: center;" GridLines="None" data-cols="4" data-rows="2" data-heighterror="360">
<Columns>
<asp:TemplateField>
@@ -316,6 +316,20 @@
</ItemTemplate>
<ItemStyle Width="300px" HorizontalAlign="Left" />
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>Sucursal</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlSucursal" runat="server"></asp:Literal>
</ItemTemplate>
<ItemStyle Width="1500px" HorizontalAlign="Left" />
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>Registro Patronal</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlRegistroPatronal" runat="server"></asp:Literal>
</ItemTemplate>
<ItemStyle Width="150px" HorizontalAlign="Left" />
</asp:TemplateField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" />
<asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" />
<asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" />

6
Nomina/ReportedeAcumulados.aspx.cs
View File

@@ -196,7 +196,7 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
//string ctipo = "P";
int CurrentColumn = 2;
int CurrentColumn = 4;
BoundField bf;
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 ").Rows)
{
@@ -700,6 +700,8 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
if (e.Row.RowType == DataControlRowType.DataRow)
{
Literal LtlNombre = e.Row.FCLiteral("LtlNombre");
Literal LtlSucursal = e.Row.FCLiteral("LtlSucursal");
Literal LtlRegistroPatronal = e.Row.FCLiteral("LtlRegistroPatronal");
int cvePersonal = e.Row.DataKey("CvePersonal").ToEntero();
string Nombre = e.Row.DataKey("Nombre").ToString();
string Codigo = e.Row.DataKey("Codigo").ToString();
@@ -710,6 +712,8 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
{
LtlNombre.Text = String.Format("<a class=\"Texto sline\" href=\"/RH/Personal.aspx?CvePersonal={0}\"><span style=\"display:inline-block;min-width:31px;\">{2}</span> <span style=\"display:inline-block;\">{1}</span></a>", cvePersonal, Nombre, Codigo);
LtlSucursal.Text = String.Format("{0}", e.Row.DataKey("SubProyecto"));
LtlRegistroPatronal.Text = String.Format("{0}", e.Row.DataKey("RegistroPatronal"));
}
else
{

23
RH/CalculoSBC.aspx
View File

@@ -4,11 +4,11 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style>
.GVCalculosSBC tr th:nth-child(n+6):not(:nth-child(n+10)) {
.GVCalculosSBC tr th:nth-child(n+8):not(:nth-child(n+12)) {
background-color: #a9a9e8 !important;
}
.GVCalculosSBC tr th:nth-child(n+10):not(:nth-child(n+13)) {
.GVCalculosSBC tr th:nth-child(n+12):not(:nth-child(n+15)) {
background-color: #88d6cd !important;
}
</style>
@@ -91,23 +91,34 @@
<ContentTemplate>
<table id="tableheader" style="display: none">
<tr>
<th colspan="5"></th>
<th colspan="7"></th>
<th colspan="4" style="background-color: #a9a9e8 !important;">Actual</th>
<th colspan="3" style="background-color: #88d6cd !important;">Nuevo</th>
<th></th>
</tr>
</table>
<asp:GridView ID="GVCalculosSBC" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall GVCalculosSBC" AutoGenerateColumns="False" data-tableheader="#tableheader"
DataKeyNames="CvePersonal,Codigo,Nombre,FechaInicio,Antiguedad,Incapacitado,NumeroSS,CveTipodeSalario,TipodeSalario,SalarioDiario,SDINuevo,SalarioVariableNuevo,SalarioDiarioSSNuevo,SDI,SalarioVariable,SalarioDiarioSS,PorPrimaVacacional,NumDiasAguinaldo,Acumulado,diasBimestre,Faltas,Incapaciadad,diaslaborados,Movtotxt">
DataKeyNames="CvePersonal,Codigo,Nombre,FechaInicio,Antiguedad,Incapacitado,NumeroSS,CveTipodeSalario,TipodeSalario,SalarioDiario,SDINuevo,SalarioVariableNuevo,SalarioDiarioSSNuevo,SDI,SalarioVariable,SalarioDiarioSS,PorPrimaVacacional,NumDiasAguinaldo,Acumulado,diasBimestre,Faltas,Incapaciadad,diaslaborados,Movtotxt,RegistroPatronal">
<Columns>
<asp:TemplateField HeaderText="Código">
<ItemTemplate>
<asp:Label ID="lblcodigo" runat="server" Text='<%# Eval("Codigo")%>'> </asp:Label>
<asp:HyperLink ID="hypCodigo" NavigateUrl='<%# Eval("CvePersonal","/RH/Personal.aspx?CvePersonal={0}")%>' Text='<%# Eval("Codigo")%>' CssClass="Texto sline" runat="server">HyperLink</asp:HyperLink>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Nombre">
<ItemTemplate>
<asp:Label ID="lblnombre" runat="server" Text='<%# Eval("Nombre")%>'> </asp:Label>
<asp:HyperLink ID="HypNombre" NavigateUrl='<%# Eval("CvePersonal","/RH/Personal.aspx?CvePersonal={0}")%>' Text='<%# Eval("Nombre")%>' CssClass="Texto sline" runat="server">HyperLink</asp:HyperLink>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Sucursal">
<ItemTemplate>
<asp:Label runat="server" Text='<%# Eval("SubProyecto")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Registro Patronal">
<ItemTemplate>
<asp:Label runat="server" Text='<%# Eval("RegistroPatronal")%>'> </asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>

34
RH/CalculoSBC.aspx.cs
View File

@@ -62,6 +62,7 @@ public partial class RH_CalculoSBC : ClsPaginas
string concater = "";
//string MovtosAfil = "";
string MovtosmodSalario = "";
string Script = "";
//string movtosBajas = "";
using (ClsRH ObjPersonal = new ClsRH())
{
@@ -85,19 +86,48 @@ public partial class RH_CalculoSBC : ClsPaginas
// concater = "\\r\\n";
// contador++;
//}
string oldRegistroPatronal = "-1";
foreach (GridViewRow item in GVCalculosSBC.Rows)
{
double SalarioDiarioSSNuevo = Math.Round(item.DataKey("SalarioDiarioSSNuevo").ToDouble(), 2);
double SalarioDiarioSS = Math.Round(item.DataKey("SalarioDiarioSS").ToDouble(), 2);
string RegistroPatronal = item.DataKey("RegistroPatronal");
if(oldRegistroPatronal != "-1" && oldRegistroPatronal != RegistroPatronal)
{
MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater,
$"************* 00{(contador < 1000 ? "0" : "")}{(contador < 100 ? "0" : "")}{(contador < 10 ? "0" : "")}{contador} 00001 9");
Script =string.Format("{0}SaveCsv(\"Movtos{3}_{2:ddMMMyyyy}.txt\", '{1}');", Script, MovtosmodSalario, TxtFechaPago.Text.ToDateTimeExcat("dd/MM/yyyy"), oldRegistroPatronal);
MovtosmodSalario = "";
concater = "";
contador = 0;
}
if (SalarioDiarioSSNuevo != SalarioDiarioSS)
{
MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater, item.DataKey("Movtotxt"));
concater = "\\r\\n";
contador++;
}
oldRegistroPatronal = RegistroPatronal;
}
//if (oldRegistroPatronal != "-1" && oldRegistroPatronal != RegistroPatronal)
{
MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater,
$"************* 00{(contador < 1000 ? "0" : "")}{(contador < 100 ? "0" : "")}{(contador < 10 ? "0" : "")}{contador} 00001 9");
Script = string.Format("{0}SaveCsv(\"Movtos{3}_{2:ddMMMyyyy}.txt\", '{1}');", Script, MovtosmodSalario, TxtFechaPago.Text.ToDateTimeExcat("dd/MM/yyyy"), oldRegistroPatronal);
MovtosmodSalario = "";
concater = "";
contador = 0;
}
/*
MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater,
$"************* 00{(contador < 1000 ? "0" : "")}{(contador < 100 ? "0" : "")}{(contador < 10 ? "0" : "")}{contador} 00001 9");
*/
////03: movtosBajas
//concater = "";
//foreach (var item in ObjPersonal.DtResultados.Select("Tipo=3"))
@@ -133,9 +163,9 @@ public partial class RH_CalculoSBC : ClsPaginas
}
catch (Exception) { }
}
RegistraScript(Script);
RegistraScript(string.Format("SaveCsv(\"MovtosmodSalario{1:ddMMMyyyy}.txt\", '{0}');", MovtosmodSalario, TxtFechaPago.Text.ToDateTimeExcat("dd/MM/yyyy")));
// RegistraScript(string.Format("SaveCsv(\"MovtosmodSalario{1:ddMMMyyyy}.txt\", '{0}');", MovtosmodSalario, TxtFechaPago.Text.ToDateTimeExcat("dd/MM/yyyy")));
//RegistraScript(string.Format("SaveCsv(\"MovtosAfil.txt\", '{0}');SaveCsv(\"MovtosmodSalario.txt\", '{1}');SaveCsv(\"movtosBajas.txt\", '{2}');", MovtosAfil.Replace("'", "\\'"), MovtosmodSalario.Replace("'", "\\'"), movtosBajas.Replace("'", "\\'")));
//RegistraScript("$('#DmodalGetSua').modal('hide');");
}