- 2025-10-20 V1.3.8 Se añade botón de previsualizar

This commit is contained in:
2025-10-20 14:37:31 +02:00
parent cfff76cb5c
commit 96ec9d9cb3
5 changed files with 15 additions and 7 deletions

View File

@@ -70,6 +70,7 @@ Public Class Configuracion
Public Shared BusquedaAcentosInsensitivo As Boolean = False Public Shared BusquedaAcentosInsensitivo As Boolean = False
Public Delegate Function DelegadoModoSuperUsuario(Aplicacion As tsUserControl) As Boolean Public Delegate Function DelegadoModoSuperUsuario(Aplicacion As tsUserControl) As Boolean
Public Shared FuncionModoSuperUsuario As DelegadoModoSuperUsuario Public Shared FuncionModoSuperUsuario As DelegadoModoSuperUsuario
Public Shared MostrarPrevisualizar As Boolean = True
End Class End Class

View File

@@ -74,6 +74,7 @@
</dxb:BarEditItem.EditSettings> </dxb:BarEditItem.EditSettings>
</dxb:BarEditItem> </dxb:BarEditItem>
<dxb:BarButtonItem Name="btImprimirPlantilla" Glyph="pack://application:,,,/DevExpress.Images.v23.2;component/GrayScaleImages/Print/Print_16x16.png" x:FieldModifier="public" IsEnabled="True" Focusable="True" ItemClick="btImprimirPlantilla_ItemClick" Hint="Imprimir" ForceCursor="True" /> <dxb:BarButtonItem Name="btImprimirPlantilla" Glyph="pack://application:,,,/DevExpress.Images.v23.2;component/GrayScaleImages/Print/Print_16x16.png" x:FieldModifier="public" IsEnabled="True" Focusable="True" ItemClick="btImprimirPlantilla_ItemClick" Hint="Imprimir" ForceCursor="True" />
<dxb:BarButtonItem Name="btPrevisualizaPlantilla" Glyph="{dx:DXImage GrayScaleImages/Print/Preview_16x16.png}" x:FieldModifier="public" IsEnabled="True" Focusable="True" ItemClick="btPrevisualizaPlantilla_ItemClick" Hint="Imprimir" ForceCursor="True" />
<dxb:BarEditItem Name="beAcciones" x:FieldModifier="public" Focusable="True" ForceCursor="True" IsEnabled="True" Hint="Accion a Ejecutar" EditWidth="390" EditValueChanged="beAcciones_EditValueChanged" > <dxb:BarEditItem Name="beAcciones" x:FieldModifier="public" Focusable="True" ForceCursor="True" IsEnabled="True" Hint="Accion a Ejecutar" EditWidth="390" EditValueChanged="beAcciones_EditValueChanged" >
<dxb:BarEditItem.EditSettings> <dxb:BarEditItem.EditSettings>
<dxe:ComboBoxEditSettings x:Name="cbAcciones" x:FieldModifier="Public" ValueMember="idAccion" DisplayMember="Descripcion" /> <dxe:ComboBoxEditSettings x:Name="cbAcciones" x:FieldModifier="Public" ValueMember="idAccion" DisplayMember="Descripcion" />
@@ -107,6 +108,7 @@
<dxb:BarItemLinkSeparator></dxb:BarItemLinkSeparator> <dxb:BarItemLinkSeparator></dxb:BarItemLinkSeparator>
<dxb:BarEditItemLink BarItemName="bePlantilla" x:FieldModifier="Public" x:Name="ilPlantilla" /> <dxb:BarEditItemLink BarItemName="bePlantilla" x:FieldModifier="Public" x:Name="ilPlantilla" />
<dxb:BarButtonItemLink BarItemName="btImprimirPlantilla" /> <dxb:BarButtonItemLink BarItemName="btImprimirPlantilla" />
<dxb:BarButtonItemLink BarItemName="btPrevisualizaPlantilla" />
<dxb:BarItemLinkSeparator></dxb:BarItemLinkSeparator> <dxb:BarItemLinkSeparator></dxb:BarItemLinkSeparator>
<dxb:BarEditItemLink BarItemName="beAcciones" x:FieldModifier="Public" x:Name="ilAcciones" /> <dxb:BarEditItemLink BarItemName="beAcciones" x:FieldModifier="Public" x:Name="ilAcciones" />
<dxb:BarButtonItemLink BarItemName="btAcciones" /> <dxb:BarButtonItemLink BarItemName="btAcciones" />

View File

@@ -11,9 +11,7 @@ Imports DevExpress.Spreadsheet
Imports DevExpress.Xpf.Grid Imports DevExpress.Xpf.Grid
Imports DevExpress.Mvvm.UI.Interactivity Imports DevExpress.Mvvm.UI.Interactivity
Imports tsUtilidades.Extensiones Imports tsUtilidades.Extensiones
Imports System.Data.Entity.Core.Objects
Imports tsUtilidades Imports tsUtilidades
Imports System.Data.Entity.Core.Metadata.Edm
Public Class ContenedorAplicacion Public Class ContenedorAplicacion
Public _Aplicacion As tsUserControl Public _Aplicacion As tsUserControl
@@ -138,7 +136,12 @@ Public Class ContenedorAplicacion
Friend Sub btImprimirPlantilla_ItemClick(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs) Friend Sub btImprimirPlantilla_ItemClick(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs)
_Aplicacion.ValidaControlObjetoActual() _Aplicacion.ValidaControlObjetoActual()
Dim idPlantilla As Integer = bePlantilla.EditValue Dim idPlantilla As Integer = bePlantilla.EditValue
_Aplicacion.LanzaImprimirPlantilla(sender, e, idPlantilla) _Aplicacion.LanzaImprimirPlantilla(sender, e, idPlantilla, False)
End Sub
Friend Sub btPrevisualizaPlantilla_ItemClick(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs)
_Aplicacion.ValidaControlObjetoActual()
Dim idPlantilla As Integer = bePlantilla.EditValue
_Aplicacion.LanzaImprimirPlantilla(sender, e, idPlantilla, True)
End Sub End Sub
Private Sub btAcciones_ItemClick(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs) Private Sub btAcciones_ItemClick(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs)

