From 782804b7a7daa013898639003976390acb18c9b3 Mon Sep 17 00:00:00 2001
From: MLopez <Mario.lopez@adssistemas.mx>
Date: Tue, 10 Jan 2023 18:30:09 -0700
Subject: [PATCH] =?UTF-8?q?E141=20Rep=20Entradas=20y=20salidas:=20Opci?=
 =?UTF-8?q?=C3=B3n=20para=20personalizar=20columnas,=20no=20recargar=20con?=
 =?UTF-8?q?sulta=20al=20personalizar=20Grid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Inventarios/RepEntradasSalidas.aspx    | 41 +++++++++++++++-------
 Inventarios/RepEntradasSalidas.aspx.vb | 47 ++++++++++++++++++++------
 2 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/Inventarios/RepEntradasSalidas.aspx b/Inventarios/RepEntradasSalidas.aspx
index 95766bb80..82be31ee6 100644
--- a/Inventarios/RepEntradasSalidas.aspx
+++ b/Inventarios/RepEntradasSalidas.aspx
@@ -1,22 +1,37 @@
 <%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="RepEntradasSalidas.aspx.vb" Inherits="Inventarios_ReporteEntradasSalidas" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="H" runat="Server">
-    <li>
-        <asp:LinkButton ID="LnkImprimir" runat="server"><i class="fa fa-ad-pdf"></i> Generar PDF</asp:LinkButton>
-    </li>
-    <li>
-        <asp:LinkButton ID="LnkExportar" runat="server"><i class="fa fa-ad-excel"></i> Generar Excel</asp:LinkButton>
-    </li>
-    <li>
-        <asp:LinkButton ID="LnkFormatoInventario" runat="server" Visible="false"><i class="fa fa-ad-excel"></i> Generar Formato Inventario</asp:LinkButton>
-    </li>
+    <asp:UpdatePanel ID="UPAcciones" runat="server" UpdateMode="Conditional">
+        <ContentTemplate>
+        <li>
+            <asp:LinkButton ID="LnkImprimir" runat="server"><i class="fa fa-ad-pdf"></i> Generar PDF</asp:LinkButton>
+        </li>
+        <li>
+            <asp:LinkButton ID="LnkExportar" runat="server"><i class="fa fa-ad-excel"></i> Generar Excel</asp:LinkButton>
+        </li>
 
-    <li>
-        <asp:HyperLink NavigateUrl="#" data-toggle="modal" data-target="#DivPersonalizar" ID="ImgPersonalizar" runat="server"> <i class="fa fa-pencil"></i>  Personalizar Columnas</asp:HyperLink>
-    </li>
- <%--   <li>
+        <li>
+            <asp:LinkButton ID="LnkExcelPersonalizado" runat="server" Visible="false"><i class="fa fa-ad-excel"></i> Excel Personalizado</asp:LinkButton>
+        </li>
+
+        <li>
+            <asp:LinkButton ID="LnkFormatoInventario" runat="server" Visible="false"><i class="fa fa-ad-excel"></i> Generar Formato Inventario</asp:LinkButton>
+        </li>
+
+        <li>
+            <asp:HyperLink NavigateUrl="#" data-toggle="modal" data-target="#DivPersonalizar" ID="ImgPersonalizar" runat="server"> <i class="fa fa-pencil"></i>  Personalizar Columnas</asp:HyperLink>
+        </li>
+        <%--   <li>
         <asp:LinkButton ID="Lnkcompuxlsinventarios" OnClick="Lnkcompuxlsinventarios_Click" runat="server"><i class="fa fa-ad-excel"></i> Generar Inventarios HP</asp:LinkButton>
     </li>--%>
+        </ContentTemplate>
+        <Triggers>
+            <asp:PostBackTrigger ControlID="LnkImprimir"  />
+            <asp:PostBackTrigger ControlID="LnkExportar"  />
+            <asp:PostBackTrigger ControlID="LnkExcelPersonalizado"  />
+            <asp:PostBackTrigger ControlID="LnkFormatoInventario"  />
+        </Triggers>
+    </asp:UpdatePanel>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="Css" runat="Server">
         <style>
diff --git a/Inventarios/RepEntradasSalidas.aspx.vb b/Inventarios/RepEntradasSalidas.aspx.vb
index 32c24f006..a11433761 100644
--- a/Inventarios/RepEntradasSalidas.aspx.vb
+++ b/Inventarios/RepEntradasSalidas.aspx.vb
@@ -54,13 +54,21 @@ Partial Class Inventarios_ReporteEntradasSalidas
             Return (UsuarioActual.CveEmpresa.Contiene(72, 80))
         End Get
     End Property
