diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 92975bdfe..6af4ed287 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -1248,7 +1248,7 @@ Public Class ClsGenerales #End Region #Region "C O L E C T I V A S" - Public Function GetColectivas(CveColectiva As Integer, Colectiva As String, Codigo As String, Tipo As String, CveEmpresa As Integer) As Boolean + Public Function GetColectivas(Optional CveColectiva As Integer = -1, Optional Colectiva As String = "-1", Optional Codigo As String = "-1", Optional Tipo As String = "-1", Optional CveEmpresa As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Gral_ColectivasGet") diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index efe2c4f5d..f9c98df2d 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -375,61 +375,96 @@ Public Class ClsPaginas Property GlobalDTFraccionArancelaria() As DataTable Get - GlobalDTFraccionArancelaria = DirectCast(Application("GlobalDTFraccionArancelaria"), EnumerableRowCollection(Of DataRow)).CopyToDataTable + Dim AppNombre As String = "GlobalDTFraccionArancelaria" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGrales As New ClsGenerales + If ObjGrales.GetSATFraccionArancelaria() Then Application(AppNombre) = ObjGrales.DtResultados.AsEnumerable() + ObjGrales.Dispose() + End If + GlobalDTFraccionArancelaria = DirectCast(Application(AppNombre), EnumerableRowCollection(Of DataRow)).CopyToDataTable End Get Set(value As DataTable) - Application("GlobalDTFraccionArancelaria") = value + Dim AppNombre As String = "GlobalDTFraccionArancelaria" + Application(AppNombre) = value End Set End Property Property GlobalDTIncoterm() As DataTable Get - GlobalDTIncoterm = DirectCast(Application("GlobalDTIncoterm"), DataTable) + Dim AppNombre As String = "GlobalDTIncoterm" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGrales As New ClsGenerales + If ObjGrales.GetSATIncoterm() Then Application(AppNombre) = ObjGrales.DtResultados + ObjGrales.Dispose() + End If + GlobalDTIncoterm = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTIncoterm") = value + Dim AppNombre As String = "GlobalDTIncoterm" + Application(AppNombre) = value End Set End Property Property GlobalDTTipoOperacion() As DataTable Get - GlobalDTTipoOperacion = DirectCast(Application("GlobalDTTipoOperacion"), DataTable) + Dim AppNombre As String = "GlobalDTTipoOperacion" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGrales As New ClsGenerales + If ObjGrales.GetSATTipoOperacion() Then Application(AppNombre) = ObjGrales.DtResultados + ObjGrales.Dispose() + End If + GlobalDTTipoOperacion = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTTipoOperacion") = value + Dim AppNombre As String = "GlobalDTTipoOperacion" + Application(AppNombre) = value End Set End Property Property GlobalDTSATMotivoTraslado() As DataTable Get - GlobalDTSATMotivoTraslado = DirectCast(Application("GlobalDTSATMotivoTraslado"), DataTable) + Dim AppNombre As String = "GlobalDTSATMotivoTraslado" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGrales As New ClsGenerales + If ObjGrales.GetSATMotivoTraslado() Then Application(AppNombre) = ObjGrales.DtResultados + ObjGrales.Dispose() + End If + GlobalDTSATMotivoTraslado = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTSATMotivoTraslado") = value + Dim AppNombre As String = "GlobalDTSATMotivoTraslado" + Application(AppNombre) = value End Set End Property Property GlobalDTUnidadAduana() As DataTable Get - GlobalDTUnidadAduana = DirectCast(Application("GlobalDTUnidadAduana"), DataTable) - End Get - Set(value As DataTable) - Application("GlobalDTUnidadAduana") = value - End Set - End Property - - - Property GlobalDTGralPaises() As DataTable - Get - If Application("GlobalDTGralPaises") Is Nothing Then + Dim AppNombre As String = "GlobalDTUnidadAduana" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATPais() Then Application("GlobalDTGralPaises") = ObjGrales.DtResultados Else Application("GlobalDTGralPaises") = Nothing + If ObjGrales.GetSATUnidadesAduana() Then Application(AppNombre) = ObjGrales.DtResultados ObjGrales.Dispose() End If - GlobalDTGralPaises = DirectCast(Application("GlobalDTGralPaises"), DataTable) + GlobalDTUnidadAduana = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTGralPaises") = value + Dim AppNombre As String = "GlobalDTUnidadAduana" + Application(AppNombre) = value + End Set + End Property + Property GlobalDTGralPaises() As DataTable + Get + Dim AppNombre As String = "GlobalDTGralPaises" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGrales As New ClsGenerales + If ObjGrales.GetSATPais() Then Application(AppNombre) = ObjGrales.DtResultados + ObjGrales.Dispose() + End If + GlobalDTGralPaises = DirectCast(Application(AppNombre), DataTable) + End Get + Set(value As DataTable) + Dim AppNombre As String = "GlobalDTGralPaises" + Application(AppNombre) = value End Set End Property Property GlobalDTGralEstados(ClaveSATPais As String, Optional CvePais As Integer = -1) As DataTable @@ -437,7 +472,7 @@ Public Class ClsPaginas Dim AppNombre As String = "GlobalDTGralEstados" If Application(AppNombre) Is Nothing Then Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATEstado("-1") Then Application(AppNombre) = ObjGrales.DtResultados Else Application(AppNombre) = Nothing + If ObjGrales.GetSATEstado("-1") Then Application(AppNombre) = ObjGrales.DtResultados ObjGrales.Dispose() End If @@ -463,7 +498,7 @@ Public Class ClsPaginas Dim AppNombre As String = "GlobalDTGralMunicipios" If Application(AppNombre) Is Nothing Then Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATMunicipio("-1") Then Application(AppNombre) = ObjGrales.DtResultados Else Application(AppNombre) = Nothing + If ObjGrales.GetSATMunicipio("-1") Then Application(AppNombre) = ObjGrales.DtResultados ObjGrales.Dispose() End If @@ -490,7 +525,7 @@ Public Class ClsPaginas If Application("GlobalDTLocalidad") Is Nothing Then Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATLocalidad(-1, -1) Then Application("GlobalDTLocalidad") = ObjGrales.DtResultados Else Application("GlobalDTLocalidad") = Nothing + If ObjGrales.GetSATLocalidad(-1, -1) Then Application("GlobalDTLocalidad") = ObjGrales.DtResultados ObjGrales.Dispose() End If @@ -523,14 +558,13 @@ Public Class ClsPaginas End Property - Property GlobalDTGralColonias(ClaveSATEstado As String, ClaveSATMunicipio As String, ClaveSATColonia As String, Optional CveMunicipio As Integer = -1, Optional CodigoPostal As Integer = -1, Optional CveColonia As Integer = -1) As DataTable Get Dim AppNombre As String = "GlobalDTGralColonias" If Application(AppNombre) Is Nothing Then Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATColonia("-1", "-1", "-1") Then Application(AppNombre) = ObjGrales.DtResultados Else Application(AppNombre) = Nothing + If ObjGrales.GetSATColonia("-1", "-1", "-1") Then Application(AppNombre) = ObjGrales.DtResultados ObjGrales.Dispose() End If @@ -561,7 +595,7 @@ Public Class ClsPaginas Get If Application("GlobalDTPSATUM") Is Nothing Then Dim ObjGrales As New ClsGenerales - If ObjGrales.GetSATUnidadMedida Then Application("GlobalDTPSATUM") = ObjGrales.DtResultados.AsEnumerable() Else Application("GlobalDTPSATUM") = Nothing + If ObjGrales.GetSATUnidadMedida Then Application("GlobalDTPSATUM") = ObjGrales.DtResultados.AsEnumerable() ObjGrales.Dispose() End If @@ -1007,18 +1041,36 @@ Public Class ClsPaginas End Property Property GlobalDTFamilias(Optional CveEmpresa As Integer = -1) As DataTable Get - If CveEmpresa <> -1 Then - - Dim Dv As New DataView(DirectCast(Application("GlobalDTFamilias"), DataTable), String.Format("CveEmpresa = {0} ", CveEmpresa), "", DataViewRowState.CurrentRows) - GlobalDTFamilias = Dv.ToTable - Dv.Dispose() - Else - GlobalDTFamilias = DirectCast(Application("GlobalDTFamilias"), DataTable) + Dim AppNombre As String = $"GlobalDTFamilias-{CveEmpresa}" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGenerales As New ClsGenerales + If ObjGenerales.GetCategorias(CveEmpresa, 2) Then Application(AppNombre) = ObjGenerales.DtResultados + ObjGenerales.Dispose() End If + GlobalDTFamilias = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTFamilias") = value + Dim AppNombre As String = $"GlobalDTFamilias-{CveEmpresa}" + Application(AppNombre) = value + End Set + End Property + Property GlobalDTCategoriasPresupuestos(Optional CveEmpresa As Integer = -1) As DataTable + Get + Dim AppNombre As String = $"GlobalDTCategoriasPresupuestos-{CveEmpresa}" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGenerales As New ClsGenerales + If ObjGenerales.GetCategorias(CveEmpresa, 3) Then Application(AppNombre) = ObjGenerales.DtResultados + ObjGenerales.Dispose() + End If + + GlobalDTCategoriasPresupuestos = DirectCast(Application(AppNombre), DataTable) + End Get + Set(value As DataTable) + Dim AppNombre As String = $"GlobalDTCategoriasPresupuestos-{CveEmpresa}" + Application(AppNombre) = value End Set End Property @@ -1109,6 +1161,14 @@ Public Class ClsPaginas 'End Property Property GlobalDTSATUsosCFDI(Optional EsPersonaFisica As Integer = -1, Optional RegimenFiscalReceptor As String = "-1") As DataTable Get + Dim AppNombre As String = "GlobalDTSATUsosCFDI" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGrales As New ClsGenerales + If ObjGrales.GetSATUsosCFDI() Then Application(AppNombre) = ObjGrales.DtResultados + ObjGrales.Dispose() + End If + If EsPersonaFisica <> -1 Then Dim Tipo As New StringBuilder If EsPersonaFisica = 1 Then Tipo.Append("AplicaPersonaFisica = 1") Else Tipo.Append("AplicaPersonaMoral = 1") @@ -1117,16 +1177,17 @@ Public Class ClsPaginas Tipo.AppendFormat("AND RegimenFiscalReceptor LIKE '%{0}%'", RegimenFiscalReceptor) End If - Dim Dv As New DataView(DirectCast(Application("GlobalDTSATUsosCFDI"), DataTable), Tipo.ToString(), " UsoCFDIDescripcion", DataViewRowState.CurrentRows) + Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), Tipo.ToString(), " UsoCFDIDescripcion", DataViewRowState.CurrentRows) GlobalDTSATUsosCFDI = Dv.ToTable Dv.Dispose() Else - GlobalDTSATUsosCFDI = DirectCast(Application("GlobalDTSATUsosCFDI"), DataTable) + GlobalDTSATUsosCFDI = DirectCast(Application(AppNombre), DataTable) End If End Get - Set(ByVal value As DataTable) - Application("GlobalDTSATUsosCFDI") = value + Set(value As DataTable) + Dim AppNombre As String = "GlobalDTSATUsosCFDI" + Application(AppNombre) = value End Set End Property Public Property GlobalDTUnidadesMedida(Optional CveEmpresa As Integer = -1) As DataTable @@ -2616,11 +2677,11 @@ Public Class ClsPaginas #Region "***********************************************************************DT GENERALES**************************************************************************************" Property GlobalDTGralCategorias(CveEmpresa As Integer) As DataTable Get - Dim AppNombre As String = String.Format("GlobalDTGralCategorias-{0}", CveEmpresa) + Dim AppNombre As String = $"GlobalDTGralCategorias-{CveEmpresa}" 'sino existe, recarga los datos If DirectCast(Application(AppNombre), DataTable) Is Nothing Then Dim ObjGenerales As New ClsGenerales - If ObjGenerales.GetCategorias(CveEmpresa) Then Application(AppNombre) = ObjGenerales.DtResultados Else Application(AppNombre) = Nothing + If ObjGenerales.GetCategorias(CveEmpresa) Then Application(AppNombre) = ObjGenerales.DtResultados ObjGenerales.Dispose() End If @@ -2634,54 +2695,69 @@ Public Class ClsPaginas Dv.Dispose() End Get Set(value As DataTable) - Dim AppNombre As String = String.Format("GlobalDTGralCategorias-{0}", CveEmpresa) + Dim AppNombre As String = $"GlobalDTGralCategorias-{CveEmpresa}" Application(AppNombre) = value End Set - End Property Property GlobalDTGralCategorias2(CveEmpresa As Integer) As DataTable - Get - If CveEmpresa <> -1 Then - Dim Dv As New DataView(DirectCast(Application("GlobalDTCategorias2"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows) - GlobalDTGralCategorias2 = Dv.ToTable - Dv.Dispose() - Else - GlobalDTGralCategorias2 = DirectCast(Application("GlobalDTCategorias2"), DataTable) + Dim AppNombre As String = $"GlobalDTGralCategorias2-{CveEmpresa}" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGenerales As New ClsGenerales + If ObjGenerales.GetCategorias(CveEmpresa, 4) Then Application(AppNombre) = ObjGenerales.DtResultados + ObjGenerales.Dispose() End If + + Dim filtro As New StringBuilder + 'If CveMarca > 0 Then + ' filtro.AppendFormat(" CveMarca={0} ", CveMarca) + 'End If + + Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), filtro.ToString, "", DataViewRowState.CurrentRows) + GlobalDTGralCategorias2 = Dv.ToTable + Dv.Dispose() End Get Set(value As DataTable) - Application("GlobalDTCategorias2") = value + Dim AppNombre As String = $"GlobalDTGralCategorias2-{CveEmpresa}" + Application(AppNombre) = value End Set End Property - Property GlobalDTGralEscolaridades() As DataTable Get - GlobalDTGralEscolaridades = DirectCast(Application("GlobalDTGralEscolaridades"), DataTable) + Dim AppNombre As String = "GlobalDTGralEscolaridades" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGenerales As New ClsGenerales + If ObjGenerales.GetEscolaridades() Then Application(AppNombre) = ObjGenerales.DtResultados + ObjGenerales.Dispose() + End If + GlobalDTGralEscolaridades = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTGralEscolaridades") = value + Dim AppNombre As String = "GlobalDTGralEscolaridades" + Application(AppNombre) = value End Set End Property Property GlobalDTGralColectivas(CveEmpresa As Integer) As DataTable Get - If CveEmpresa <> -1 Then - Dim Dv As New DataView(DirectCast(Application("GlobalDTGralColectivas"), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows) - GlobalDTGralColectivas = Dv.ToTable - Dv.Dispose() - Else - GlobalDTGralColectivas = DirectCast(Application("GlobalDTGralColectivas"), DataTable) + Dim AppNombre As String = $"GlobalDTGralColectivas-{CveEmpresa}" + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGenerales As New ClsGenerales + If ObjGenerales.GetColectivas(CveEmpresa:=CveEmpresa) Then Application(AppNombre) = ObjGenerales.DtResultados + ObjGenerales.Dispose() End If + GlobalDTGralColectivas = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTGralColectivas") = value + Dim AppNombre As String = $"GlobalDTGralColectivas-{CveEmpresa}" + Application(AppNombre) = value End Set End Property Property GlobalDTGralMarcas(CveEmpresa As Integer, Optional CveMarca As Integer = -1) As DataTable Get - Dim AppNombre As String = String.Format("GlobalDTGralMarcas-{0}", CveEmpresa) + Dim AppNombre As String = $"GlobalDTGralMarcas-{CveEmpresa}" 'sino existe, recarga los datos If DirectCast(Application(AppNombre), DataTable) Is Nothing Then Dim ObjMarcas As New ClsProductosServicios @@ -2701,7 +2777,7 @@ Public Class ClsPaginas End Get Set(value As DataTable) - Dim AppNombre As String = String.Format("GlobalDTGralMarcas-{0}", CveEmpresa) + Dim AppNombre As String = $"GlobalDTGralMarcas-{CveEmpresa}" Application(AppNombre) = value End Set End Property @@ -3496,33 +3572,58 @@ Public Class ClsPaginas #Region "**********************************************************************GLOBAL DT RH (RECURSOS HUMANOS)********************************************************************" Property GlobalDTAsistenciaDetalle() As DataTable Get - GlobalDTAsistenciaDetalle = DirectCast(Application("GlobalDTAsistenciaDetalle"), DataTable) + Dim AppNombre As String = "GlobalDTAsistenciaDetalle" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetAsistenciasDetalle() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTAsistenciaDetalle = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTAsistenciaDetalle") = value + Dim AppNombre As String = "GlobalDTAsistenciaDetalle" + Application(AppNombre) = value End Set End Property Property GlobalDTAsistenciasInasistencias() As DataTable Get - GlobalDTAsistenciasInasistencias = DirectCast(Application("GlobalDTAsistenciasInasistencias"), DataTable) + Dim AppNombre As String = "GlobalDTAsistenciasInasistencias" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetAsistenciasInasistencias() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTAsistenciasInasistencias = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTAsistenciasInasistencias") = value + Dim AppNombre As String = "GlobalDTAsistenciasInasistencias" + Application(AppNombre) = value End Set End Property Property GlobalDTEstatusPersonal() As DataTable Get - GlobalDTEstatusPersonal = DirectCast(Application("GlobalDTEstatusPersonal"), DataTable) + Dim AppNombre As String = "GlobalDTEstatusPersonal" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetEstatusPersonal() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTEstatusPersonal = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTEstatusPersonal") = value + Dim AppNombre As String = "GlobalDTEstatusPersonal" + Application(AppNombre) = value End Set End Property - Property GlobalDTRHPersonal(CveEmpresa As Integer, Optional CvePersonal As Integer = -1) As DataTable - Get - Dim AppNombre As String = String.Format("GlobalDTRHPersonal-{0}", CveEmpresa) + Dim AppNombre As String = $"GlobalDTRHPersonal-{CveEmpresa}" 'sino existe, recarga los datos If DirectCast(Application(AppNombre), DataTable) Is Nothing Then Dim ObjPersonal As New ClsRH @@ -3530,145 +3631,239 @@ Public Class ClsPaginas ObjPersonal.Dispose() End If - If CveEmpresa <> -1 Or CvePersonal <> -1 Then - Dim Str As StringBuilder = New StringBuilder() - If CveEmpresa <> -1 Then Str.AppendFormat("CveEmpresa = {0}", CveEmpresa) - If CvePersonal <> -1 Then Str.AppendFormat(" {0} CvePersonal = {1}", If(Str.Length > 0, "AND", ""), CvePersonal) - - Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), Str.ToString, "", DataViewRowState.CurrentRows) - GlobalDTRHPersonal = Dv.ToTable - Dv.Dispose() - Else - GlobalDTRHPersonal = DirectCast(Application(AppNombre), DataTable) - End If - + GlobalDTRHPersonal = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Dim AppNombre As String = String.Format("GlobalDTRHPersonal-{0}", CveEmpresa) + Dim AppNombre As String = $"GlobalDTRHPersonal-{CveEmpresa}" Application(AppNombre) = value End Set End Property - - Property GlobalDTDepartamentos() As DataTable Get - GlobalDTDepartamentos = DirectCast(Application("GlobalDTDepartamentos"), DataTable) + Dim AppNombre As String = "GlobalDTDepartamentos" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetDepartamentos() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTDepartamentos = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTDepartamentos") = value + Dim AppNombre As String = "GlobalDTDepartamentos" + Application(AppNombre) = value End Set End Property Property GlobalDTRHPuestos(CveEmpresa As Integer) As DataTable Get - If CveEmpresa <> -1 Then - Dim StrSQL As String = String.Format("CveEmpresa = {0}", CveEmpresa) - Dim Dv As New DataView(DirectCast(Application("GlobalDTRHPuestos"), DataTable), StrSQL, "", DataViewRowState.CurrentRows) - GlobalDTRHPuestos = Dv.ToTable - Dv.Dispose() - Else - GlobalDTRHPuestos = DirectCast(Application("GlobalDTRHPuestos"), DataTable) + Dim AppNombre As String = $"GlobalDTRHPuestos-{CveEmpresa}" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetPuestos(CveEmpresa) Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() End If + GlobalDTRHPuestos = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTRHPuestos") = value + Dim AppNombre As String = $"GlobalDTRHPuestos-{CveEmpresa}" + Application(AppNombre) = value End Set End Property Property GlobalDTEscolaridad() As DataTable Get - GlobalDTEscolaridad = DirectCast(Application("GlobalDTEscolaridad"), DataTable) + Dim AppNombre As String = "GlobalDTEscolaridad" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetEscolaridades() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTEscolaridad = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTEscolaridad") = value + Dim AppNombre As String = "GlobalDTEscolaridad" + Application(AppNombre) = value End Set End Property Property GlobalDTEstadoCivil() As DataTable Get - GlobalDTEstadoCivil = DirectCast(Application("GlobalDTEstadoCivil"), DataTable) + Dim AppNombre As String = "GlobalDTEstadoCivil" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetEstadoCivil() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTEstadoCivil = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTEstadoCivil") = value + Dim AppNombre As String = "GlobalDTEstadoCivil" + Application(AppNombre) = value End Set End Property Property GlobalDTDocumentos() As DataTable Get - GlobalDTDocumentos = DirectCast(Application("GlobalDTDocumentos"), DataTable) + Dim AppNombre As String = "GlobalDTDocumentos" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetDocumentos() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTDocumentos = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTDocumentos") = value + Dim AppNombre As String = "GlobalDTDocumentos" + Application(AppNombre) = value End Set End Property Property GlobalDTGenero() As DataTable Get - GlobalDTGenero = DirectCast(Application("GlobalDTGenero"), DataTable) + Dim AppNombre As String = "GlobalDTGenero" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetGeneros() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTGenero = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTGenero") = value + Dim AppNombre As String = "GlobalDTGenero" + Application(AppNombre) = value End Set End Property Property GlobalDTMotivoBaja() As DataTable Get - GlobalDTMotivoBaja = DirectCast(Application("GlobalDTMotivoBaja"), DataTable) + Dim AppNombre As String = "GlobalDTMotivoBaja" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetMotivoBaja() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTMotivoBaja = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTMotivoBaja") = value + Dim AppNombre As String = "GlobalDTMotivoBaja" + Application(AppNombre) = value End Set End Property Property GlobalDTTiposContrato() As DataTable Get - GlobalDTTiposContrato = DirectCast(Application("GlobalDTTiposContrato"), DataTable) + Dim AppNombre As String = "GlobalDTTiposContrato" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetTiposContrato() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTTiposContrato = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTTiposContrato") = value + Dim AppNombre As String = "GlobalDTTiposContrato" + Application(AppNombre) = value End Set End Property Property GlobalDTRutas() As DataTable Get - GlobalDTRutas = DirectCast(Application("GlobalDTRutas"), DataTable) + Dim AppNombre As String = "GlobalDTRutas" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetRutas() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTRutas = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTRutas") = value + Dim AppNombre As String = "GlobalDTRutas" + Application(AppNombre) = value End Set End Property Property GlobalDTTurno() As DataTable Get - GlobalDTTurno = DirectCast(Application("GlobalDTTurno"), DataTable) + Dim AppNombre As String = "GlobalDTTurno" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetTurnos() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTTurno = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTTurno") = value + Dim AppNombre As String = "GlobalDTTurno" + Application(AppNombre) = value End Set End Property Property GlobalDTJornadas() As DataTable Get - GlobalDTJornadas = DirectCast(Application("GlobalDTJornadas"), DataTable) + Dim AppNombre As String = "GlobalDTJornadas" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetJornadas() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTJornadas = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTJornadas") = value + Dim AppNombre As String = "GlobalDTJornadas" + Application(AppNombre) = value End Set End Property Property GlobalDTMotivosHorasExtras() As DataTable Get - GlobalDTMotivosHorasExtras = DirectCast(Application("GlobalDTMotivosHorasExtras"), DataTable) + Dim AppNombre As String = "GlobalDTMotivosHorasExtras" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetMotivoHorasExtras() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTMotivosHorasExtras = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTMotivosHorasExtras") = value + Dim AppNombre As String = "GlobalDTMotivosHorasExtras" + Application(AppNombre) = value End Set End Property Property GlobalDTTipoBuzon() As DataTable Get - GlobalDTTipoBuzon = DirectCast(Application("GlobalDTTipoBuzon"), DataTable) + Dim AppNombre As String = "GlobalDTTipoBuzon" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjPersonal As New ClsRH + If ObjPersonal.GetTipoBuzon() Then Application(AppNombre) = ObjPersonal.DtResultados + ObjPersonal.Dispose() + End If + + GlobalDTTipoBuzon = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTTipoBuzon") = value + Dim AppNombre As String = "GlobalDTTipoBuzon" + Application(AppNombre) = value End Set End Property #End Region #Region "*********** D T - C O M B U S T I B L E S ***********" - - Property GlobalDTCombustibles(CveEmpresa As Integer) As DataTable Get If CveEmpresa <> -1 Then @@ -3884,19 +4079,20 @@ Public Class ClsPaginas End Set End Property Property GlobalDTPaqueteriaGuiaTipos(CveEmpresa As Integer) As DataTable - Get - If CveEmpresa <> -1 Then - Dim StrSQL As String = String.Format("CveEmpresa = {0}", CveEmpresa) - Dim Dv As New DataView(DirectCast(Application("GlobalDTPaqueteriaGuiaTipos"), DataTable), StrSQL, "", DataViewRowState.CurrentRows) - GlobalDTPaqueteriaGuiaTipos = Dv.ToTable - Dv.Dispose() - Else - GlobalDTPaqueteriaGuiaTipos = DirectCast(Application("GlobalDTPaqueteriaGuiaTipos"), DataTable) + Dim AppNombre As String = $"GlobalDTPaqueteriaGuiaTipos-{CveEmpresa}" + 'sino existe, recarga los datos + If DirectCast(Application(AppNombre), DataTable) Is Nothing Then + Dim ObjGenerales As New ClsGenerales + If ObjGenerales.GetGralPaqueteriasGuiasTipo(CveEmpresa) Then Application(AppNombre) = ObjGenerales.DtResultados + ObjGenerales.Dispose() End If + + GlobalDTPaqueteriaGuiaTipos = DirectCast(Application(AppNombre), DataTable) End Get Set(value As DataTable) - Application("GlobalDTPaqueteriaGuiaTipos") = value + Dim AppNombre As String = $"GlobalDTPaqueteriaGuiaTipos-{CveEmpresa}" + Application(AppNombre) = value End Set End Property Public Shared Property GlobalDTClasificacionPorcentaje(CveEmpresa As Integer, Optional CveClasicacionPorcentaje As Integer = -1, Optional CveClasicacion As Integer = -1, diff --git a/Global.asax b/Global.asax index 10ae25b9a..e8091ab91 100644 --- a/Global.asax +++ b/Global.asax @@ -9,36 +9,37 @@