From 6d5f793b4540ac582b050f798e154a1e6faf24dc Mon Sep 17 00:00:00 2001 From: rakcsle Date: Tue, 5 Oct 2021 17:44:32 -0700 Subject: [PATCH] Ventas modal con dos opciones, Clientes carga tab conrtatos, rh columna subproyecto configurda y drops cambiar seleccione uno por todos --- App_Code/ClsPaginas.vb | 8 +- App_Code/modExtensiones.vb | 23 +- Empresas/153/Formatos/Cotizacion.rdlc | 192 +++++++++++-- Empresas/154/Formatos/Cotizacion.rdlc | 187 ++++++++++-- Empresas/154/Formatos/Factura.rdlc | 396 +++++++++++++++++++++----- RH/CatPersonal.aspx | 28 +- RH/CatPersonal.aspx.vb | 11 + Ventas/Clientes.aspx | 11 +- Ventas/Clientes.aspx.vb | 19 +- Ventas/Ventas.aspx.vb | 22 +- 10 files changed, 763 insertions(+), 134 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 463bc6529..16a836392 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -5444,15 +5444,17 @@ Public Class ClsPaginas Usuario.CerrarSession() End Sub - Public Sub Alert(Mensaje As String, Optional pOpcion As TipoMensaje = TipoMensaje.MsgInformacion, Optional JSBtnAceptar As String = "", Optional timeout As Integer = 5, Optional ShowCloseButton As Boolean = True) - If DirectCast(pOpcion, Integer) >= 5 Then + Public Sub Alert(Mensaje As String, Optional pOpcion As TipoMensaje = TipoMensaje.MsgInformacion, Optional JSBtnAceptar As String = "", Optional timeout As Integer = 5, Optional ShowCloseButton As Boolean = True, Optional TextoConfirmacion As String = "", Optional TextoSegundoBoton As String = "", Optional JSBtn2 As String = "") + + If DirectCast(pOpcion, Integer).Contiene(5, 7, 6, 8) Then Mensaje = Mensaje.Replace("'"c, "\'").Replace(vbCrLf, "").Replace("""", "\'").Replace(vbLf, " ") JSBtnAceptar = JSBtnAceptar.Replace("'"c, "\'") Dim toastscript As String = String.Format("alertatoast({3},'{0}',function(){{{1}}},{2});", Mensaje, JSBtnAceptar, timeout, DirectCast(pOpcion, Integer)) ViewState("strToastMsglargonoreplace") = String.Format("{0}{1}", If(Not IsNothing(ViewState("strToastMsglargonoreplace")) AndAlso ViewState("strToastMsglargonoreplace").ToString().Length > 0, ViewState("strToastMsglargonoreplace").ToString(), ""), toastscript) Else - Mensaje.Alert(Mensaje, pOpcion, JSBtnAceptar, TimeoutToast:=timeout, ShowCloseButton:=ShowCloseButton) + Mensaje.Alert(Mensaje, pOpcion, JSBtnAceptar, TimeoutToast:=timeout, ShowCloseButton:=ShowCloseButton, TextoConfirmacion:=TextoConfirmacion, TextoSegundoBoton:=TextoSegundoBoton, JSBtn2:=JSBtn2) End If + End Sub Protected Overridable Sub Page_PreRender(sender As Object, e As EventArgs) Handles Me.PreRender If sw IsNot Nothing AndAlso Not (Not User.Identity.IsAuthenticated OrElse UsuarioActual Is Nothing) Then diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index f0d380118..791107d73 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -299,19 +299,22 @@ Namespace Extensiones #Region "Alertas y notificaciones" - Public Enum TipoMensaje As Integer + Public Enum TipoMensaje As Integer + MsgError = 1 MsgInformacion = 2 MsgConfirmacion = 3 MsgAdvertencia = 4 + MsgVentasDosBotones = 9 ToastInformacion = 5 'succes ToastInformacionB = 6 'info ToastError = 7 'error ToastAdventencia = 8 'Warning + End Enum - Public Sub Alert(Obj As Object, Mensaje As String, pOpcion As TipoMensaje, Optional JSBtnAceptar As String = "", Optional TextoConfirmacion As String = "Aceptar", Optional TextoCancelacion As String = "Cancelar", Optional TimeoutToast As Integer = 5, Optional ShowCloseButton As Boolean = True) + Public Sub Alert(Obj As Object, Mensaje As String, pOpcion As TipoMensaje, Optional JSBtnAceptar As String = "", Optional TextoConfirmacion As String = "Aceptar", Optional TextoCancelacion As String = "Cancelar", Optional TimeoutToast As Integer = 5, Optional ShowCloseButton As Boolean = True, Optional TextoSegundoBoton As String = "", Optional JSBtn2 As String = "") If System.Web.HttpContext.Current IsNot Nothing AndAlso System.Web.HttpContext.Current.Handler IsNot Nothing AndAlso System.Web.HttpContext.Current.Handler.GetType().IsSubclassOf(GetType(Page)) Then Dim Titulo As String = "" @@ -350,7 +353,21 @@ Namespace Extensiones b2clas = "red" b2js = "" onEscape = "" - headerclas = " header-blue " + headerclas = " header-blue " + + Case TipoMensaje.MsgVentasDosBotones + Titulo = " Información" + b1title = TextoConfirmacion + b1clas = "green" + b1js = JSBtnAceptar + onEscape = "" + + b2title = TextoSegundoBoton + b2clas = "blue" + b2js = JSBtn2 + onEscape = "" + headerclas = " header-green " + Case TipoMensaje.MsgAdvertencia Titulo = " Advertencia" b1title = "Aceptar" diff --git a/Empresas/153/Formatos/Cotizacion.rdlc b/Empresas/153/Formatos/Cotizacion.rdlc index 08c26e37d..2fb813f5d 100644 --- a/Empresas/153/Formatos/Cotizacion.rdlc +++ b/Empresas/153/Formatos/Cotizacion.rdlc @@ -1,5 +1,5 @@ - + 0 @@ -1870,21 +1870,6 @@ 2pt - - Embedded - LOGOSERVECENJPG - FitProportional - 0.91432cm - 0.19008cm - 1.23542cm - 3.86912cm - 16 - - - - @@ -1992,7 +1977,7 @@ 15.30755cm 0.48004cm 5.71104cm - 17 + 16 @@ -2032,7 +2017,7 @@ 0.28014cm 0.99655cm 20.74095cm - 18 + 17 @@ -2043,6 +2028,21 @@ 2pt + + Embedded + RFIRMAELECTRONICAEDITABLE + FitProportional + 0.31432cm + 0.24983cm + 1.73059cm + 3.63914cm + 18 + + + + 11.95796cm - - Embedded - LOGOSERVECENJPG - FitProportional - 0.91432cm - 0.19008cm - 1.23542cm - 3.86912cm - 16 - - - - @@ -1992,13 +1977,28 @@ 15.30755cm 0.48004cm 5.71104cm - 17 + 16 + + Embedded + RFIRMAELECTRONICAEDITABLE + FitProportional + 0.31432cm + 0.28014cm + 1.73059cm + 3.63914cm + 17 + + + + 10.69327cm - - true - true - - - - - =Parameters!Observaciones.Value - - - - - - - - - - 2pt - 2pt - 2pt - 2pt - - true true @@ -1426,7 +1386,7 @@ 4.18454cm 2.70968cm 9.58983cm - 4 + 3 @@ -1506,7 +1466,7 @@ 13.77437cm 2.70968cm 4.34463cm - 5 + 4 @@ -1540,7 +1500,7 @@ 18.23008cm 0.96018cm 2.79101cm - 6 + 5 @@ -1576,7 +1536,7 @@ 18.23008cm 0.6cm 2.79101cm - 7 + 6 @@ -1627,7 +1587,7 @@ 18.23008cm 0.86903cm 2.79101cm - 8 + 7 @@ -1718,7 +1678,7 @@ 0.28014cm 1.09007cm 9.71199cm - 9 + 8 @@ -1798,7 +1758,7 @@ 10.06268cm 0.7927cm 9.71199cm - 10 + 9 @@ -1979,7 +1939,7 @@ 0.25136cm 0.74611cm 13.82025cm - 11 + 10 @@ -2012,7 +1972,7 @@ 14.07729cm 0.57354cm 2.90753cm - 12 + 11 @@ -2038,11 +1998,11 @@ Textbox5 - 7.78159cm + 8.98809cm 0.24983cm 0.05496cm 20.88652cm - 13 + 12 @@ -2096,7 +2056,7 @@ 17.09066cm 0.64028cm 3.90165cm - 14 + 13 @@ -2259,11 +2219,11 @@ Textbox4 - 7.9071cm + 9.1136cm 0.16383cm 2.44366cm 15.07903cm - 15 + 14 @@ -2289,11 +2249,11 @@ Textbox5 - 10.4566cm + 11.6631cm 0.10579cm 0.05496cm 20.88652cm - 16 + 15 @@ -2305,21 +2265,6 @@ 2pt - - Embedded - LOGOSERVECENJPG - FitProportional - 0.71282cm - 0.28014cm - 1.23542cm - 3.86912cm - 17 - - - - @@ -2423,19 +2368,165 @@ DataSet1 - 7.9071cm + 9.1136cm 15.31342cm 0.48004cm 5.71104cm - 18 + 16 + + true + true + true + + + + + Sucursal Matriz + + + + + + + + + + 0cm + 0cm + + + + + + CLABE: 0461464878 + + + + 0cm + 0cm + + + + + + Cuenta: 072 760 004 614 648 782 + + + + 0cm + 0cm + + + + Textbox1 + 7.01327cm + 0.25136cm + 1.8337cm + 9.18009cm + 17 + + + 2pt + 2pt + 2pt + 2pt + + + + Embedded + RFIRMAELECTRONICAEDITABLE + FitProportional + 0.29405cm + 0.28014cm + 1.73059cm + 3.63914cm + 18 + + + + + + true + true + + + + + Cuenta Bancaria + + + + Textbox13 + 6.49293cm + 0.28014cm + 0.52035cm + 9.15131cm + 19 + + + 2pt + 2pt + 2pt + 2pt + + - 14.91814cm + 15.90769cm