From c7bfb3061872004f7e1bb395a7f8035f76cdf3b0 Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Tue, 11 Aug 2020 09:26:15 -0700 Subject: [PATCH 01/16] Etiquetas RH Resguardo --- RH/RepUniformesResguardo.aspx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RH/RepUniformesResguardo.aspx b/RH/RepUniformesResguardo.aspx index e5486e87c..2bdf3cf5d 100644 --- a/RH/RepUniformesResguardo.aspx +++ b/RH/RepUniformesResguardo.aspx @@ -5,7 +5,7 @@ - Reporte de Resguardo Uniformes + Reporte de Resguardo From f5a5debe7d8773f24e6bd31594547e129cef181a Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Wed, 12 Aug 2020 15:00:37 -0700 Subject: [PATCH 02/16] - --- Contratos/Contrato.aspx | 4 ++-- Contratos/Contrato.aspx.vb | 17 +++++++++-------- Empresas/Grales/Formatos/LibroDiario.rpt | Bin 245760 -> 245760 bytes 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Contratos/Contrato.aspx b/Contratos/Contrato.aspx index e28415dcf..8483f7265 100644 --- a/Contratos/Contrato.aspx +++ b/Contratos/Contrato.aspx @@ -373,7 +373,7 @@
- + Proyecto:
@@ -383,7 +383,7 @@
- + diff --git a/Contratos/Contrato.aspx.vb b/Contratos/Contrato.aspx.vb index b124bd0a3..dce2ecdcf 100644 --- a/Contratos/Contrato.aspx.vb +++ b/Contratos/Contrato.aspx.vb @@ -1488,14 +1488,15 @@ Partial Class Contratos_Default #Region "COMBOS - INFO GENERAL" Private Sub CargaProyecto() - If UsuarioActual.Empresa.GralSoloProyecto Then - CargaSubProyectoContrato(-1) - trddlproyecto.Visible = False - lblsubproyecto.Text = "Proyecto" - Else - DdlProyecto.DataSource = GlobalDTProyectos(UsuarioActual.Empresa.CveEmpresa).FiltraParametros("", "", {"CveProyecto", "Proyecto"}) - DdlProyecto.DataBind() - End If + CargarCentrosDeCosto(DdlProyecto, DdlSubProyectoContrato, LblProyecto, lblsubproyecto) + trddlproyecto.Visible = LblProyecto.Visible + 'If UsuarioActual.Empresa.GralSoloProyecto Then + ' CargaSubProyectoContrato(-1) + ' lblsubproyecto.Text = "Proyecto" + 'Else + ' DdlProyecto.DataSource = GlobalDTProyectos(UsuarioActual.Empresa.CveEmpresa).FiltraParametros("", "", {"CveProyecto", "Proyecto"}) + ' DdlProyecto.DataBind() + 'End If End Sub Protected Sub DdlProyecto_SelectedIndexChanged(sender As Object, e As System.EventArgs) Handles DdlProyecto.SelectedIndexChanged CargaSubProyectoContrato(DdlProyecto.SelectedValue.ToEntero) diff --git a/Empresas/Grales/Formatos/LibroDiario.rpt b/Empresas/Grales/Formatos/LibroDiario.rpt index e91fe1e651b76f7beffd4202b45254563e62f82e..87f844a972bf6a00b49aa99c88fbb3b119a11d5a 100644 GIT binary patch delta 8853 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 X)&T>nxWd!)kIb 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 Date: Wed, 12 Aug 2020 15:57:36 -0700 Subject: [PATCH 03/16] inicial registro revision --- AF/RegistroRevision.aspx | 210 ++++++++++++++++++++++++++++++++++++ AF/RegistroRevision.aspx.vb | 74 +++++++++++++ App_Code/ClsPaginas.vb | 1 + 3 files changed, 285 insertions(+) create mode 100644 AF/RegistroRevision.aspx create mode 100644 AF/RegistroRevision.aspx.vb diff --git a/AF/RegistroRevision.aspx b/AF/RegistroRevision.aspx new file mode 100644 index 000000000..32727f609 --- /dev/null +++ b/AF/RegistroRevision.aspx @@ -0,0 +1,210 @@ +<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="RegistroRevision.aspx.vb" Inherits="AF_RegistroRevision" %> + + + + + + + + +<%-- + +
  • + + Nuevo Activo Fijo + +
    • +
  • + PDF +
    • +
  • + + Excel + +
    • + +     + + + + +     --%> + + +     + + Catálogo de Activos Fijos + + + + + + + + +
    +
    +
    + + + + + + +
    +
    + +
    + + +
    +
    + +
    +
    Fecha:
    +
    +
    + +
    + + + + +
    + + + <%-- + --%> + +
    +
    +
    + + +
    +
    + +
    + +     +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     + + + + + + diff --git a/AF/RegistroRevision.aspx.vb b/AF/RegistroRevision.aspx.vb new file mode 100644 index 000000000..b1a64a62e --- /dev/null +++ b/AF/RegistroRevision.aspx.vb @@ -0,0 +1,74 @@ +Option Explicit On +Option Strict On + +Imports System.Data +Imports Extensiones +Imports Microsoft.Reporting.WebForms + +Partial Class AF_RegistroRevision + Inherits ClsPaginas + +#Region " PROPIEDADES" + +#End Region + + Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load + If Not Page.IsPostBack Then + + CargaCombos() + + CargaDatos() + + End If + End Sub + + +#Region " CARGA PARAMETROS " + +#End Region + +#Region " CARGA COMBOS " + Protected Sub CargaCombos() + CargarCentrosDeCosto(Nothing, DdlSubProyecto, Nothing, LblSubProyecto) + End Sub + + +#End Region + +#Region " CARGA DATOS " + Protected Sub BtnFiltrar_Click(sender As Object, e As EventArgs) + CargaDatos() + + End Sub + + +#End Region + +#Region " GV DATOS " + + Private Sub CargaDatos() + + Dim ObjAF As New ClsAF + + + ObjAF.Dispose() + + End Sub + + + Protected Sub GvDatos_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvDatos.RowDataBound + + If e.Row.RowType = DataControlRowType.DataRow Then + + + + End If + + End Sub + +#End Region + + + + +End Class diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 40f6c1946..68a9d44e3 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -3950,6 +3950,7 @@ Public Class ClsPaginas PaginaDict.Add("/AF/RepServicios.aspx".ToUpper(), -1) PaginaDict.Add("/AF/RepDepreciacion.aspx".ToUpper(), -1) PaginaDict.Add("/AF/RepEventosProgramados.aspx".ToUpper(), 656) + PaginaDict.Add("/AF/RegistroRevision.aspx".ToUpper(), 1251) #End Region 'AIMMGM #Region "AIMMGM" From c8ac996eeab2784b5cb9e411cd4e61056d55e587 Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Wed, 12 Aug 2020 16:24:36 -0700 Subject: [PATCH 04/16] =?UTF-8?q?validaci=C3=B3n=20del=20DropDownList=20ya?= =?UTF-8?q?=20se=20subi=C3=B3=20a=20producci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inventarios/PopUpExistenciasAlmacen.aspx.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Inventarios/PopUpExistenciasAlmacen.aspx.vb b/Inventarios/PopUpExistenciasAlmacen.aspx.vb index 2f729867e..8ad38121e 100644 --- a/Inventarios/PopUpExistenciasAlmacen.aspx.vb +++ b/Inventarios/PopUpExistenciasAlmacen.aspx.vb @@ -164,7 +164,7 @@ Partial Class Inventarios_Default UPDatos.Update() TblBusqueda.Visible = True Else - Alert("Seleccione un producto o servicio", TipoMensaje.MsgAdvertencia) + Alert("Seleccione un producto", TipoMensaje.MsgAdvertencia) End If End Sub Private Sub GV_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GV.RowDataBound From d5f8bbce891ae0b2028da00544a1149ca6219293 Mon Sep 17 00:00:00 2001 From: Raul Pimienta Date: Wed, 12 Aug 2020 22:27:59 -0700 Subject: [PATCH 05/16] Se agregaron dos columnas al RepAnticiposEspeciales (Saldo, % Por Amortizar). --- Ventas/RepAnticiposEspeciales.aspx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Ventas/RepAnticiposEspeciales.aspx b/Ventas/RepAnticiposEspeciales.aspx index 28f529dba..8ae071ee7 100644 --- a/Ventas/RepAnticiposEspeciales.aspx +++ b/Ventas/RepAnticiposEspeciales.aspx @@ -184,6 +184,18 @@ + + +   + + + + + +   + + + From b7bebf887528a838068559b74a74916ab86461d8 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 13 Aug 2020 16:19:09 -0700 Subject: [PATCH 06/16] -- filtro de resguardados, y cambio texto de uniforme --- RH/Personal.aspx.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index 685e8d9e0..b6e87641f 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -5105,7 +5105,7 @@ Partial Class RH_Personal Dim ObjInv As New ClsInventarios - If ObjInv.GetResguardoUniformesRep(UsuarioActual.CveEmpresa, CvePersonal, -1, -1, Todo:=True) Then + If ObjInv.GetResguardoUniformesRep(UsuarioActual.CveEmpresa, CvePersonal, -1, -1) Then GvUniformesResguardo.DataSource = ObjInv.DtResultados UniformesInfo = ObjInv.DtResultados Else @@ -5168,15 +5168,15 @@ Partial Class RH_Personal Dim ObjInventario As New ClsInventarios ObjInventario.IniciaTransacSQL() - Dim CveResultadoSalida As Integer = ObjInventario.AddMovimiento(CveAlmacenUniforme, 3, 1, Date.Now, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, -1, -1, -1, CveAlmacenDestino:=DdlAlmacenDestinoLiberarUniforme.SelectedValue.ToEntero, CvePersonal:=CvePersonal, Observaciones:=DescripcionUniforme) + Dim CveResultadoSalida As Integer = ObjInventario.AddMovimiento(CveAlmacenUniforme, 3, 1, Date.Now, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, -1, -1, -1, CveAlmacenDestino:=DdlAlmacenDestinoLiberarUniforme.SelectedValue.ToEntero, CvePersonal:=CvePersonal, CveMovimientoRelacionado:=CveMovimientoUniforme, Observaciones:=DescripcionUniforme, Modulo:="RHLibResg") Dim ResultadoDetalleSalida As Boolean = ObjInventario.AddMovimientoDetalle(CveResultadoSalida, 1.0, CveUM, CvePS, PU, CveSeccionAlmacen:=CveSeccionAlmacenUniforme, CveMovimientoDetalleEntrada:=CveMovimientoDetalleUniforme) Dim CveSeccionAlmacen As Integer = DdlSeccionAlmacen.SelectedValue.ToEntero - Dim CveResultadoEntrada As Integer = ObjInventario.AddMovimiento(DdlAlmacenDestinoLiberarUniforme.SelectedValue.ToEntero, 2, 1, Date.Now, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, -1, -1, -1, CvePersonal:=CvePersonal, Observaciones:=DescripcionUniforme, CveMovimientoRelacionado:=CveMovimientoUniforme) + Dim CveResultadoEntrada As Integer = ObjInventario.AddMovimiento(DdlAlmacenDestinoLiberarUniforme.SelectedValue.ToEntero, 2, 1, Date.Now, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, -1, -1, -1, CvePersonal:=CvePersonal, Observaciones:=DescripcionUniforme, CveMovimientoRelacionado:=CveResultadoSalida, Modulo:="RHLibResg2") Dim ResultadoDetalleEntrada As Boolean = ObjInventario.AddMovimientoDetalle(CveResultadoEntrada, 1.0, CveUM, CvePS, PU, CveSeccionAlmacen:=CveSeccionAlmacen) If ResultadoDetalleSalida And ResultadoDetalleEntrada Then ObjInventario.Commit() - Alert("Uniforme liberado") + Alert("Resguardo liberado correctamente") RegistraScript(String.Format("$('#{0}').modal('hide');", "ModalUniforme")) CargaUniformesPersonal() Else From e94d908ee07d9a003b2738aea84fd881c4f3f2e0 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 13 Aug 2020 16:19:42 -0700 Subject: [PATCH 07/16] -- visualizar el nombre del personal, si esta asignado --- Inventarios/EntradasSalidas.aspx.vb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Inventarios/EntradasSalidas.aspx.vb b/Inventarios/EntradasSalidas.aspx.vb index bce30ff42..39e43da47 100644 --- a/Inventarios/EntradasSalidas.aspx.vb +++ b/Inventarios/EntradasSalidas.aspx.vb @@ -790,6 +790,15 @@ Partial Class Inventarios_EntradasSalidas End If + 'carga personal + If Mov.CvePersonal > 0 Then + DdlPersonal.DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa, CvePersonal:=Mov.CvePersonal) + DdlPersonal.DataBind() + DdlPersonal.SelectedValueExist(Mov.CvePersonal) + DdlPersonal.Enabled = False + TrPersonal.Visible = True + End If + If Mov.CveClienteSucursal > 0 Then CambiaCliente() From d2c94503e7534dd57d4e3b334d3573fc04f4fdf4 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 13 Aug 2020 16:20:10 -0700 Subject: [PATCH 08/16] ajuste de negativos --- Contabilidad2/RepLibroDiario.aspx.vb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Contabilidad2/RepLibroDiario.aspx.vb b/Contabilidad2/RepLibroDiario.aspx.vb index 9ae6cf4b7..60dd72327 100644 --- a/Contabilidad2/RepLibroDiario.aspx.vb +++ b/Contabilidad2/RepLibroDiario.aspx.vb @@ -113,8 +113,13 @@ Partial Class Contabilidad2_RepLibroDiario e.Row.Cells(1).Text = "" e.Row.Cells(2).Text = "" e.Row.Cells(3).Text = "" - e.Row.Cells(7).Text = If(e.Row.Cells(7).Text.ToEntero() > 0, e.Row.Cells(7).Text, "") - e.Row.Cells(8).Text = If(e.Row.Cells(8).Text.ToEntero() > 0, e.Row.Cells(8).Text, "") + If e.Row.DBCampo("TipoMovto") = "True" Then + e.Row.Cells(7).Text = "" + Else + e.Row.Cells(8).Text = "" + End If + 'e.Row.Cells(7).Text = If(e.Row.Cells(7).Text.ToEntero() > 0, e.Row.Cells(7).Text, "") + 'e.Row.Cells(8).Text = If(e.Row.Cells(8).Text.ToEntero() > 0, e.Row.Cells(8).Text, "") End If 'SUBTOTAL From d401ee8be3ebd3d83b7ed93fba9e427b2cdf26a5 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 13 Aug 2020 16:21:07 -0700 Subject: [PATCH 09/16] -tama;o del grid de desapartado --- Inventarios/Apartados.aspx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Inventarios/Apartados.aspx b/Inventarios/Apartados.aspx index 2661d78f5..a64a30f2b 100644 --- a/Inventarios/Apartados.aspx +++ b/Inventarios/Apartados.aspx @@ -397,11 +397,11 @@ <%--GV DATOS APARTADOS--%>
    -
    +
    - + From bae917feabcf29901d3cb7fdb31a53fb6c5ef237 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 13 Aug 2020 16:21:50 -0700 Subject: [PATCH 10/16] -- seccionalmacen en el desapartado automatico --- Inventarios/EntregaAlmacen.aspx.vb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Inventarios/EntregaAlmacen.aspx.vb b/Inventarios/EntregaAlmacen.aspx.vb index 093b01a9f..0c025cc20 100644 --- a/Inventarios/EntregaAlmacen.aspx.vb +++ b/Inventarios/EntregaAlmacen.aspx.vb @@ -2128,6 +2128,8 @@ Partial Class Inventarios_EntregaAlmacen CveMovimientoSalida = DtTraspasos.FiltroPrimeroValor("CveMovimientoSalida", $"CveAlmacen = {Dr1("CveAlmacen")}").ToEntero If Not CveMovimientoSalida > 0 Then + + CveMovimientoSalida = ObjInventario.AddMovimiento(Dr1("CveAlmacen").ToString.ToEntero, 8, 1, TxtFecha.Text.ToDate, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, CveVentaSurtir, -1, -1, Observaciones:=TxtObservaciones.Text.Trim, Guia:=TxtGuia.Text, CveContrato:=CveContrato, CveVendedor:=CveVendedor, CveCliente:=If(UsuarioActual.Empresa.Funcionalidad(146) = "1", -1, CveCliente), CveAlmacenDestino:=DdlAlmacen.SelectedValue.ToEntero, Modulo:="RE/G3") @@ -2149,6 +2151,12 @@ Partial Class Inventarios_EntregaAlmacen DtTraspasos.Rows.Add(DrMovto) End If + Dim CveSeccionAlmacen As Integer = -1 + If CBool(Dr("AplicaSeccion")) Then + CveSeccionAlmacen = GlobalDTInvPSSeccionesAlmacen(UsuarioActual.CveEmpresa, Dr1("CveAlmacen").ToString.ToEntero, Dr("CvePS").ToString.ToEntero).FiltroPrimeroValor("CveSeccionAlmacen").ToEntero + Else + CveSeccionAlmacen = -1 + End If CantidadPendiente = If(Dr1("ExistenciaFinal").ToString.ToDecimal > CantidadSaldo, CantidadSaldo, Dr1("ExistenciaFinal").ToString.ToDecimal) @@ -2157,7 +2165,7 @@ Partial Class Inventarios_EntregaAlmacen CveVentaDetalle:=Dr("CveVentaDetalle").ToString.ToEntero, FechaCaducidad:=If(CBool(Dr("AplicaCaducidad")), Dr("FechaCaducidad").ToString.ToDate, MinFecha), Lote:=If(CBool(Dr("AplicaLote")), Dr("Lote").ToString, "-1"), - CveSeccionAlmacen:=If(CBool(Dr("AplicaSeccion")), Dr("CveSeccion").ToString.ToEntero, -1)) Then + CveSeccionAlmacen:=CveSeccionAlmacen) Then ErrorMovInv = True TextoError.AppendFormat("Ocurrió un error al procesar los conceptos de traspaso de apartado. Por favor vuelva a intentar.") Exit For From 070e880bb1bb327f143d4f343b7799dc84d9e8d5 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 13 Aug 2020 19:16:03 -0700 Subject: [PATCH 11/16] Columna nueva al reporte de comisiones --- Ventas/RepComisiones.aspx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Ventas/RepComisiones.aspx b/Ventas/RepComisiones.aspx index bedffe731..1312337bb 100644 --- a/Ventas/RepComisiones.aspx +++ b/Ventas/RepComisiones.aspx @@ -114,14 +114,15 @@ + - + <%-- - + --%> <%----%> From 112604a898ba643a7bef8e743b640293653544e2 Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Fri, 14 Aug 2020 17:02:10 -0700 Subject: [PATCH 12/16] Maquinaria --- AF/RegistroRevision.aspx | 384 +++++++++++----- AF/RegistroRevision.aspx.vb | 423 ++++++++++++++++-- AF/RepAF.aspx | 4 +- AF/RepAF.aspx.vb | 14 +- AF/RepRevision.aspx | 240 ++++++++++ AF/RepRevision.aspx.vb | 183 ++++++++ App_Code/ClsAF.vb | 73 ++- App_Code/ClsPaginas.vb | 1 + .../RepEstadoResultadosHorizontal.aspx.vb | 8 - 9 files changed, 1162 insertions(+), 168 deletions(-) create mode 100644 AF/RepRevision.aspx create mode 100644 AF/RepRevision.aspx.vb diff --git a/AF/RegistroRevision.aspx b/AF/RegistroRevision.aspx index 32727f609..33ca39586 100644 --- a/AF/RegistroRevision.aspx +++ b/AF/RegistroRevision.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="RegistroRevision.aspx.vb" Inherits="AF_RegistroRevision" %> +<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="RegistroRevision.aspx.vb" Inherits="AF_RegistroRevision" EnableEventValidation = "false" %> @@ -40,33 +40,25 @@ -<%-- + <%-- +
  • - - Nuevo Activo Fijo - -
    • -
  • - PDF -
    • -
  • - - Excel - + PDF
    • +     - - + + -     --%> +     --%>     - Catálogo de Activos Fijos + Registro Revisión @@ -75,12 +67,70 @@ -
    + +
    +
    +
    +
    + + +
    +
    +
    + <%--
    +
    +
    + + +
    + +
    + + + + +
    + + + + +
    + +
    + + + + +
    + + + + + +
    + + + + +
    + + +
    + +
    + + + +<%--
    - + @@ -90,26 +140,16 @@
    -
    +
    - +
    Fecha:
    -
    - -
    - - - - -
    - - - <%-- - --%> - -
    + + + +
    @@ -121,86 +161,218 @@
    -
    +
    --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + <%-- + + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + + + +
    +
    + + diff --git a/AF/RegistroRevision.aspx.vb b/AF/RegistroRevision.aspx.vb index b1a64a62e..239360a85 100644 --- a/AF/RegistroRevision.aspx.vb +++ b/AF/RegistroRevision.aspx.vb @@ -1,58 +1,166 @@ -Option Explicit On -Option Strict On - -Imports System.Data -Imports Extensiones -Imports Microsoft.Reporting.WebForms - -Partial Class AF_RegistroRevision +Option Explicit On +Option Strict On + +Imports System.Data +Imports System.IO +Imports Extensiones +Imports GemBox.Spreadsheet +Imports Microsoft.Reporting.WebForms + +Partial Class AF_RegistroRevision Inherits ClsPaginas -#Region " PROPIEDADES" +#Region " PROPIEDADES" -#End Region + Property DT_Cabeceras As DataTable + Get + + If ViewState("DT_Cabeceras") Is Nothing Then + + Return New DataTable + Else + Return DirectCast(ViewState("DT_Cabeceras"), DataTable) + End If + + End Get + Set(value As DataTable) + ViewState("DT_Cabeceras") = value + End Set + End Property + + + Property DT_Datos As DataTable + Get + + If ViewState("DT_Datos") Is Nothing Then + Return New DataTable + Else + Return DirectCast(ViewState("DT_Datos"), DataTable) + End If + + End Get + Set(value As DataTable) + ViewState("DT_Datos") = value + End Set + End Property + + + Property ReporteBytes As Byte() + Get + If ViewState("ReporteBytes") Is Nothing Then + Return Nothing + Else + Return DirectCast(ViewState("ReporteBytes"), Byte()) + End If + End Get + Set(value As Byte()) + ViewState("ReporteBytes") = value + End Set + End Property + +#End Region + + Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load + If Not Page.IsPostBack Then - Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load - If Not Page.IsPostBack Then - CargaCombos() + 'CargaDatos() - CargaDatos() - End If + TxtFecha.Text = $"{Now.Day.ToString("00")}/{Now.Month.ToString("00")}/{Now.Year}" + + End If End Sub -#Region " CARGA PARAMETROS " +#Region " CARGA PARAMETROS " -#End Region +#End Region -#Region " CARGA COMBOS " +#Region " CARGA COMBOS " Protected Sub CargaCombos() CargarCentrosDeCosto(Nothing, DdlSubProyecto, Nothing, LblSubProyecto) + LblSubProyecto2.Text = LblSubProyecto.Text + + + + + End Sub -#End Region +#End Region -#Region " CARGA DATOS " - Protected Sub BtnFiltrar_Click(sender As Object, e As EventArgs) - CargaDatos() - - End Sub +#Region " CARGA DATOS " + 'Protected Sub BtnFiltrar_Click(sender As Object, e As EventArgs) + ' CargaDatos() + + 'End Sub -#End Region +#End Region -#Region " GV DATOS " +#Region " GV DATOS " Private Sub CargaDatos() Dim ObjAF As New ClsAF + If ObjAF.GetMetricasRegistro(DdlSubProyecto.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, TxtFecha.Text.ToDate) Then + DT_Cabeceras = ObjAF.DSResultados.Tables(0) + DT_Datos = ObjAF.DSResultados.Tables(1) + + + If DT_Cabeceras.Rows.Count > 0 AndAlso DT_Datos.Rows.Count > 0 Then + BtnGuardar.Visible = True + Else + BtnGuardar.Visible = False + GvDatos.DataSource = Nothing + GvDatos.DataBind() + End If + + Else + GvDatos.DataSource = Nothing + GvDatos.DataBind() + BtnGuardar.Visible = False + End If ObjAF.Dispose() + If DT_Datos.Rows.Count > 0 Then + CargaTablas() + End If + + UpGuardar.Update() + UpDatos.Update() + + End Sub + + Private Sub CargaTablas() + + Dim IDX_LIMPIAR As Integer = 1 + + For IDX_LIMPIAR = 1 To 15 + GvDatos.Columns(IDX_LIMPIAR).HeaderText = "" + GvDatos.Columns(IDX_LIMPIAR).Visible = False + Next + + Dim x As Integer = 0 + Dim limite As Integer = DT_Cabeceras.Rows.Count - 1 + + + For x = 0 To limite + GvDatos.Columns(x + 1).HeaderText = DT_Cabeceras.Rows(x)("Metrica").ToString + GvDatos.Columns(x + 1).Visible = True + Next x + + + GvDatos.DataSource = DT_Datos + GvDatos.DataBind() + + + + End Sub @@ -60,15 +168,270 @@ Partial Class AF_RegistroRevision If e.Row.RowType = DataControlRowType.DataRow Then + e.Row.FCDropDownList("DdlPersonal").DataSource = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltraParametros("CveEstatusPersonal = 1") + e.Row.FCDropDownList("DdlPersonal").DataBind() + e.Row.FCDropDownList("DdlPersonal").Items.Insert(0, New ListItem("Selecione uno", "-1")) + e.Row.FCDropDownList("DdlPersonal").SelectedValueExist(e.Row.DataKey("CvePersonaResponsable")) + + End If - End If - End Sub -#End Region +#End Region + + Protected Sub LnkEliminarMetricaValor_Click(sender As Object, e As EventArgs) + + End Sub + + Protected Sub DdlSubProyecto_SelectedIndexChanged(sender As Object, e As EventArgs) + + If DdlSubProyecto.SelectedValue.ToEntero > 0 Then + CargaDatos() + + Else + GvDatos.DataSource = Nothing + GvDatos.DataBind() + + UpDatos.Update() + + End If + + End Sub + Protected Sub BtnGuardar_Click(sender As Object, e As EventArgs) + + + Dim ObjAF As New ClsAF + Dim limite As Integer = DT_Cabeceras.Rows.Count - 1 + + ObjAF.IniciaTransacSQL() + + Dim ErrorProceso As Boolean = False + + For Each GvRow As GridViewRow In GvDatos.Rows + If GvRow.RowType = DataControlRowType.DataRow Then + + Dim DdlPersonal As DropDownList = GvRow.FCDropDownList("DdlPersonal") + + If DdlPersonal.SelectedValue.ToEntero <= 0 Then + Alert($"unidad: {GvRow.DataKey("Unidad")} require personal", TipoMensaje.MsgAdvertencia) + + ErrorProceso = True + Exit For + End If + + If ObjAF.AddMetricasValores(GvRow.DataKey("CveActivoFijo").ToEntero, DdlPersonal.SelectedValue.ToEntero, UsuarioActual.CveUsuario, DdlSubProyecto.SelectedValue.ToEntero, TxtFecha.Text.ToDate, UsuarioActual.CveEmpresa) Then + + Dim CveMetricaValor As Integer = ObjAF.CveMetricaValor + Dim x As Integer = 0 + + For x = 0 To limite + Dim valor As String = GvRow.FCTextBox($"TxtMetrica{x + 1}").Text + + valor = If(valor.Trim.Length = 0, "0", valor) + If ObjAF.AddMetricasValoresDetalle(CveMetricaValor, DT_Cabeceras(x)("CveMetrica").ToString.ToEntero, valor) Then + ErrorProceso = False + Else + ErrorProceso = True + Exit For + End If + Next x + + If ErrorProceso Then + Exit For + End If + + Else + ErrorProceso = True + Exit For + End If + End If + + Next + + + If Not ErrorProceso Then + + ObjAF.Commit() + ExportToExcelG(GvDatos, $"RegistroRevision{Now.ToString("yyyyMMddmmss")}", UsuarioActual, "ReporteRevision", 100, 100, filtros:=$"Filtros {LblSubProyecto.Text}: {DdlSubProyecto.SelectedItem.Text} Fecha: {TxtFecha.Text}") + RegistraScript("$('#ModalDescargaReporte').modal({ backdrop: 'static', keyboard: false });") + GvDatos.DataSource = Nothing + GvDatos.DataBind() + + BtnGuardar.Visible = False + + UpDatos.Update() + UpGuardar.Update() + + Else + ObjAF.RollBack() + End If + + ObjAF.Dispose() + + End Sub -End Class +#Region "DESCARGA EXCEL" + + Public Sub ExportToExcelG(Gv1 As GridView, NombreArchivoXLSx As String, Usuario As Usuario, Titulo As String, Optional AlturaImagen As Double = 100, Optional AnchoImagen As Double = 100, Optional filtros As String = "") + + + + For Each GvRow As GridViewRow In Gv1.Rows + + Dim IDX_LIMPIAR As Integer = 1 + + For IDX_LIMPIAR = 1 To 15 + GvRow.Cells(IDX_LIMPIAR).Text = GvRow.FCTextBox($"TxtMetrica{IDX_LIMPIAR}").Text + Next + + If GvRow.FCDropDownList("DDLPersonal").SelectedValue.ToEntero > 0 Then + GvRow.Cells(16).Text = GvRow.FCDropDownList("DDLPersonal").SelectedItem.Text + Else + GvRow.Cells(16).Text = "" + End If + + Next + + + + Dim sw1 As New StringWriter() + Dim htw1 As New HtmlTextWriter(sw1) + Gv1.RenderControl(htw1) + + Dim options = GemBox.Spreadsheet.LoadOptions.HtmlDefault + Dim htmlStream1 = New MemoryStream(options.Encoding.GetBytes(sw1.ToString())) + + htmlStream1.Position = 0 + Dim sr1 As New StreamReader(htmlStream1) + Dim myStr1 = sr1.ReadToEnd() + + sr1.Dispose() + htmlStream1.Dispose() + sw1.Dispose() + + Dim HtmlCompleto As String = myStr1 + + + HtmlCompleto = Regex.Replace(HtmlCompleto, "\<[\/]*a[^\>]*\>", "") + + Dim asd As String = "" + + + Dim htmlStream5 = New MemoryStream(options.Encoding.GetBytes(HtmlCompleto)) + + GemBox.Spreadsheet.SpreadsheetInfo.SetLicense(SerialGemBoxSpreadsheet()) + + Dim excel As GemBox.Spreadsheet.ExcelFile + + excel = GemBox.Spreadsheet.ExcelFile.Load(htmlStream5, options) + + If Usuario IsNot Nothing Then + Dim TotalRowHeader As Integer = 8 + Dim TotalRowFooter As Integer = 2 + + Dim worksheet = excel.Worksheets(0) + worksheet.Rows.InsertEmpty(0, TotalRowHeader) + Dim celdasConTexto = worksheet.GetUsedCellRange(True) + celdasConTexto.Style.Font.Name = "Calibri Light" + + Dim RangoNombreEmpresa = worksheet.Cells.GetSubrangeAbsolute(1, celdasConTexto.FirstColumnIndex, 1, celdasConTexto.LastColumnIndex) + RangoNombreEmpresa.Merged = True + RangoNombreEmpresa.Value = Usuario.Empresa.Empresa + RangoNombreEmpresa.Style.Font.Size = 18 * 20 + RangoNombreEmpresa.Style.Font.Name = "Calibri Light" + RangoNombreEmpresa.Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Center + RangoNombreEmpresa.Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center + + + Dim RangoFiltros = worksheet.Cells.GetSubrangeAbsolute(6, celdasConTexto.FirstColumnIndex, 6, celdasConTexto.LastColumnIndex) + RangoFiltros.Merged = True + RangoFiltros.Value = filtros + RangoFiltros.Style.Font.Size = 15 * 20 + RangoFiltros.Style.Font.Name = "Calibri Light" + RangoFiltros.Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Left + RangoFiltros.Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center + + + Dim RangoTitulo = worksheet.Cells.GetSubrangeAbsolute(3, celdasConTexto.FirstColumnIndex, 3, celdasConTexto.LastColumnIndex) + RangoTitulo.Merged = True + RangoTitulo.Value = Titulo + RangoTitulo.Style.Font.Size = 20 * 20 + RangoTitulo.Style.Font.Name = "Calibri Light" + RangoTitulo.Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Center + RangoTitulo.Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center + + For i = celdasConTexto.FirstColumnIndex To celdasConTexto.LastColumnIndex + worksheet.Rows(8).Cells(i).Style.Font.Size = 12 * 20 + worksheet.Rows(8).Cells(i).Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Center + worksheet.Rows(8).Cells(i).Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center + + worksheet.Rows(8).Cells(i).Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(75, 119, 190), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)) + worksheet.Rows(8).Cells(i).Style.Font.Color = GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255) + + + + + If i > 0 Then + Try + worksheet.Columns(i).AutoFit(1) + Catch ex As Exception + End Try + End If + + Next + + Dim IndexEndTable As Integer = Gv1.Rows.Count + 4 + TotalRowHeader + TotalRowFooter + + worksheet.Rows(IndexEndTable).Cells(0).Value = "Usuario Imprimió" + worksheet.Rows(IndexEndTable + 1).Cells(0).Value = Usuario.Nombre + + worksheet.Rows(IndexEndTable).Cells(2).Value = "Fecha Impresión" + worksheet.Rows(IndexEndTable + 1).Cells(2).Value = DateTime.Now.ToString("dd/MM/yyyy") + + Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", Usuario.Empresa.Ruta)) + + If Imagen.Exists Then + Dim Ruta As String = String.Format("{0}/Logo.png", Usuario.Empresa.Ruta) + Using sr As New StreamReader(Ruta) + Dim ms As New MemoryStream() + sr.BaseStream.CopyTo(ms) + worksheet.Pictures.Add(ms, ExcelPictureFormat.Png, "A1", AnchoImagen, AlturaImagen, LengthUnit.Pixel) + End Using + End If + + End If + + + + + Dim memoryStream As New MemoryStream() + excel.Save(memoryStream, SaveOptions.XlsxDefault) + ReporteBytes = memoryStream.ToArray() + memoryStream.Dispose() + + End Sub + + + Protected Sub LnkDescargaReporte_Click(sender As Object, e As EventArgs) + + + Response.ContentType = "application/force-download" + Response.AppendHeader("Content-Disposition", $"attachment;filename=RegistroRevision{Now.ToString("yyyyMMddmmss")}.xlsx") + Response.BinaryWrite(ReporteBytes) + Response.End() + + End Sub + + + Public Overrides Sub VerifyRenderingInServerForm(ByVal control As Control) + End Sub + +#End Region + + + +End Class diff --git a/AF/RepAF.aspx b/AF/RepAF.aspx index 6d3f2a6fd..a716f6d69 100644 --- a/AF/RepAF.aspx +++ b/AF/RepAF.aspx @@ -100,11 +100,11 @@
    Tipo:
    -
    +
    SubTipo:
    -
    +
    Agrupador:
    diff --git a/AF/RepAF.aspx.vb b/AF/RepAF.aspx.vb index fe1f3c9e2..c22268a9c 100644 --- a/AF/RepAF.aspx.vb +++ b/AF/RepAF.aspx.vb @@ -38,16 +38,16 @@ Partial Class AF_RepAF Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load If Not Page.IsPostBack Then - CargaFiltros() - 'CargaDatos() - - If UsuarioActual.Empresa.GralSoloProyecto Then - DivProyecto.Visible = False + CargaFiltros() + 'CargaDatos() + + ' If UsuarioActual.Empresa.GralSoloProyecto Then + DivProyecto.Visible = False LblSubProyecto.Text = "Proyecto: " DdlSubProyecto.DataSource = GlobalDTSubProyectos(-1, CveEmpresa:=UsuarioActual.CveEmpresa) DdlSubProyecto.DataBind() - DdlSubProyecto.Items.Insert(0, New ListItem("Todos", "-1")) - End If + DdlSubProyecto.Items.Insert(0, New ListItem("Todos", "-1")) + ' End If End If End Sub diff --git a/AF/RepRevision.aspx b/AF/RepRevision.aspx new file mode 100644 index 000000000..6170e3745 --- /dev/null +++ b/AF/RepRevision.aspx @@ -0,0 +1,240 @@ +<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="RepRevision.aspx.vb" Inherits="AF_RepRevision" %> + + + + + + + + +<%-- + +
  • + + Nuevo Activo Fijo + +
    • +
  • + PDF +
    • +
  • + + Excel + +
    • + +     + + + + +     --%> + + +     + + Reporte Revisión + + + + + + + + +
    +
    +
    + + + + + + +
    +
    + +
    + + +
    +
    + +
    + +
    Tipo:
    +
    + +
    +
    SubTipo:
    +
    + + Todos + +
    + + +
    Fecha I:
    +
    + + +
    + + + + +
    + + + <%-- + --%> + +
    + + +
    Fecha F:
    +
    + + +
    + + + + +
    + + + <%-- + --%> + +
    +
    + + +
    +
    + +
    + +     +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     + + + + + + diff --git a/AF/RepRevision.aspx.vb b/AF/RepRevision.aspx.vb new file mode 100644 index 000000000..f96ebab1d --- /dev/null +++ b/AF/RepRevision.aspx.vb @@ -0,0 +1,183 @@ +Option Explicit On +Option Strict On + +Imports System.Data +Imports Extensiones +Imports Microsoft.Reporting.WebForms + +Partial Class AF_RepRevision + Inherits ClsPaginas + +#Region " PROPIEDADES" + + Property DT_Cabeceras As DataTable + Get + + If ViewState("DT_Cabeceras") Is Nothing Then + + Return New DataTable + Else + Return DirectCast(ViewState("DT_Cabeceras"), DataTable) + End If + + End Get + Set(value As DataTable) + ViewState("DT_Cabeceras") = value + End Set + End Property + + + Property DT_Datos As DataTable + Get + + If ViewState("DT_Datos") Is Nothing Then + Return New DataTable + Else + Return DirectCast(ViewState("DT_Datos"), DataTable) + End If + + End Get + Set(value As DataTable) + ViewState("DT_Datos") = value + End Set + End Property + +#End Region + + Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load + If Not Page.IsPostBack Then + + CargaCombos() + CargaDatos() + + Dim FechaActual As Date = Now + + + TxtFechaF.Text = $"{FechaActual.Day.ToString("00")}/{FechaActual.Month.ToString("00")}/{FechaActual.Year}" + FechaActual = FechaActual.AddDays(-30) + TxtFechaI.Text = $"{FechaActual.Day.ToString("00")}/{FechaActual.Month.ToString("00")}/{FechaActual.Year}" + + End If + End Sub + + +#Region " CARGA PARAMETROS " + +#End Region + +#Region " CARGA COMBOS " + Protected Sub CargaCombos() + CargarCentrosDeCosto(Nothing, DdlSubProyecto, Nothing, LblSubProyecto) + + DdlTipoActivo.DataSource = GlobalDTTipoActivoFijo(UsuarioActual.CveEmpresa).FiltraParametros("", "TipoActivoFijo") + DdlTipoActivo.DataBind() + DdlTipoActivo.Items.Insert(0, New ListItem("Todos", "-1")) + + End Sub + + +#End Region + +#Region " CARGA DATOS " + Protected Sub BtnFiltrar_Click(sender As Object, e As EventArgs) + CargaDatos() + + End Sub + + +#End Region + +#Region " GV DATOS " + + Private Sub CargaDatos() + + Dim ObjAF As New ClsAF + + If ObjAF.GetMetricasValores(-1, -1, -1, -1, DdlSubProyecto.SelectedValue.ToEntero, DdlTipoActivo.SelectedValue.ToEntero, DdlSubTipoActivo.SelectedValue.ToEntero, TxtFechaI.Text.ToDate, TxtFechaF.Text.ToDate, UsuarioActual.CveEmpresa) Then + + DT_Cabeceras = ObjAF.DSResultados.Tables(0) + DT_Datos = ObjAF.DSResultados.Tables(1) + + 'GvDatos.DataSource = ObjAF.DtResultados + Else + GvDatos.DataSource = Nothing + End If + + ObjAF.Dispose() + + 'GvDatos.DataBind() + 'UpDatos.Update() + + If DT_Datos.Rows.Count > 0 Then + CargaTablas() + End If + + + End Sub + + Private Sub CargaTablas() + + Dim IDX_LIMPIAR As Integer = 1 + + '5 + For IDX_LIMPIAR = 2 To 16 + CType(GvDatos.Columns(IDX_LIMPIAR), BoundField).DataField = Nothing + CType(GvDatos.Columns(IDX_LIMPIAR), BoundField).HeaderText = "" + GvDatos.Columns(IDX_LIMPIAR).Visible = False + Next + + Dim x As Integer = 0 + Dim limite As Integer = DT_Cabeceras.Rows.Count - 1 + + + For x = 0 To limite + CType(GvDatos.Columns(x + 2), BoundField).DataField = DT_Datos.Columns(5 + x).ColumnName + CType(GvDatos.Columns(x + 2), BoundField).HeaderText = DT_Cabeceras.Rows(x)("Metrica").ToString + GvDatos.Columns(x + 2).Visible = True + Next x + + GvDatos.DataSource = DT_Datos + GvDatos.DataBind() + + UpDatos.Update() + 'For IDX_LIMPIAR = 2 To 17 + 'CType(GvDatos.Columns(IDX_LIMPIAR), BoundField).DataField = Nothing + 'CType(GvDatos.Columns(IDX_LIMPIAR), BoundField).HeaderText = DT_Cabeceras.Rows() + 'Next + + End Sub + + + Protected Sub GvDatos_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvDatos.RowDataBound + + If e.Row.RowType = DataControlRowType.DataRow Then + + + + End If + + End Sub + +#End Region + + + + + Protected Sub LnkEliminarMetricaValor_Click(sender As Object, e As EventArgs) + + End Sub + + + + Protected Sub DdlTipoActivo_SelectedIndexChanged(sender As Object, e As EventArgs) + + DdlSubTipoActivo.Items.Clear() + DdlSubTipoActivo.DataSource = GlobalDTSubTipoActivoFijo(UsuarioActual.CveEmpresa).FiltraParametros(String.Format("CveTipoActivoFijo = {0}", DdlTipoActivo.SelectedValue), "SubTipoActivoFijo") + DdlSubTipoActivo.DataBind() + DdlSubTipoActivo.Items.Insert(0, New ListItem("Todos", "-1")) + + + UpFiltro.Update() + + End Sub +End Class diff --git a/App_Code/ClsAF.vb b/App_Code/ClsAF.vb index 410a4db11..d4ff29cdc 100644 --- a/App_Code/ClsAF.vb +++ b/App_Code/ClsAF.vb @@ -17,18 +17,28 @@ Public Class ClsAF Private SqlCommand As SqlCommand Private SqlTransacc As SqlTransaction Private Data As DataTable + Private DSet As New DataSet Private disposedValue As Boolean = False ' Para detectar llamadas redundantes 'REGISTRAR CONEXIÓN Private CveConexion As Integer = 0 - Private EsTransaccionCompartida As Boolean = False + Private EsTransaccionCompartida As Boolean = False + + Public CveMetricaValor As Integer = 0 + #End Region - + #Region "Propiedades" Public ReadOnly Property DtResultados() As DataTable Get DtResultados = Data End Get + End Property + + Public ReadOnly Property DSResultados() As DataSet + Get + DSResultados = DSet + End Get End Property Public Property CveActivoFijo As Integer @@ -3239,9 +3249,10 @@ Public Class ClsAF End Try Return Retorno - End Function + End Function #End Region #Region "M E T R I C A S" + Public Function GetMetricas(CveMetrica As Integer) As Boolean Dim Retorno As Boolean = False @@ -3296,11 +3307,35 @@ Public Class ClsAF OnError("Ocurrió un error al agregar la métrica de Activo Fijo.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try + Return Retorno + End Function + + + + Public Function GetMetricasRegistro(CveSubProyecto As Integer, CveEmpresa As Integer, Fecha As Date) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_MetricasRegistroGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@Fecha", SqlDbType.Date).Value = Fecha + End With + + Try + SqlAdapter.Fill(DSet) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los valores de métricas de Activo Fijo.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + Return Retorno End Function - Public Function GetMetricasValores(Optional CveMetricaValor As Integer = -1, Optional CveAF As Integer = -1, Optional CvePersonal As Integer = -1, Optional CveUsuario As Integer = -1, - Optional CveSubProyecto As Integer = -1, Optional Fecha As String = "1900-01-01", Optional FechaIng As String = "1900-01-01") As Boolean + + Public Function GetMetricasValores(CveMetricaValor As Integer, CveAF As Integer, CvePersonal As Integer, CveUsuario As Integer, CveSubProyecto As Integer, CveTipoActivoFijo As Integer, CveSubTipoActivoFijo As Integer, FechaI As Date, FechaF As Date, + CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_AF_MetricasValoresGet") @@ -3311,12 +3346,15 @@ Public Class ClsAF .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto - .Add("@Fecha", SqlDbType.DateTime).Value = Fecha - .Add("@FechaIng", SqlDbType.DateTime).Value = FechaIng + .Add("@CveTipoActivoFijo", SqlDbType.Int).Value = CveTipoActivoFijo + .Add("@CveSubTipoActivoFijo", SqlDbType.Int).Value = CveSubTipoActivoFijo + .Add("@FechaI", SqlDbType.Date).Value = FechaI + .Add("@FechaF", SqlDbType.Date).Value = FechaF + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try - SqlAdapter.Fill(Data) + SqlAdapter.Fill(DSet) Retorno = True Catch ex As Exception OnError("Ocurrió un error al obtener los valores de métricas de Activo Fijo.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) @@ -3325,9 +3363,9 @@ Public Class ClsAF Return Retorno End Function - Public Function AddMetricasValores(Optional CveAF As Integer = -1, Optional CvePersonal As Integer = -1, Optional CveUsuario As Integer = -1, - Optional CveSubProyecto As Integer = -1, Optional Fecha As String = "1900-01-01", Optional FechaIng As String = "1900-01-01") As Boolean + Public Function AddMetricasValores(CveAF As Integer, CvePersonal As Integer, CveUsuario As Integer, CveSubProyecto As Integer, Fecha As Date, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False + CveMetricaValor = -1 DataAdapter("PA_AF_MetricasValoresAdd") @@ -3336,12 +3374,16 @@ Public Class ClsAF .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto - .Add("@Fecha", SqlDbType.DateTime).Value = Fecha - .Add("@FechaIng", SqlDbType.DateTime).Value = FechaIng + .Add("@Fecha", SqlDbType.Date).Value = Fecha + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@CveMetricaValor", SqlDbType.Int).Direction = ParameterDirection.Output + + End With Try SqlAdapter.Fill(Data) + CveMetricaValor = SqlAdapter.SelectCommand.Parameters("@CveMetricaValor").Value.ToString.ToEntero Retorno = True Catch ex As Exception OnError("Ocurrió un error al agregar el valor de métrica de Activo Fijo.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) @@ -3370,7 +3412,7 @@ Public Class ClsAF Return Retorno End Function - Public Function GetMetricasValoresDetalle(Optional CveMetricaValor As Integer = -1, Optional CveMetrica As Integer = -1) As Boolean + Public Function GetMetricasValoresDetalle(CveEmpresa As Integer, Optional CveMetricaValor As Integer = -1, Optional CveMetrica As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_AF_MetricasValoresDetalleGet") @@ -3378,6 +3420,7 @@ Public Class ClsAF With SqlAdapter.SelectCommand.Parameters .Add("@CveMetricaValor", SqlDbType.Int).Value = CveMetricaValor .Add("@CveMetrica", SqlDbType.Int).Value = CveMetrica + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With Try @@ -3398,7 +3441,7 @@ Public Class ClsAF With SqlAdapter.SelectCommand.Parameters .Add("@CveMetricaValor", SqlDbType.Int).Value = CveMetricaValor .Add("@CveMetrica", SqlDbType.Int).Value = CveMetrica - .Add("@Valor", SqlDbType.NVarChar).Value = Valor + .Add("@Valor", SqlDbType.VarChar).Value = Valor End With Try @@ -3419,7 +3462,7 @@ Public Class ClsAF With SqlAdapter.SelectCommand.Parameters .Add("@CveMetricaValor", SqlDbType.Int).Value = CveMetricaValor .Add("@CveMetrica", SqlDbType.Int).Value = CveMetrica - .Add("@Valor", SqlDbType.NVarChar).Value = Valor + .Add("@Valor", SqlDbType.VarChar).Value = Valor End With Try diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 68a9d44e3..bf5a7dea3 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -3951,6 +3951,7 @@ Public Class ClsPaginas PaginaDict.Add("/AF/RepDepreciacion.aspx".ToUpper(), -1) PaginaDict.Add("/AF/RepEventosProgramados.aspx".ToUpper(), 656) PaginaDict.Add("/AF/RegistroRevision.aspx".ToUpper(), 1251) + PaginaDict.Add("/AF/RepRevision.aspx".ToUpper(), 1252) #End Region 'AIMMGM #Region "AIMMGM" diff --git a/Contabilidad2/RepEstadoResultadosHorizontal.aspx.vb b/Contabilidad2/RepEstadoResultadosHorizontal.aspx.vb index 28d168f57..58c7fb895 100644 --- a/Contabilidad2/RepEstadoResultadosHorizontal.aspx.vb +++ b/Contabilidad2/RepEstadoResultadosHorizontal.aspx.vb @@ -240,20 +240,12 @@ Partial Class Contabilidad_RepEstadoResultadosHorizontal TotalActualMes = 0 TotalAnteriorMes = 0 - 'TotalActualMes = 0 - 'TotalAnteriorMes = 0 - - 'TxtFechaInicio.Text = DateSerial(Year(Date.Now), 1, 1).ToShortDateString - 'TxtFechaFin.Text = Date.Now.ToShortDateString CargaEjercicios() CargarCentrosDeCosto(Nothing, DdlSubproyecto, Nothing, LblSubProyecto) TabSubProyecto.HeaderText = LblSubProyecto.Text & " H." - 'DdlSubproyecto.DataSource = GlobalDTSubProyectosUsuarios(UsuarioActual.CveUsuario, -1, UsuarioActual.CveEmpresa) - 'DdlSubproyecto.DataBind() - ' CargaDatos() DdlEjercicio.SelectedValueExist(UsuarioActual.Empresa.EjercicioActual) ValidaEjercicios() From e4062f3bcef3bed10d4e4165d029bcba79e8e660 Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Fri, 14 Aug 2020 19:46:40 -0700 Subject: [PATCH 13/16] =?UTF-8?q?nuevos=20PA=20para=20los=20cat=C3=A1logos?= =?UTF-8?q?=20correspondientes=20de=20los=20PA=20agregados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/ClsAF.vb | 258 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 258 insertions(+) diff --git a/App_Code/ClsAF.vb b/App_Code/ClsAF.vb index 410a4db11..95fa81a74 100644 --- a/App_Code/ClsAF.vb +++ b/App_Code/ClsAF.vb @@ -3434,6 +3434,264 @@ Public Class ClsAF #End Region +#Region "TIPO SERVICIO" + Public Function GetTiposServicios(CveTipoServicio As Integer, CveTipoMantenimiento As Integer, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServicioGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicio", SqlDbType.Int).Value = CveTipoServicio + .Add("@CveTipoMantenimiento", SqlDbType.Int).Value = CveTipoMantenimiento + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function AddTiposServicios(Nombre As String, CveTipoMantenimiento As Integer, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServicioAdd") + + With SqlAdapter.SelectCommand.Parameters + .Add("@Nombre", SqlDbType.NVarChar).Value = Nombre + .Add("@CveTipoMantenimiento", SqlDbType.Int).Value = CveTipoMantenimiento + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al agregar los tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function UpdateTiposServicios(CveTipoServicio As Integer, Nombre As String, CveTipoMantenimiento As Integer, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServicioUpdate") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicio", SqlDbType.Int).Value = CveTipoServicio + .Add("@Nombre", SqlDbType.NVarChar).Value = Nombre + .Add("@CveTipoMantenimiento", SqlDbType.Int).Value = CveTipoMantenimiento + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar los tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function DeleteTiposServicios(CveTipoServicio As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServicioDelete") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicio", SqlDbType.Int).Value = CveTipoServicio + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al eliminar los tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function GetTiposServiciosActividades(CveTipoServicioActividad As Integer, CveActividad As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosActividadesGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicioActividad", SqlDbType.Int).Value = CveTipoServicioActividad + .Add("@CveActividad", SqlDbType.Int).Value = CveActividad + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las actividades tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function AddTiposServiciosActividades(CveActividad As Integer, Duracion As Integer, Observaciones As String) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosActividadesAdd") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveActividad", SqlDbType.Int).Value = CveActividad + .Add("@Duracion", SqlDbType.Int).Value = Duracion + .Add("@Observaciones", SqlDbType.NVarChar).Value = Observaciones + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al agregar las actividades tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function UpdateTiposServiciosActividades(CveTipoServicioActividad As Integer, CveActividad As Integer, Duracion As Integer, Observaciones As String) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosActividadesUpdate") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicioActividad", SqlDbType.Int).Value = CveTipoServicioActividad + .Add("@CveActividad", SqlDbType.Int).Value = CveActividad + .Add("@Duracion", SqlDbType.Int).Value = Duracion + .Add("@Observaciones", SqlDbType.NVarChar).Value = Observaciones + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar las actividades tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function DeleteTiposServiciosActividades(CveTipoServicioActividad As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosActividadesDelete") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicioActividad", SqlDbType.Int).Value = CveTipoServicioActividad + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las actividades tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function GetTiposServiciosMaterial(CveTipoServicioMaterial As Integer, CveTipoServicio As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosMaterialGet") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicioMaterial", SqlDbType.Int).Value = CveTipoServicioMaterial + .Add("@CveTipoServicio", SqlDbType.Int).Value = CveTipoServicio + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener los materiales de los tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function AddTiposServiciosMaterial(CveTipoServicio As Integer, Cantidad As Decimal, CveUM As Integer, CvePS As Integer, + Tipo As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosMaterialAdd") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicio", SqlDbType.Int).Value = CveTipoServicio + .Add("@Cantidad", SqlDbType.Money).Value = Cantidad + .Add("@CveUM", SqlDbType.Int).Value = CveUM + .Add("@CvePS", SqlDbType.Int).Value = CvePS + .Add("@Tipo", SqlDbType.TinyInt).Value = Tipo + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al agregar las actividades tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function UpdateTiposServiciosMaterial(CveTipoServicioMaterial As Integer, CveTipoServicio As Integer, Cantidad As Decimal, CveUM As Integer, CvePS As Integer, + Tipo As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosMaterialUpdate") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicioMaterial", SqlDbType.Int).Value = CveTipoServicioMaterial + .Add("@CveTipoServicio", SqlDbType.Int).Value = CveTipoServicio + .Add("@Cantidad", SqlDbType.Money).Value = Cantidad + .Add("@CveUM", SqlDbType.Int).Value = CveUM + .Add("@CvePS", SqlDbType.Int).Value = CvePS + .Add("@Tipo", SqlDbType.TinyInt).Value = Tipo + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las actividades tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function + + Public Function DeleteTiposServiciosMaterial(CveTipoServicioMaterial As Integer) As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_AF_TiposServiciosMaterialDelete") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveTipoServicioMaterial", SqlDbType.Int).Value = CveTipoServicioMaterial + End With + + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener las actividades tipos servicios.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function +#End Region + #Region " IDisposable Support " ' IDisposable From b5f928d12543d18bdb39b44c7ae5601a9443dc26 Mon Sep 17 00:00:00 2001 From: rrene Date: Fri, 14 Aug 2020 21:27:44 -0700 Subject: [PATCH 14/16] -- parametro usuario en recepcion entrega --- App_Code/ClsInventarios.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index 7d260f7a6..03a37d2fa 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -2751,7 +2751,7 @@ Public Class ClsInventarios Return Retorno End Function - Public Function ComprasPendientesAlmacenGet(CveProveedor As Integer, Fecha As Date, CveEmpresa As Integer) As Boolean + Public Function ComprasPendientesAlmacenGet(CveProveedor As Integer, Fecha As Date, CveUsuario As Integer, CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Inv_ComprasPendientesAlmacenGet") @@ -2759,6 +2759,7 @@ Public Class ClsInventarios With SqlAdapter.SelectCommand.Parameters .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor .Add("@Fecha", SqlDbType.Date).Value = Fecha + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With From 79ba735aa1f38298627bbede8dbe66cd841c73b2 Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Sat, 15 Aug 2020 13:04:43 -0700 Subject: [PATCH 15/16] Rep revision metricas se agrega columna Fecha despues de metricas --- AF/RepRevision.aspx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/AF/RepRevision.aspx b/AF/RepRevision.aspx index 6170e3745..4d9b06b49 100644 --- a/AF/RepRevision.aspx +++ b/AF/RepRevision.aspx @@ -194,6 +194,14 @@ + + + + + + + + @@ -209,13 +217,15 @@ - + + + From 864481ab24ddf1df47fce5172a4e7df62d2b4cf5 Mon Sep 17 00:00:00 2001 From: Rakcsle Supertramp Date: Sat, 15 Aug 2020 15:03:25 -0700 Subject: [PATCH 16/16] Cursos tema en uso --- App_Code/ClsRH.vb | 49 ++++++++++++++++++++++++--------------- RH/CatCursosTemas.aspx.vb | 10 ++++---- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index eeee4c853..3ac5ef12b 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -4157,12 +4157,22 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Try SqlAdapter.Fill(Data) Retorno = True - Catch exs As SqlException - If exs.ErrorCode = -2146232060 Then + Catch exs As SqlException + + + If exs.Message.Contains("Número: 547;") Then OnError("Ocurrió al Eliminar el Tema Existen registros relacionadados.", exs, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) Else OnError("Ocurrió al Eliminar el Tema TemasRemove.", exs, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End If + End If + + + 'If exs.ErrorCode = -2146232060 Then + ' OnError("Ocurrió al Eliminar el Tema Existen registros relacionadados.", exs, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + 'Else + ' OnError("Ocurrió al Eliminar el Tema TemasRemove.", exs, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + 'End If + Catch ex As Exception OnError("Ocurrió al Eliminar el Tema TemasRemove.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try @@ -6859,25 +6869,26 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo OnError("Ocurrió un error al obtener los pagos de factura de personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) End Try Return Retorno - End Function - + End Function + #End Region - - - Public msgsError As New StringBuilder() - Public Sub OnError(Mensaje As String, Exeption As Exception, Optional InfoAdicional As String = "") - GuardaLog(String.Format("{0} DESCRIPCIÓN DETALLADA: {1} {2} {3}", Mensaje, Exeption.ToString, vbCrLf, InfoAdicional)) - msgsError.AppendLine(Mensaje) - msgsError.Append("
    ") - 'Alert(Obj, Mensaje, TipoMensaje.MsgError) - 'If WebConfigurationManager.AppSettings("SiteName") IsNot Nothing AndAlso WebConfigurationManager.AppSettings("SiteName").ToString = "1" Then MandaCorreoError(String.Format("{0} DESCRIPCIÓN DETALLADA: {1} {2} {3}", Mensaje, Exeption.ToString, vbCrLf, InfoAdicional)) - End Sub + + + 'Public msgsError As New StringBuilder() + 'Public Sub OnError(Mensaje As String, Exeption As Exception, Optional InfoAdicional As String = "") + ' GuardaLog(String.Format("{0} DESCRIPCIÓN DETALLADA: {1} {2} {3}", Mensaje, Exeption.ToString, vbCrLf, InfoAdicional)) + ' msgsError.AppendLine(Mensaje) + ' msgsError.Append("
    ") + ' 'Alert(Obj, Mensaje, TipoMensaje.MsgError) + ' 'If WebConfigurationManager.AppSettings("SiteName") IsNot Nothing AndAlso WebConfigurationManager.AppSettings("SiteName").ToString = "1" Then MandaCorreoError(String.Format("{0} DESCRIPCIÓN DETALLADA: {1} {2} {3}", Mensaje, Exeption.ToString, vbCrLf, InfoAdicional)) + 'End Sub + #Region " IDisposable Support " - ' IDisposable + ' IDisposable Protected Overridable Sub Dispose(ByVal disposing As Boolean) - If msgsError.ToString().Length > 0 Then - Alert(msgsError.ToString(), TipoMensaje.MsgError) - End If + 'If msgsError.ToString().Length > 0 Then + ' Alert(msgsError.ToString(), TipoMensaje.MsgError) + 'End If If Not disposedValue Then If disposing Then ' TODO: Liberar otro estado (objetos administrados). diff --git a/RH/CatCursosTemas.aspx.vb b/RH/CatCursosTemas.aspx.vb index 76b5f1b13..75996ce7d 100644 --- a/RH/CatCursosTemas.aspx.vb +++ b/RH/CatCursosTemas.aspx.vb @@ -101,9 +101,8 @@ Partial Class RH_CatCursosTemas If objRH.TemasRemove(CveTema) Then CargadatosGvTemas() LoadComboTemas() - Alert("Tema elimino correctamente ", TipoMensaje.MsgInformacion) - Else - Alert("Ocurrio un error al eliminar el tema", TipoMensaje.MsgError) + Alert("Tema elimino correctamente ", TipoMensaje.MsgInformacion) + End If End Sub @@ -179,9 +178,8 @@ Partial Class RH_CatCursosTemas If objRH.SubtemaRemove(CveTema) Then CargadatosGvTemas() - Alert("Subtema Elimino Correctamente.", TipoMensaje.MsgInformacion) - Else - Alert("Ocurrio un error al Eliminar el Subtema.", TipoMensaje.MsgError) + Alert("Subtema Elimino Correctamente.", TipoMensaje.MsgInformacion) + End If LoadComboTemas() CargadatosGvSubtemas()