Compare commits
2 Commits
bcfb72c806
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 96ec9d9cb3 | |||
| cfff76cb5c |
@@ -70,6 +70,7 @@ Public Class Configuracion
|
||||
Public Shared BusquedaAcentosInsensitivo As Boolean = False
|
||||
Public Delegate Function DelegadoModoSuperUsuario(Aplicacion As tsUserControl) As Boolean
|
||||
Public Shared FuncionModoSuperUsuario As DelegadoModoSuperUsuario
|
||||
Public Shared MostrarPrevisualizar As Boolean = True
|
||||
End Class
|
||||
|
||||
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
</dxb:BarEditItem.EditSettings>
|
||||
</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="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.EditSettings>
|
||||
<dxe:ComboBoxEditSettings x:Name="cbAcciones" x:FieldModifier="Public" ValueMember="idAccion" DisplayMember="Descripcion" />
|
||||
@@ -107,6 +108,7 @@
|
||||
<dxb:BarItemLinkSeparator></dxb:BarItemLinkSeparator>
|
||||
<dxb:BarEditItemLink BarItemName="bePlantilla" x:FieldModifier="Public" x:Name="ilPlantilla" />
|
||||
<dxb:BarButtonItemLink BarItemName="btImprimirPlantilla" />
|
||||
<dxb:BarButtonItemLink BarItemName="btPrevisualizaPlantilla" />
|
||||
<dxb:BarItemLinkSeparator></dxb:BarItemLinkSeparator>
|
||||
<dxb:BarEditItemLink BarItemName="beAcciones" x:FieldModifier="Public" x:Name="ilAcciones" />
|
||||
<dxb:BarButtonItemLink BarItemName="btAcciones" />
|
||||
|
||||
@@ -11,9 +11,7 @@ Imports DevExpress.Spreadsheet
|
||||
Imports DevExpress.Xpf.Grid
|
||||
Imports DevExpress.Mvvm.UI.Interactivity
|
||||
Imports tsUtilidades.Extensiones
|
||||
Imports System.Data.Entity.Core.Objects
|
||||
Imports tsUtilidades
|
||||
Imports System.Data.Entity.Core.Metadata.Edm
|
||||
|
||||
Public Class ContenedorAplicacion
|
||||
Public _Aplicacion As tsUserControl
|
||||
@@ -138,7 +136,12 @@ Public Class ContenedorAplicacion
|
||||
Friend Sub btImprimirPlantilla_ItemClick(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs)
|
||||
_Aplicacion.ValidaControlObjetoActual()
|
||||
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
|
||||
|
||||
Private Sub btAcciones_ItemClick(sender As Object, e As DevExpress.Xpf.Bars.ItemClickEventArgs)
|
||||
|
||||
14
dxwContrasenna.xaml
Normal file
14
dxwContrasenna.xaml
Normal file
@@ -0,0 +1,14 @@
|
||||
<dx:DXWindow x:Name="text" ShowIcon="False" ResizeMode="NoResize" WindowStyle="SingleBorderWindow"
|
||||
x:Class="dxwContrasenna"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
||||
Title="" Height="150.445" Width="357" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" WindowStartupLocation="CenterScreen" Topmost="True" >
|
||||
|
||||
<Grid x:Name="gc" >
|
||||
<Label Content="Contraseña:" Height="23" HorizontalAlignment="Left" Margin="21,22,0,0" Name="Label2" VerticalAlignment="Top" Width="79" />
|
||||
<dxe:PasswordBoxEdit HorizontalAlignment="Left" Margin="106,23,0,0" Name="pbeContrasenna" VerticalAlignment="Top" Width="215" TabIndex="0" x:FieldModifier="Public" ShowPasswordButtonVisibility="Always" />
|
||||
<Button Content="Aceptar" Height="23" HorizontalAlignment="Left" Margin="21,69,0,0" Name="Button1" VerticalAlignment="Top" Width="121" IsDefault="True" />
|
||||
<Button Content="Cancelar" Height="23" HorizontalAlignment="Right" Margin="0,69,30,0" Name="Button2" VerticalAlignment="Top" Width="121" IsCancel="True" />
|
||||
</Grid>
|
||||
</dx:DXWindow>
|
||||
16
dxwContrasenna.xaml.vb
Normal file
16
dxwContrasenna.xaml.vb
Normal file
@@ -0,0 +1,16 @@
|
||||
Public Class dxwContrasenna
|
||||
|
||||
Private Sub Button1_Click(sender As System.Object, e As System.Windows.RoutedEventArgs) Handles Button1.Click
|
||||
Me.DialogResult = True
|
||||
Me.Close()
|
||||
End Sub
|
||||
|
||||
Private Sub Button2_Click(sender As System.Object, e As System.Windows.RoutedEventArgs) Handles Button2.Click
|
||||
Me.DialogResult = False
|
||||
Me.Close()
|
||||
End Sub
|
||||
|
||||
Private Sub dxwContrasenna_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
|
||||
Me.pbeContrasenna.Focus()
|
||||
End Sub
|
||||
End Class
|
||||
@@ -100,7 +100,7 @@ Public MustInherit Class tsUserControl
|
||||
Public Event EstadoCambiado(EstadoAnterior As EstadosAplicacion, EstadoNuevo As EstadosAplicacion)
|
||||
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 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 AbreRegistroBuscado(uc As tsUserControl)
|
||||
Public Event BotonNuevoPulsado()
|
||||
@@ -714,6 +714,7 @@ Public MustInherit Class tsUserControl
|
||||
ContenedorAplicacion.btGuardarYBuscar.IsVisible = False
|
||||
ContenedorAplicacion.btBuscar.IsVisible = False
|
||||
End If
|
||||
If Configuracion.MostrarPrevisualizar = False Then ContenedorAplicacion.btPrevisualizaPlantilla.IsVisible = False
|
||||
If Not Me.PermisosConcedidos.Exportar Then Me.ContenedorAplicacion.btExportar.IsEnabled = False
|
||||
End If
|
||||
If DXSplashScreen.IsActive Then DXSplashScreen.Close()
|
||||
@@ -1932,7 +1933,7 @@ Public MustInherit Class tsUserControl
|
||||
DXMessageBox.Show("Error en LanzaEjecutaAccion " & ex.Message, "Error")
|
||||
End Try
|
||||
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
|
||||
Dim be As BaseEdit = Nothing
|
||||
Try
|
||||
@@ -1959,7 +1960,7 @@ Public MustInherit Class tsUserControl
|
||||
linea.View.CommitEditing()
|
||||
If linea.View.HasValidationError Then Cancelar = True
|
||||
Next
|
||||
If Not Cancelar Then RaiseEvent ImprimirPlantilla(sender, e, idPlantilla)
|
||||
If Not Cancelar Then RaiseEvent ImprimirPlantilla(sender, e, idPlantilla, Previsualizar)
|
||||
Catch ex As Exception
|
||||
Debug.Write(ex.Message)
|
||||
End Try
|
||||
|
||||
@@ -15,11 +15,13 @@
|
||||
<RootNamespace>tsWPFCore</RootNamespace>
|
||||
<PackageId>tsWPFCore</PackageId>
|
||||
<PackageTags>net8.0-windows, libreria</PackageTags>
|
||||
<Version>1.3.6</Version>
|
||||
<Version>1.3.8</Version>
|
||||
<Authors>Manuel</Authors>
|
||||
<Company>Tecnosis S.A</Company>
|
||||
<Description>Utilidades para aplicaciones WPF Entity Framework compatibles con EF Core 8.</Description>
|
||||
<Description>Utilidades para aplicaciones WPF.</Description>
|
||||
<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-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.4 Correccion rutina impresión informes y nueva sobrecarga
|
||||
|
||||
Reference in New Issue
Block a user