View File

@@ -100,7 +100,7 @@ Public MustInherit Class tsUserControl
Public Event EstadoCambiado(EstadoAnterior As EstadosAplicacion, EstadoNuevo As EstadosAplicacion) Public Event EstadoCambiado(EstadoAnterior As EstadosAplicacion, EstadoNuevo As EstadosAplicacion)
Public Event Enlazar(Celda As EditGridCellData, Defecto As Boolean) Public Event Enlazar(Celda As EditGridCellData, Defecto As Boolean)
Public Event EjecutarAccion(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs, idAccion As Integer) Public Event EjecutarAccion(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs, idAccion As Integer)
Public Event ImprimirPlantilla(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs, idPlantilla As Integer) Public Event ImprimirPlantilla(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs, idPlantilla As Integer, Previsualizar As Boolean)
Public Event TeclaFuncionPulsada(sender As Object, e As KeyEventArgs) Public Event TeclaFuncionPulsada(sender As Object, e As KeyEventArgs)
' Public Event AbreRegistroBuscado(uc As tsUserControl) ' Public Event AbreRegistroBuscado(uc As tsUserControl)
Public Event BotonNuevoPulsado() Public Event BotonNuevoPulsado()
@@ -714,6 +714,7 @@ Public MustInherit Class tsUserControl
ContenedorAplicacion.btGuardarYBuscar.IsVisible = False ContenedorAplicacion.btGuardarYBuscar.IsVisible = False
ContenedorAplicacion.btBuscar.IsVisible = False ContenedorAplicacion.btBuscar.IsVisible = False
End If End If
If Configuracion.MostrarPrevisualizar = False Then ContenedorAplicacion.btPrevisualizaPlantilla.IsVisible = False
If Not Me.PermisosConcedidos.Exportar Then Me.ContenedorAplicacion.btExportar.IsEnabled = False If Not Me.PermisosConcedidos.Exportar Then Me.ContenedorAplicacion.btExportar.IsEnabled = False
End If End If
If DXSplashScreen.IsActive Then DXSplashScreen.Close() If DXSplashScreen.IsActive Then DXSplashScreen.Close()
@@ -1932,7 +1933,7 @@ Public MustInherit Class tsUserControl
DXMessageBox.Show("Error en LanzaEjecutaAccion " & ex.Message, "Error") DXMessageBox.Show("Error en LanzaEjecutaAccion " & ex.Message, "Error")
End Try End Try
End Sub End Sub
Sub LanzaImprimirPlantilla(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs, idPlantilla As Integer) Sub LanzaImprimirPlantilla(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs, idPlantilla As Integer, Previsualizar As Boolean)
Try Try
Dim be As BaseEdit = Nothing Dim be As BaseEdit = Nothing
Try Try
@@ -1959,7 +1960,7 @@ Public MustInherit Class tsUserControl
linea.View.CommitEditing() linea.View.CommitEditing()
If linea.View.HasValidationError Then Cancelar = True If linea.View.HasValidationError Then Cancelar = True
Next Next
If Not Cancelar Then RaiseEvent ImprimirPlantilla(sender, e, idPlantilla) If Not Cancelar Then RaiseEvent ImprimirPlantilla(sender, e, idPlantilla, Previsualizar)
Catch ex As Exception Catch ex As Exception
Debug.Write(ex.Message) Debug.Write(ex.Message)
End Try End Try

View File

@@ -15,11 +15,12 @@
<RootNamespace>tsWPFCore</RootNamespace> <RootNamespace>tsWPFCore</RootNamespace>
<PackageId>tsWPFCore</PackageId> <PackageId>tsWPFCore</PackageId>
<PackageTags>net8.0-windows, libreria</PackageTags> <PackageTags>net8.0-windows, libreria</PackageTags>
<Version>1.3.7</Version> <Version>1.3.8</Version>
<Authors>Manuel</Authors> <Authors>Manuel</Authors>
<Company>Tecnosis S.A</Company> <Company>Tecnosis S.A</Company>
<Description>Utilidades para aplicaciones WPF.</Description> <Description>Utilidades para aplicaciones WPF.</Description>
<PackageReleaseNotes> <PackageReleaseNotes>
- 2025-10-20 V1.3.8 Se añade botón de previsualizar
- 2025-10-15 V1.3.7 Se añade dxwContrasenna - 2025-10-15 V1.3.7 Se añade dxwContrasenna
- 2025-07-29 V1.3.6 Se habilita la propiedad AllowMergedGrouping="True" en tsTableView - 2025-07-29 V1.3.6 Se habilita la propiedad AllowMergedGrouping="True" en tsTableView
- 2025-07-06 V1.3.5 Correccion rutina impresión informes - 2025-07-06 V1.3.5 Correccion rutina impresión informes