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
2023-11-11 11:10:48 -07:00
parent 9c29659a0f
commit 577398de0c
3 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Nomina/Nomina.aspx.cs
View File

@@ -3936,9 +3936,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
if (continuar) if (continuar)
{ {
cargaDatos(CvePersonal: SRCvePersonal); cargaDatos(CvePersonal: SRCvePersonal);
cargaBitacora(); if (PnlConceptoPersonal.Visible)
{
cargaBitacora();
cargasobrericiboconceptos(SRMostrarFormulas);
cargasobrericiboconceptos(SRMostrarFormulas); }
UpGvConceptos.Update(); UpGvConceptos.Update();
RegistraScript("$('#ModalUpConcepto').modal('hide');"); RegistraScript("$('#ModalUpConcepto').modal('hide');");
@@ -10168,7 +10171,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
} }
if (essua) if (essua)
{ {
System.IO.Stream fs=(new CedulaSuaPDF()).writexls(dirPDF); System.IO.Stream fs = (new CedulaSuaPDF()).writexls(dirPDF);
fs.Position = 0; fs.Position = 0;
System.IO.MemoryStream memoryStream = new System.IO.MemoryStream(); System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
using (System.IO.Stream input = fs) using (System.IO.Stream input = fs)
@@ -10187,7 +10190,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
} }
else else
{ {
System.IO.Stream fs =(new CedulaEBAPDF()).writexls(dirPDF); System.IO.Stream fs = (new CedulaEBAPDF()).writexls(dirPDF);
fs.Position = 0; fs.Position = 0;
System.IO.MemoryStream memoryStream = new System.IO.MemoryStream(); System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
@@ -10655,8 +10658,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
} }
} }
libro.Range(2, 7, row, dataEBAPDF.ContieneLic ?15:16).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right; libro.Range(2, 7, row, dataEBAPDF.ContieneLic ? 15 : 16).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
libro.Range(2, dataEBAPDF.ContieneLic ? 17:18, row, dataEBAPDF.ContieneLic ? 20:21).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right; libro.Range(2, dataEBAPDF.ContieneLic ? 17 : 18, row, dataEBAPDF.ContieneLic ? 20 : 21).Style.Alignment.Horizontal = ClosedXML.Excel.XLAlignmentHorizontalValues.Right;
//libro.Range(2, 7, row, 15).Style.NumberFormat.Format = "$ #,##0.00"; //libro.Range(2, 7, row, 15).Style.NumberFormat.Format = "$ #,##0.00";
//libro.Range(2, 17, row, 20).Style.NumberFormat.Format = "$ #,##0.00"; //libro.Range(2, 17, row, 20).Style.NumberFormat.Format = "$ #,##0.00";
libro.Columns().AdjustToContents(); libro.Columns().AdjustToContents();
@@ -10793,7 +10796,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
objSUA.txtTodo = strb.ToString(); objSUA.txtTodo = strb.ToString();
return objSUA; return objSUA;
} }
public cedulaSUAEmpleados procesapaso4(string line, cedulaSUAEmpleados empleado,bool ContieneLic) public cedulaSUAEmpleados procesapaso4(string line, cedulaSUAEmpleados empleado, bool ContieneLic)
{ {
if (line.ToUpper().Contains("Página".ToUpper())) if (line.ToUpper().Contains("Página".ToUpper()))
{ {
@@ -10855,7 +10858,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
} }
if (col < l && !ismsfsd) { dtos.SDI = splitedline[col++]; } if (col < l && !ismsfsd) { dtos.SDI = splitedline[col++]; }
if (col < l && splitedline[col] == "") { col++; } if (col < l && splitedline[col] == "") { col++; }
if(ContieneLic && col < l && !ismsfsd) { dtos.Lic = splitedline[col++]; } if (ContieneLic && col < l && !ismsfsd) { dtos.Lic = splitedline[col++]; }
if (col < l && splitedline[col] == "") { col++; } if (col < l && splitedline[col] == "") { col++; }
if (col < l && !ismsfsd) { dtos.Inc = splitedline[col++]; } if (col < l && !ismsfsd) { dtos.Inc = splitedline[col++]; }
if (col < l && splitedline[col] == "") { col++; } if (col < l && splitedline[col] == "") { col++; }

14
Nomina/ReportedeAcumulados.aspx
View File

@@ -337,6 +337,20 @@
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="150px" HorizontalAlign="Left" /> <ItemStyle Width="150px" HorizontalAlign="Left" />
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>Días IMSS</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlDiasAsistio" Text='<%# Eval("DiasAsistio")%>' runat="server"></asp:Literal>
</ItemTemplate>
<ItemStyle Width="150px" HorizontalAlign="Right" />
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>Salario IMSS</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlSBC" Text='<%# Eval("SBC","{0:N2}")%>' runat="server"></asp:Literal>
</ItemTemplate>
<ItemStyle Width="150px" HorizontalAlign="Right" />
</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" /> <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" />

18
Nomina/ReportedeAcumulados.aspx.cs
View File

@@ -196,7 +196,7 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
//string ctipo = "P"; //string ctipo = "P";
int CurrentColumn = 5; int CurrentColumn = 7;
BoundField bf; BoundField bf;
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 ").Rows) foreach (DataRow row in dtConceptos.FiltraParametros("Tipo IN ('P') AND EsPadre = 1 ").Rows)
{ {
@@ -428,6 +428,18 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
libro.Cell(3, column).Value = " "; libro.Cell(3, column).Value = " ";
libro.Column(column).Width = 35; libro.Column(column).Width = 35;
column++;
libro.Cell(1, column).Value = " ";
libro.Cell(2, column).Value = "Días IMSS";
libro.Cell(3, column).Value = " ";
libro.Column(column).Width = 35;
column++;
libro.Cell(1, column).Value = " ";
libro.Cell(2, column).Value = "Salario IMSS";
libro.Cell(3, column).Value = " ";
libro.Column(column).Width = 35;
int iniciotipe = column; int iniciotipe = column;
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo ='P' AND EsPadre = 1 ").Rows) foreach (DataRow row in dtConceptos.FiltraParametros("Tipo ='P' AND EsPadre = 1 ").Rows)
{ {
@@ -545,6 +557,10 @@ public partial class Nomina_ReportedeAcumulados : ClsPaginas
libro.Cell(Fila, column).Value = string.Format("'{0}", erow["NumeroSS"]); libro.Cell(Fila, column).Value = string.Format("'{0}", erow["NumeroSS"]);
column++; column++;
libro.Cell(Fila, column).Value = erow["RegistroPatronal"]; libro.Cell(Fila, column).Value = erow["RegistroPatronal"];
column++;
libro.Cell(Fila, column).Value = erow["DiasAsistio"];
column++;
libro.Cell(Fila, column).Value = erow["SBC"];
foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'P' AND EsPadre = 1 ").Rows) foreach (DataRow row in dtConceptos.FiltraParametros("Tipo = 'P' AND EsPadre = 1 ").Rows)
{ {
column++; column++;