+    Private Property Personalizo As Integer
+        Get
+            Return ViewState("Personalizo").ToString.ToEntero
+        End Get
 
-
+        Set(value As Integer)
+            ViewState("Personalizo") = value
+        End Set
+    End Property
 
 #End Region
 
     Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
         If Not IsPostBack Then
+            Personalizo = 0
 
             If UsuarioActual.CveEmpresa.Contiene(119) Then
                 LnkFormatoInventario.Visible = True
@@ -73,7 +81,7 @@ Partial Class Inventarios_ReporteEntradasSalidas
 
             CargaCombos()
 
-            GvM.DataBind()
+            GvM.DataBind(True)
             If Not IsNothing(Request("CveAlmacen")) Then
                 DdlAlmacen.SelectedValue = Request("CveAlmacen").ToString()
                 TxtFechaI.Text = "01/01/2000"
@@ -246,10 +254,8 @@ Partial Class Inventarios_ReporteEntradasSalidas
             rpt = dt
         End If
 
-
         Reporte.Dispose()
-        GvM.DataBind()
-
+        GvM.DataBind(True)
         UPPMov.Update()
     End Sub
 
@@ -322,7 +328,6 @@ Partial Class Inventarios_ReporteEntradasSalidas
                 e.Row.FCLabel("lbSaldoF2").Text = If(e.Row.DBCampo("SaldoFImp").ToString().ToDecimal = 0, "-", e.Row.DBCampo("SaldoFImp").ToDouble.ToString("N2"))
 
             End If
-
         End If
     End Sub
 
@@ -349,6 +354,9 @@ Partial Class Inventarios_ReporteEntradasSalidas
         ' GvM.ExportToExcel("Reporte de Entradas y Salidas")
         ImprimiReporte("EXCEL")
     End Sub
+    Private Sub LnkExcelPersonalizado_Click(sender As Object, e As EventArgs) Handles LnkExcelPersonalizado.Click
+        GvM.ExportToExcel("EntradasSalidas_" + Now.ToShortDateString + ".xls")
+    End Sub
     Private Sub LnkImprimir_Click(sender As Object, e As EventArgs) Handles LnkImprimir.Click
         ImprimiReporte()
     End Sub
@@ -420,8 +428,14 @@ Partial Class Inventarios_ReporteEntradasSalidas
         ImprimirPDF(RutaPDF, If(FormatoInventario, dt.FiltraParametros("", "RazonSocial, PS  ASC"), dt), params, NombreArchivoDescarga, Formato:=Formato)
 
     End Sub
-    Private Sub BtnPersonalizar_Click(sender As Object, e As EventArgs) Handles BtnPersonalizar.Click
-        RegistraScript("$('#DivPersonalizar').modal('hide')")
+
+    Private Sub LnkFormatoInventario_Click(sender As Object, e As EventArgs) Handles LnkFormatoInventario.Click
+        ImprimiReporte("EXCEL", True)
+    End Sub
+#End Region
+
+#Region "PERSONALIZAR"
+    Private Sub MostrarOcultarColumnas()
         GvM.Columns(1).Visible = ChkCodigoAlterno.Checked
         GvM.Columns(2).Visible = ChkCodigoBarras.Checked
         GvM.Columns(3).Visible = ChkClasificacion2.Checked
@@ -496,13 +510,24 @@ Partial Class Inventarios_ReporteEntradasSalidas
             dvCan.Style.Add("width", "21%")
         End If
 
-        CargaDatos()
+        Personalizo = 1
+        If Personalizo = 1 Then
+            LnkExcelPersonalizado.Visible = True
+        Else
+            LnkExcelPersonalizado.Visible = False
+        End If
+
         UpEncabezado.Update()
+        UPPMov.Update()
     End Sub
 
-    Private Sub LnkFormatoInventario_Click(sender As Object, e As EventArgs) Handles LnkFormatoInventario.Click
-        ImprimiReporte("EXCEL", True)
+    Private Sub BtnPersonalizar_Click(sender As Object, e As EventArgs) Handles BtnPersonalizar.Click
+        MostrarOcultarColumnas()
+        RegistraScript("$('#DivPersonalizar').modal('hide')")
+        UPAcciones.Update()
+        'CargaDatos()
     End Sub
+
 #End Region
 
 #Region "B I T A C O R A"