diff --git a/Acumuladores/RepIndicadorDiario.aspx.vb b/Acumuladores/RepIndicadorDiario.aspx.vb index 61d0da0e4..1e0fbc7ab 100644 --- a/Acumuladores/RepIndicadorDiario.aspx.vb +++ b/Acumuladores/RepIndicadorDiario.aspx.vb @@ -40,14 +40,6 @@ Partial Class ACumuladores_RepIndicadorDiario ViewState("TCEspecifico") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -225,78 +217,6 @@ Partial Class ACumuladores_RepIndicadorDiario RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -318,13 +238,11 @@ Partial Class ACumuladores_RepIndicadorDiario Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = GlobalDTMonedas().FiltraParametros($"CveMoneda = {CveMoneda}").Rows(0)("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 2edac8445..8f3d1f99a 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -26,6 +26,9 @@ Public Class ClsPaginas Private Const SEncryptionKey As String = "__sig__$gj7+5&j__sig__" Public Shared UrlParametros As System.Collections.Hashtable Private ReadOnly LocalStopwatch As New System.Threading.ThreadLocal(Of Stopwatch)(Function() New Stopwatch()) + Public Shared Colors As String() = {"#FF0F00", "#FF6600", "#FF9E01", "#FCD202", "#F8FF01", "#B0DE09", "#04D215", "#0D8ECF", "#0D52D1", + "#2A0CD0", "#8A0CCF", "#CD0D74", "#754DEB", "#DDDDDD", "#999999", "#333333", "#000000"} + #Region "Propiedades" Public Shared Property EmpresaNotificaciones() As Empresa Public Shared Property EmpresaNotificacionesGPS() As Empresa @@ -96,6 +99,7 @@ Public Class ClsPaginas End Set End Property #End Region + #Region "GlobalDTs" Public Property GlobalTipoCambio(Optional Fecha As Date = MinFecha) As Double Get @@ -3903,7 +3907,6 @@ Public Class ClsPaginas Application(AppNombre) = value End Set End Property - Property GlobalDTCultivosCuadro(CveEmpresa As Integer) As DataTable Get Dim AppNombre As String = $"GlobalDTCultivosCuadro-{CveEmpresa}" @@ -3934,7 +3937,6 @@ Public Class ClsPaginas HttpContext.Current.Application(AppNombre) = value End Set End Property - Property GlobalDTClientesVendedoresSubProyectos(CveEmpresa As Integer, Optional CveCliente As Integer = -1, Optional CveSubProyecto As Integer = -1) As DataTable Get Dim AppNombre As String = $"GlobalDTClientesVendedoresSubProyectos-{CveEmpresa}" @@ -4037,6 +4039,7 @@ Public Class ClsPaginas End Property #End Region #End Region + #Region "Funciones" Public Enum SisParametros As Integer URL = 1 @@ -4272,7 +4275,7 @@ Public Class ClsPaginas ObjUsuario.Dispose() Return Retorno End Function - Public Sub CargarCentrosDeCosto(DdlProyecto As DropDownList, DdlSubProyecto As DropDownList, LthProyectoP As Label, LblSubProyecto As Label, Optional AplicaTodos As String = "Todos", Optional DdlSubProyectoMultiple As ListBox = Nothing) + Public Sub CargarCentrosDeCosto(DdlProyecto As ListControl, DdlSubProyecto As ListControl, LthProyectoP As Label, LblSubProyecto As Label, Optional AplicaTodos As String = "Todos", Optional DdlSubProyectoMultiple As ListBox = Nothing) Select Case UsuarioActual.Empresa.Tipo_CentroCosto Case 1 If DdlProyecto IsNot Nothing Then DdlProyecto.Visible = False @@ -4327,6 +4330,7 @@ Public Class ClsPaginas End Sub #End Region + #Region "PDFs y Reportes" #Region "IMPRIMIR PDF" ''' @@ -7443,6 +7447,7 @@ Public Class ClsPaginas End Sub #End Region #End Region + #Region "P A G O D E C O M P R A S " Public Function AplicaPrePolizaPagoCompra(CompraActual As Compra, Pago As CompraPago, CvePrePoliza As Integer, ByRef ObjConta As ClsContabilidad) As Boolean Dim ErrorMovtos As Boolean = False @@ -7835,6 +7840,7 @@ Public Class ClsPaginas Public Property IdCtaContIVANoAcreditable As Integer End Class #End Region + #Region "P A G O D E V E N T A S " Public Function AplicaPrePolizaPagoVenta(VentaActual As Venta, Pago As VentaPago, CvePrePoliza As Integer, ByRef ObjConta As ClsContabilidad) As Boolean Dim ErrorMovtos As Boolean = False diff --git a/CRM/RepAcercamientosProcesos.aspx.cs b/CRM/RepAcercamientosProcesos.aspx.cs index 813966a56..49c73ae37 100644 --- a/CRM/RepAcercamientosProcesos.aspx.cs +++ b/CRM/RepAcercamientosProcesos.aspx.cs @@ -21,12 +21,6 @@ public partial class CRM_RepAcercamientosProcesos : ClsPaginas set { ViewState["Agrupador"] = value; } } - private DataTable DtColor - { - get { return DtColor = (DataTable)ViewState["DtColor"]; } - set { ViewState["DtColor"] = value; } - } - private DataTable DtDatos { get { return DtDatos = (DataTable)ViewState["DtDatos"]; } @@ -69,7 +63,6 @@ public partial class CRM_RepAcercamientosProcesos : ClsPaginas TxtFechaFin.Text = startOfWeek.AddDays(7).ToString("dd/MM/yyyy"); CargaDdl(); cargarDatos(); - CreaDtColor(); } } @@ -236,80 +229,6 @@ public partial class CRM_RepAcercamientosProcesos : ClsPaginas cargarDatos(); } - private void CreaDtColor() - { - DtColor = new DataTable(); - DtColor.Columns.Add("Color"); - DataRow RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FF0F00"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FF6600"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FF9E01"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FCD202"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#F8FF01"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#B0DE09"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#04D215"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#0D8ECF"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#0D52D1"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#2A0CD0"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#8A0CCF"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#CD0D74"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#754DEB"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#DDDDDD"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#999999"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#333333"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#000000"; - DtColor.Rows.Add(RowColor); - } - protected void LnkVerGrafica_Click(object sender, EventArgs e) { if (DtDatos != null) @@ -350,10 +269,10 @@ public partial class CRM_RepAcercamientosProcesos : ClsPaginas DataRow Row = Dt.NewRow(); Row["Texto"] = $"{Texto}"; Row["Valor"] = Dr["TOTAL"].ToString().FormatoNumero(); - Row["Color"] = DtColor.Rows[RowColorIndex]["Color"].ToString(); + Row["Color"] = Colors[RowColorIndex]; Dt.Rows.Add(Row); RowColorIndex++; - if (RowColorIndex == 17) { RowColorIndex = 0; } + if (RowColorIndex == Colors.Length) { RowColorIndex = 0; } } } diff --git a/CRM/RepAcercamientosRechazos.aspx.cs b/CRM/RepAcercamientosRechazos.aspx.cs index 348df7b03..f2e89eb13 100644 --- a/CRM/RepAcercamientosRechazos.aspx.cs +++ b/CRM/RepAcercamientosRechazos.aspx.cs @@ -21,12 +21,6 @@ public partial class CRM_RepAcercamientosRechazos : ClsPaginas set { ViewState["Agrupador"] = value; } } - private DataTable DtColor - { - get { return DtColor = (DataTable)ViewState["DtColor"]; } - set { ViewState["DtColor"] = value; } - } - private DataTable DtDatos { get { return DtDatos = (DataTable)ViewState["DtDatos"]; } @@ -69,7 +63,6 @@ public partial class CRM_RepAcercamientosRechazos : ClsPaginas TxtFechaFin.Text = startOfWeek.AddDays(7).ToString("dd/MM/yyyy"); CargaDdl(); cargarDatos(); - CreaDtColor(); } } @@ -216,80 +209,6 @@ public partial class CRM_RepAcercamientosRechazos : ClsPaginas cargarDatos(); } - private void CreaDtColor() - { - DtColor = new DataTable(); - DtColor.Columns.Add("Color"); - DataRow RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FF0F00"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FF6600"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FF9E01"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#FCD202"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#F8FF01"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#B0DE09"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#04D215"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#0D8ECF"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#0D52D1"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#2A0CD0"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#8A0CCF"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#CD0D74"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#754DEB"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#DDDDDD"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#999999"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#333333"; - DtColor.Rows.Add(RowColor); - RowColor = null; - RowColor = DtColor.NewRow(); - RowColor["Color"] = "#000000"; - DtColor.Rows.Add(RowColor); - } - protected void LnkVerGrafica_Click(object sender, EventArgs e) { if (DtDatos != null) @@ -330,10 +249,10 @@ public partial class CRM_RepAcercamientosRechazos : ClsPaginas DataRow Row = Dt.NewRow(); Row["Texto"] = $"{Texto}"; Row["Valor"] = Dr["TOTAL"].ToString().FormatoNumero(); - Row["Color"] = DtColor.Rows[RowColorIndex]["Color"].ToString(); + Row["Color"] = Colors[RowColorIndex]; Dt.Rows.Add(Row); RowColorIndex++; - if (RowColorIndex == 17) { RowColorIndex = 0; } + if (RowColorIndex == Colors.Length) { RowColorIndex = 0; } } } diff --git a/Compras/RepCompras.aspx.vb b/Compras/RepCompras.aspx.vb index 6a76475dc..d8d4d8561 100644 --- a/Compras/RepCompras.aspx.vb +++ b/Compras/RepCompras.aspx.vb @@ -1,5 +1,4 @@ - -Option Explicit On +Option Explicit On Option Strict On Imports System.Data @@ -7,9 +6,9 @@ Imports Extensiones Imports Microsoft.Reporting.WebForms Partial Class Compras_RepCompras - Inherits ClsPaginas + Inherits ClsPaginas #Region "PROPIEDADES" - + Private Property TCEspecifico As Double Get If ViewState("TCEspecifico") Is Nothing Then @@ -22,15 +21,6 @@ Partial Class Compras_RepCompras ViewState("TCEspecifico") = value End Set End Property - - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property DtCompras As DataTable Get Return DirectCast(ViewState("DtCompras"), DataTable) @@ -163,8 +153,6 @@ Partial Class Compras_RepCompras 'Carga Tipo Centro de Costo CargaTipoCentroCosto() - - CreaDataTableColor() End Sub @@ -418,11 +406,11 @@ Partial Class Compras_RepCompras End Sub Protected Sub LnkPdf_Click(sender As Object, e As EventArgs) Handles LnkPdf.Click GenerarPDF() - End Sub + End Sub #End Region - + #Region "GRAFICA" - + Protected Sub LnkVerGrafica_Click(sender As Object, e As EventArgs) If Not DtCompras IsNot Nothing AndAlso DtCompras.Rows.Count > 0 Then Alert("No hay datos disponibles", TipoMensaje.MsgAdvertencia) @@ -433,78 +421,6 @@ Partial Class Compras_RepCompras RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -526,13 +442,11 @@ Partial Class Compras_RepCompras Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Compras/RepComprasAF.aspx.vb b/Compras/RepComprasAF.aspx.vb index c0f2719c9..82331aa84 100644 --- a/Compras/RepComprasAF.aspx.vb +++ b/Compras/RepComprasAF.aspx.vb @@ -34,14 +34,6 @@ Partial Class Compras_RepComprasAF ViewState("DTDatos") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -68,7 +60,6 @@ Partial Class Compras_RepComprasAF DdlProyecto.Items(0).Text = "" LblProyecto.Visible = False End If - CreaDataTableColor() End If End Sub @@ -311,78 +302,6 @@ Partial Class Compras_RepComprasAF RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -402,13 +321,11 @@ Partial Class Compras_RepComprasAF Case 2 Row("Valor") = Dr("Cantidad").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Compras/RepComprasDetalle.aspx.vb b/Compras/RepComprasDetalle.aspx.vb index 9a536acb4..0e99ed183 100644 --- a/Compras/RepComprasDetalle.aspx.vb +++ b/Compras/RepComprasDetalle.aspx.vb @@ -40,14 +40,6 @@ Partial Class Compras_RepComprasDetalle ViewState("TCEspecifico") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -270,8 +262,6 @@ Partial Class Compras_RepComprasDetalle 'Carga Tipo Centro de Costo CargaTipoCentroCosto() - CreaDataTableColor() - End Sub Private Sub CargaSubProyecto() @@ -471,78 +461,6 @@ Partial Class Compras_RepComprasDetalle RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -564,13 +482,11 @@ Partial Class Compras_RepComprasDetalle Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = GlobalDTMonedas().FiltraParametros($"CveMoneda = {CveMoneda}").Rows(0)("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Compras/RepComprasPersonal.aspx.vb b/Compras/RepComprasPersonal.aspx.vb index 82e9d8639..064ec21c0 100644 --- a/Compras/RepComprasPersonal.aspx.vb +++ b/Compras/RepComprasPersonal.aspx.vb @@ -33,14 +33,6 @@ Partial Class Compras_RepComprasPersonal End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -58,7 +50,6 @@ Partial Class Compras_RepComprasPersonal CargaCombos() DdlPS.ddl.Visible = False DdlPS.ddlWS.Attributes.Add("data-estatus", "-1") - CreaDataTableColor() End If End Sub @@ -303,78 +294,6 @@ Partial Class Compras_RepComprasPersonal RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -394,13 +313,11 @@ Partial Class Compras_RepComprasPersonal Case 2 Row("Valor") = Dr("Cantidad").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Compras/RepCxP.aspx.vb b/Compras/RepCxP.aspx.vb index ccfa889b5..629feb128 100644 --- a/Compras/RepCxP.aspx.vb +++ b/Compras/RepCxP.aspx.vb @@ -56,14 +56,6 @@ Partial Class Compras_RepCxP ViewState("Agrupador") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property DtGrafica As DataTable Get Return DirectCast(ViewState("DtGrafica"), DataTable) @@ -101,7 +93,6 @@ Partial Class Compras_RepCxP CargaCombos() CargaGvPersonalizarRaqngoColumnas() CargaDatos() - CreaDataTableColor() If UsuarioActual.CveRol = 1 Then divAgruparMes.Visible = True @@ -1751,78 +1742,6 @@ Partial Class Compras_RepCxP CargaGraficaVencidoPorVencer(DdlVerGraficaVencidoPorVencer.SelectedValue.ToEntero) CambioGrafica(DdlVer.SelectedValue.ToEntero) End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica(Tipo As Integer) Dim Dt As New DataTable() @@ -1845,13 +1764,11 @@ Partial Class Compras_RepCxP Case 3 Row("Valor") = Dr("por_vencer").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 Top += 1 End If If DdlMostrarGraficaTotales.SelectedValue.ToEntero <> -1 And Top > DdlMostrarGraficaTotales.SelectedValue.ToEntero Then Exit For diff --git a/Compras/RepProductosServicios.aspx.vb b/Compras/RepProductosServicios.aspx.vb index 34addd1e1..26754b5f3 100644 --- a/Compras/RepProductosServicios.aspx.vb +++ b/Compras/RepProductosServicios.aspx.vb @@ -20,15 +20,6 @@ Partial Class Compras_RepProductosServicios ViewState("DtDatos") = value End Set End Property - - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -173,8 +164,6 @@ Partial Class Compras_RepProductosServicios txtFechaI.Text = FirstDayOfMonth(Now.AddMonths(-5)).ToShortDateString txtFechaF.Text = Now.ToShortDateString - CreaDataTableColor() - TipoCambio = 1 TCEspecifico = 0 @@ -567,78 +556,6 @@ Partial Class Compras_RepProductosServicios RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -660,13 +577,11 @@ Partial Class Compras_RepProductosServicios Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Compras/RepProductosServiciosDetalle.aspx.vb b/Compras/RepProductosServiciosDetalle.aspx.vb index f34b5fc99..f9a587cc6 100644 --- a/Compras/RepProductosServiciosDetalle.aspx.vb +++ b/Compras/RepProductosServiciosDetalle.aspx.vb @@ -24,14 +24,6 @@ Partial Class Compras_RepProductosServiciosDetalle ViewState("CveMoneda") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -282,8 +274,6 @@ Partial Class Compras_RepProductosServiciosDetalle txtFechaI.Text = FirstDayOfMonth(Now.AddMonths(-5)).ToShortDateString txtFechaF.Text = Now.ToShortDateString - CreaDataTableColor() - TipoCambio = 1 TCEspecifico = 0 End Sub @@ -671,78 +661,6 @@ Partial Class Compras_RepProductosServiciosDetalle RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -764,13 +682,11 @@ Partial Class Compras_RepProductosServiciosDetalle Case 3 Row("Valor") = Dr("Cantidad").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = GlobalDTMonedas().FiltraParametros($"CveMoneda = {CveMoneda}").Rows(0)("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Contabilidad/Reportes/RepCuadreContaAdmonDetalle.aspx.vb b/Contabilidad/Reportes/RepCuadreContaAdmonDetalle.aspx.vb index 1c1a6ce05..4b711bc3a 100644 --- a/Contabilidad/Reportes/RepCuadreContaAdmonDetalle.aspx.vb +++ b/Contabilidad/Reportes/RepCuadreContaAdmonDetalle.aspx.vb @@ -10,8 +10,6 @@ Partial Class RepCuadreContaAdmonDetalle Inherits ClsPaginas Private Shared missing As Object = System.Reflection.Missing.Value -#Region "PROPIEDADES" -#End Region Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not Page.IsPostBack Then diff --git a/CxC/RepCxC.aspx.vb b/CxC/RepCxC.aspx.vb index 02e642962..67066b279 100644 --- a/CxC/RepCxC.aspx.vb +++ b/CxC/RepCxC.aspx.vb @@ -79,14 +79,6 @@ Partial Class RepCxC ViewState("Agrupador") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property DtGrafica As DataTable Get Return DirectCast(ViewState("DtGrafica"), DataTable) @@ -109,7 +101,6 @@ Partial Class RepCxC If UsuarioActual.CveEmpresa.Contiene(72, 80, 146, 119) Then ChkAnticipos.Visible = True ActivaEnviarEstadoCuenta() If UsuarioActual.CveRol = 1 Or UsuarioActual.TienePermisoProceso(243) Then LnkDescargarSegmentos.Visible = True - CreaDataTableColor() End If End Sub @@ -1250,78 +1241,6 @@ Partial Class RepCxC CargaGraficaVencidoPorVencer(DdlVerGraficaVencidoPorVencer.SelectedValue.ToEntero) CambioGrafica(DdlVer.SelectedValue.ToEntero) End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica(Tipo As Integer) Dim Dt As New DataTable() @@ -1344,13 +1263,11 @@ Partial Class RepCxC Case 3 Row("Valor") = Dr("por_vencer").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 Top += 1 End If If DdlMostrarGraficaTotales.SelectedValue.ToEntero <> -1 And Top > DdlMostrarGraficaTotales.SelectedValue.ToEntero Then Exit For diff --git a/General/RepIndicadorResumen.aspx.vb b/General/RepIndicadorResumen.aspx.vb index c555565c5..fa27177ea 100644 --- a/General/RepIndicadorResumen.aspx.vb +++ b/General/RepIndicadorResumen.aspx.vb @@ -5,22 +5,6 @@ Imports MoreLinq Partial Class General_RepIndicadorResumen Inherits ClsPaginas -#Region "propiedades" -#If False Then - Private Property DtColor As DataTable - Get - If ViewState("DtColor") Is Nothing Then - Return New DataTable - Else - Return DirectCast(ViewState("DtColor"), DataTable) - End If - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property -#End If -#End Region Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load If Not IsPostBack Then CargaCombos() @@ -221,29 +205,6 @@ Partial Class General_RepIndicadorResumen End If End If End Sub -#If False Then - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - DtColor.Rows.Add("#FF0F00") - DtColor.Rows.Add("#FF6600") - DtColor.Rows.Add("#FF9E01") - DtColor.Rows.Add("#FCD202") - DtColor.Rows.Add("#F8FF01") - DtColor.Rows.Add("#B0DE09") - DtColor.Rows.Add("#04D215") - DtColor.Rows.Add("#0D8ECF") - DtColor.Rows.Add("#0D52D1") - DtColor.Rows.Add("#2A0CD0") - DtColor.Rows.Add("#8A0CCF") - DtColor.Rows.Add("#CD0D74") - DtColor.Rows.Add("#754DEB") - DtColor.Rows.Add("#DDDDDD") - DtColor.Rows.Add("#999999") - DtColor.Rows.Add("#333333") - DtColor.Rows.Add("#000000") - End Sub -#End If Private Sub Graficas() @@ -265,7 +226,7 @@ Partial Class General_RepIndicadorResumen Row("Unidad") = "MXN" '$"{GlobalDTMonedas().FiltraParametros($"CveMoneda = {Dr("CveMoneda").ToString}").Rows(0)("Abreviatura").ToString}" DtVxP.Rows.Add(Row) 'RowColorIndex += 1 - 'If RowColorIndex = 17 Then + 'If RowColorIndex = Colors.Length() Then ' RowColorIndex = 0 'End If End If diff --git a/Inventarios/RepAlmacen.aspx.vb b/Inventarios/RepAlmacen.aspx.vb index 441316e2a..371ad0323 100644 --- a/Inventarios/RepAlmacen.aspx.vb +++ b/Inventarios/RepAlmacen.aspx.vb @@ -19,21 +19,12 @@ Partial Class Inventarios_RepAlmacen Set(value As DataTable) ViewState("TmpDT") = value End Set - End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set End Property #End Region Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load If Not IsPostBack Then CargaTipoAlmacen() CargaDatos() - CreaDataTableColor() End If End Sub @@ -132,78 +123,6 @@ Partial Class Inventarios_RepAlmacen RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -222,12 +141,10 @@ Partial Class Inventarios_RepAlmacen Case 2 Row("Valor") = Dr("Total").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/OS/RepServicioDomicilio.aspx.vb b/OS/RepServicioDomicilio.aspx.vb index 5766f4969..45d9d378a 100644 --- a/OS/RepServicioDomicilio.aspx.vb +++ b/OS/RepServicioDomicilio.aspx.vb @@ -26,15 +26,6 @@ Partial Class OS_RepServicioDomicilio ViewState("DtDatos") = value End Set End Property - - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString diff --git a/Ventas/RepAuxiliarFacturas.aspx.vb b/Ventas/RepAuxiliarFacturas.aspx.vb index c0ba40b95..48c1a70bd 100644 --- a/Ventas/RepAuxiliarFacturas.aspx.vb +++ b/Ventas/RepAuxiliarFacturas.aspx.vb @@ -18,15 +18,6 @@ Partial Class Ventas_RepAuxiliarFacturas ViewState("DtVentas") = value End Set End Property - - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString diff --git a/Ventas/RepProductosServicios.aspx.vb b/Ventas/RepProductosServicios.aspx.vb index 124777f61..6b4bb49fc 100644 --- a/Ventas/RepProductosServicios.aspx.vb +++ b/Ventas/RepProductosServicios.aspx.vb @@ -18,14 +18,6 @@ Partial Class Ventas_RepProductosServicios ViewState("DtVentas") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -238,7 +230,6 @@ Partial Class Ventas_RepProductosServicios CargaGrupo() CargaTipoCentroCosto() - CreaDataTableColor() TipoCambio = 1 TCEspecifico = 0 @@ -592,78 +583,6 @@ Partial Class Ventas_RepProductosServicios RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -691,13 +610,11 @@ Partial Class Ventas_RepProductosServicios Row("Texto") = $"{Dr("GPO").ToString}" End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Ventas/RepProductosServiciosDetalle.aspx.vb b/Ventas/RepProductosServiciosDetalle.aspx.vb index 7a3e8be79..10980426e 100644 --- a/Ventas/RepProductosServiciosDetalle.aspx.vb +++ b/Ventas/RepProductosServiciosDetalle.aspx.vb @@ -43,14 +43,6 @@ Partial Class Ventas_RepProductosServiciosDetalle ViewState("TCEspecifico") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property Private Property Agrupador As String Get Return ViewState("Agrupador").ToString @@ -276,7 +268,6 @@ Partial Class Ventas_RepProductosServiciosDetalle CargaGrupo() CargaTipoCentroCosto() - CreaDataTableColor() TCEspecifico = 0 TipoCambio = 1 @@ -809,78 +800,6 @@ Partial Class Ventas_RepProductosServiciosDetalle RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -902,13 +821,11 @@ Partial Class Ventas_RepProductosServiciosDetalle Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = GlobalDTMonedas().FiltraParametros($"CveMoneda = {CveMoneda}").Rows(0)("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Ventas/RepVentaDetalle.aspx.vb b/Ventas/RepVentaDetalle.aspx.vb index d986f5dbd..bcac7487d 100644 --- a/Ventas/RepVentaDetalle.aspx.vb +++ b/Ventas/RepVentaDetalle.aspx.vb @@ -101,14 +101,6 @@ Partial Class RepVentaDetalle ViewState("Agrupador") = value End Set End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property #End Region 'pRivate ReadOnly Property ColumnasVisibles As @@ -119,7 +111,6 @@ Partial Class RepVentaDetalle CargaCombos() InicializaValores() CargaDatos() - CreaDataTableColor() If UsuarioActual.Empresa.Funcionalidad(531) = "1" Then @@ -1197,79 +1188,6 @@ Partial Class RepVentaDetalle #Region "GRAFICA" - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub - Protected Sub LnkVerGrafica_Click(sender As Object, e As EventArgs) If Not DtVentas IsNot Nothing AndAlso DtVentas.Rows.Count > 0 Then Alert("No hay datos disponibles", TipoMensaje.MsgAdvertencia) @@ -1301,13 +1219,11 @@ Partial Class RepVentaDetalle Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Ventas/RepVentas.aspx.vb b/Ventas/RepVentas.aspx.vb index 8a03c9ec6..701224f45 100644 --- a/Ventas/RepVentas.aspx.vb +++ b/Ventas/RepVentas.aspx.vb @@ -66,14 +66,6 @@ Partial Class Ventas_RepVentas Set(value As DataTable) ViewState("DtVentas") = value End Set - End Property - Private Property DtColor As DataTable - Get - Return DirectCast(ViewState("DtColor"), DataTable) - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set End Property @@ -113,7 +105,6 @@ Partial Class Ventas_RepVentas CargaGrupo() CargaTipoCentroCosto() - CreaDataTableColor() If UsuarioActual.CveVendedor > 0 AndAlso Not UsuarioActual.TienePermisoProceso(263) Then DdlVendedor.SelectedValuesIfExistM(UsuarioActual.CveVendedor.ToString()) @@ -770,78 +761,6 @@ Partial Class Ventas_RepVentas RegistraScript("$('#DivModalGrafica').modal('show')") CambioGrafica() End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub CambioGrafica() Dim Dt As New DataTable() @@ -863,13 +782,11 @@ Partial Class Ventas_RepVentas Case 3 Row("Valor") = Dr("IVA").ToString.FormatoNumero End Select - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/Ventas/RepVentasResumen.aspx.vb b/Ventas/RepVentasResumen.aspx.vb index 13b684f15..70295aff9 100644 --- a/Ventas/RepVentasResumen.aspx.vb +++ b/Ventas/RepVentasResumen.aspx.vb @@ -51,21 +51,6 @@ Partial Class Ventas_RepVentasResumen ViewState("VxP") = value End Set End Property - Private Property DtColor As DataTable - Get - - - If ViewState("DtColor") Is Nothing Then - Return New DataTable - Else - Return DirectCast(ViewState("DtColor"), DataTable) - End If - - End Get - Set(value As DataTable) - ViewState("DtColor") = value - End Set - End Property #End Region Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load @@ -86,8 +71,6 @@ Partial Class Ventas_RepVentasResumen TxtFechaI.Text = $"01/{Now.Month}/{Now.Year}" TxtFechaF.Text = Now.ToString("dd/MM/yyyy") - - CreaDataTableColor() End Sub @@ -180,78 +163,6 @@ Partial Class Ventas_RepVentasResumen End If End If End Sub - Private Sub CreaDataTableColor() - DtColor = New DataTable - DtColor.Columns.Add("Color") - Dim RowColor As DataRow = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF0F00" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF6600" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FF9E01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#FCD202" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#F8FF01" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#B0DE09" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#04D215" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D8ECF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#0D52D1" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#2A0CD0" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#8A0CCF" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#CD0D74" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#754DEB" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#DDDDDD" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#999999" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#333333" - DtColor.Rows.Add(RowColor) - RowColor = Nothing - RowColor = DtColor.NewRow() - RowColor("Color") = "#000000" - DtColor.Rows.Add(RowColor) - End Sub Private Sub GraficaPastel() Dim Dt As New DataTable() @@ -266,13 +177,11 @@ Partial Class Ventas_RepVentasResumen Row = Dt.NewRow() Row("Texto") = $"{Dr("GPO").ToString} {GlobalDTMonedas().FiltraParametros($"CveMoneda = {Dr("CveMoneda").ToString}").Rows(0)("Abreviatura").ToString}" Row("Valor") = Dr("SubTotal").ToString.FormatoNumero - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next @@ -294,13 +203,11 @@ Partial Class Ventas_RepVentasResumen Row = Dt.NewRow() Row("Texto") = $"{Dr("GPO").ToString} {GlobalDTMonedas().FiltraParametros($"CveMoneda = {Dr("CveMoneda").ToString}").Rows(0)("Abreviatura").ToString}" Row("Valor") = Dr("SubTotal").ToString.FormatoNumero - Row("Color") = DtColor.Rows(RowColorIndex)("Color").ToString + Row("Color") = Colors(RowColorIndex) Row("Moneda") = Dr("Moneda").ToString Dt.Rows.Add(Row) RowColorIndex += 1 - If RowColorIndex = 17 Then - RowColorIndex = 0 - End If + If RowColorIndex >= Colors.Length Then RowColorIndex = 0 End If Next diff --git a/ZDG/PopUpBuscarMilitante.aspx.vb b/ZDG/PopUpBuscarMilitante.aspx.vb index ddcc32ffb..00ee87428 100644 --- a/ZDG/PopUpBuscarMilitante.aspx.vb +++ b/ZDG/PopUpBuscarMilitante.aspx.vb @@ -6,8 +6,6 @@ Imports System.Data Partial Class ZDG_PopUpBuscarMilitante Inherits ClsPaginas -#Region "PROPIEDADES" -#End Region Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not IsPostBack Then