From 5f588ec52dfa8ed68e4cf61f33c9c5f46f5e4dc9 Mon Sep 17 00:00:00 2001 From: rakcsle Date: Fri, 28 Feb 2025 19:01:33 -0700 Subject: [PATCH 1/3] Tarea programada ajustes viusuales reporte diario --- Ashx/TareasProgramadas.ashx | 52 ++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/Ashx/TareasProgramadas.ashx b/Ashx/TareasProgramadas.ashx index 95eba56b4..3c318652f 100644 --- a/Ashx/TareasProgramadas.ashx +++ b/Ashx/TareasProgramadas.ashx @@ -1394,21 +1394,53 @@ Public Class TareasProgramadas : Implements IHttpHandler, IReadOnlySessionState sbTablas.AppendLine($"
- + - +

Reporte Diario

{DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss")}

") If objGenerales.GetReporteDiario(CveEmpresa) Then - Dim TablaActual As Integer = 1 - For Each tabla As DataTable In objGenerales.DSResultados.Tables - sbTablas.AppendLine(ConvertDataTableToHtml(tabla)) - TablaActual += 1 - sbTablas.Append("
") - sbTablas.Append("
") - Next + If objGenerales.DSResultados.Tables(0).Rows.Count > 0 AndAlso objGenerales.DSResultados.Tables(0).Columns.Count > 0 Then + sbTablas.AppendLine($" +

VENTA ACUMULADA

+

Mes actual: ${objGenerales.DSResultados.Tables(0).Rows(0)(1).ToString.ToDecimal.ToString("###,###,###.00")}M.N.

+

Año actual: ${objGenerales.DSResultados.Tables(0).Rows(0)(2).ToString.ToDecimal.ToString("###,###,###.00")}M.N.

+ ") + End If + + sbTablas.AppendLine($"
") + sbTablas.AppendLine("
") + + sbTablas.AppendLine(ConvertDataTableToHtml(objGenerales.DSResultados.Tables(4))) + sbTablas.AppendLine($"
") + sbTablas.AppendLine("
") + + + sbTablas.AppendLine($" + + + +
{ConvertDataTableToHtml(objGenerales.DSResultados.Tables(1))}{ConvertDataTableToHtml(objGenerales.DSResultados.Tables(3))}
+ ") + + sbTablas.AppendLine($" + + + +
{ConvertDataTableToHtml(objGenerales.DSResultados.Tables(2))}
+ ") + sbTablas.AppendLine($"
") + sbTablas.AppendLine("
") + + 'Dim TablaActual As Integer = 1 + 'For Each tabla As DataTable In objGenerales.DSResultados.Tables + ' sbTablas.AppendLine(ConvertDataTableToHtml(tabla)) + ' TablaActual += 1 + ' sbTablas.Append("
") + ' sbTablas.Append("
") + 'Next Else respuesta = False End If @@ -1428,7 +1460,7 @@ Public Class TareasProgramadas : Implements IHttpHandler, IReadOnlySessionState Dim html As StringBuilder = New StringBuilder() Dim ColumnaTitulo As String = "Titulo" html.Append("") - If table.Columns(0).ColumnName = ColumnaTitulo AndAlso table.Rows.Count > 0 Then html.AppendFormat(" ", table.Rows(0)(ColumnaTitulo)) + If table.Columns(0).ColumnName = ColumnaTitulo AndAlso table.Rows.Count > 0 Then html.AppendFormat("", table.Rows(0)(ColumnaTitulo)) html.Append("") For Each column As DataColumn In table.Columns From 2ebaa45aa7d32b80941f2569173bc9789a5389bf Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Fri, 28 Feb 2025 19:12:12 -0700 Subject: [PATCH 2/3] --FIX, servicio a domicilio --- Ventas/Ventas.aspx.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index c461ada86..45dfd0dc6 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -6072,7 +6072,7 @@ Partial Class Ventas Dim ObjUsados As New ClsVentas - If ObjUsados.GetVentasUsados(CveVenta, -1, DbRowVenta("Fecha").ToString().ToDateTime, UsuarioActual.CveEmpresa) Then + If ObjUsados.GetVentasUsados(CveVenta, -1, DbRowVenta("Fecha").ToString().ToDateTime, UsuarioActual.CveEmpresa, ServicioDomicilio:=CBool(DbRowVenta("ServicioDomicilio"))) Then DtUsadosPendientes = ObjUsados.DtResultados.Copy() End If From 2b3cdb986960c9a71c9c2bd6fa90bc2bbe52ffaa Mon Sep 17 00:00:00 2001 From: rakcsle Date: Sat, 1 Mar 2025 10:20:58 -0700 Subject: [PATCH 3/3] modExtenciones.ReadExcelFile valida clumnas repetidas --- App_Code/modExtensiones.vb | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index 4b42c5616..4fd95269a 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -177,6 +177,52 @@ Namespace Extensiones Dim dataTable As DataTable = New DataTable() Dim worksheet As GemBox.Spreadsheet.ExcelWorksheet = excelFile.Worksheets(0) + + + ' VALIDACIÓN DE COLUMNAS DUPLICADAS + Try + If firstRowHasHeaders Then + Dim columnNames As New List(Of String)() + + For col As Integer = 0 To worksheet.Rows(curRow).AllocatedCells.Count - 1 + Dim cellValue As Object = worksheet.Rows(curRow).Cells(col).Value + Dim colName As String = If(cellValue Is Nothing, $"Unnamed Column {col + 1}", + cellValue.ToString()) + + columnNames.Add(colName) + Next + + + Dim duplicates As New List(Of String)() + Dim dict As New Dictionary(Of String, Integer)(StringComparer.OrdinalIgnoreCase) + + For Each name In columnNames + If dict.ContainsKey(name) Then + dict(name) += 1 + Else + dict(name) = 1 + End If + Next + + For Each kvp In dict + If kvp.Value > 1 Then + duplicates.Add(kvp.Key) + End If + Next + + + If duplicates.Count > 0 Then + Alert(New Object, "El archivo de Excel contiene columnas duplicadas, las columnas duplicadas son: " & String.Join(", ", duplicates), TipoMensaje.MsgAdvertencia) + Return New DataTable + End If + End If + Catch ex As Exception + + End Try + ' FIN DE LA VALIDACIÓN + + + For cols = 0 To worksheet.Rows(curRow).AllocatedCells.Count - 1 If firstRowHasHeaders Then
{0}

{0}