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..4d9b06b49 --- /dev/null +++ b/AF/RepRevision.aspx @@ -0,0 +1,250 @@ +<%@ 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 95fa81a74..3b6189bef 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/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/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() diff --git a/Inventarios/TraspasoAlmacen.aspx b/Inventarios/TraspasoAlmacen.aspx index 3c6546336..34fce1e71 100644 --- a/Inventarios/TraspasoAlmacen.aspx +++ b/Inventarios/TraspasoAlmacen.aspx @@ -119,68 +119,66 @@
    - +
    - +
    -
    +
    -
    - +
    +
    -
    +
    -
    +
    - + <%--CARGA EXCEL--%> <%--Modal para agregar camion--%> - - -