AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
HECTOR JAVIER RODRIGUEZ FLORES
2021-02-04 13:06:08 -07:00
parent fec50f52f9 45195c44e5
commit fa711ec35e
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
App_Code/ClsSisUsuarios.vb
View File

@@ -191,7 +191,7 @@ Public Class ClsSisUsuarios
End Try End Try
Return Retorno Return Retorno
End Function End Function
Public Function ValidaUsuario(Usuario As String, Password As String, tIMEI As String, Optional CveEmpresa As Integer = -1) As Usuario Public Function ValidaUsuario(Usuario As String, Password As String, tIMEI As String, Optional CveEmpresa As Integer = -1, Optional CvePlataforma As Integer = -1) As Usuario
Dim Retorno As Usuario = Nothing Dim Retorno As Usuario = Nothing
DataAdapter("PA_Sis_UsuariosGet") DataAdapter("PA_Sis_UsuariosGet")
With SqlAdapter.SelectCommand.Parameters With SqlAdapter.SelectCommand.Parameters
@@ -199,6 +199,7 @@ Public Class ClsSisUsuarios
.Add("@CveRol", SqlDbType.Int).Value = -1 .Add("@CveRol", SqlDbType.Int).Value = -1
.Add("@Usuario", SqlDbType.VarChar).Value = Usuario .Add("@Usuario", SqlDbType.VarChar).Value = Usuario
.Add("@Contraseña", SqlDbType.VarChar).Value = Password .Add("@Contraseña", SqlDbType.VarChar).Value = Password
.Add("@CvePlataforma", SqlDbType.Int).Value = CvePlataforma
.Add("@EsLogIn", SqlDbType.Bit).Value = 1 .Add("@EsLogIn", SqlDbType.Bit).Value = 1
End With End With
Try Try

12
Compras/eFacturas.aspx
View File

@@ -210,7 +210,7 @@
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Proveedor"> <asp:TemplateField HeaderText="Proveedor">
<ItemTemplate> <ItemTemplate>
<asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_newtab" Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink> <asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_blank" rel="opener" Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink>
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Left" /> <ItemStyle HorizontalAlign="Left" />
</asp:TemplateField> </asp:TemplateField>
@@ -236,7 +236,7 @@
<asp:TemplateField HeaderText="Prov"> <asp:TemplateField HeaderText="Prov">
<ItemTemplate> <ItemTemplate>
<%--<asp:Literal ID="LtlProv" runat="server"></asp:Literal>--%> <%--<asp:Literal ID="LtlProv" runat="server"></asp:Literal>--%>
<asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" Target="_blank"><i class="fa fa-pencil"></i></asp:HyperLink> <asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" Target="_blank" rel="opener"><i class="fa fa-pencil"></i></asp:HyperLink>
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Center" /> <ItemStyle HorizontalAlign="Center" />
</asp:TemplateField> </asp:TemplateField>
@@ -250,7 +250,7 @@
<asp:TemplateField HeaderText="Agregar"> <asp:TemplateField HeaderText="Agregar">
<ItemTemplate> <ItemTemplate>
<%--<asp:Image ID="ImgAgregar" runat="server" Style="cursor: pointer;" Visible='<%# Eval("CveProveedor").ToString <> "" %>' ToolTip="Agregar Factura" ImageUrl="/Imagenes/Nota.gif" Height="18px" />--%> <%--<asp:Image ID="ImgAgregar" runat="server" Style="cursor: pointer;" Visible='<%# Eval("CveProveedor").ToString <> "" %>' ToolTip="Agregar Factura" ImageUrl="/Imagenes/Nota.gif" Height="18px" />--%>
<asp:HyperLink ID="HplAgregar" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" rel="opener" Target="_blank"><i class="fa fa-plus"></i></asp:HyperLink> <asp:HyperLink ID="HplAgregar" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" rel="opener" Target="_blank" ><i class="fa fa-plus"></i></asp:HyperLink>
<asp:LinkButton ID="LnkAgregarPago" runat="server" OnClick="LnkAgregarPago_Click" CssClass="btn btn-sm blue" Visible="false" data-toggle="tooltip" title="Vincular Pago"><i class="fa fa-check"></i></asp:LinkButton> <asp:LinkButton ID="LnkAgregarPago" runat="server" OnClick="LnkAgregarPago_Click" CssClass="btn btn-sm blue" Visible="false" data-toggle="tooltip" title="Vincular Pago"><i class="fa fa-check"></i></asp:LinkButton>
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Center" /> <ItemStyle HorizontalAlign="Center" />
@@ -324,7 +324,7 @@
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Proveedor"> <asp:TemplateField HeaderText="Proveedor">
<ItemTemplate> <ItemTemplate>
<asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_newtab" Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink> <asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_blank" rel="opener" Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink>
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Left" /> <ItemStyle HorizontalAlign="Left" />
</asp:TemplateField> </asp:TemplateField>
@@ -348,7 +348,7 @@
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Prov"> <asp:TemplateField HeaderText="Prov">
<ItemTemplate> <ItemTemplate>
<asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" Target="_blank"><i class="fa fa-pencil"></i></asp:HyperLink> <asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" rel="opener" Target="_blank"><i class="fa fa-pencil"></i></asp:HyperLink>
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Center" /> <ItemStyle HorizontalAlign="Center" />
</asp:TemplateField> </asp:TemplateField>
@@ -361,7 +361,7 @@
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Agregar"> <asp:TemplateField HeaderText="Agregar">
<ItemTemplate> <ItemTemplate>
<asp:HyperLink ID="HplAgregarP" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" Target="_blank"><i class="fa fa-plus"></i></asp:HyperLink> <asp:HyperLink ID="HplAgregarP" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" Target="_blank" rel="opener"><i class="fa fa-plus"></i></asp:HyperLink>
<asp:LinkButton ID="LnkAgregarPagoP" runat="server" OnClick="LnkAgregarPago_Click" CssClass="btn btn-sm blue" Visible="false" data-toggle="tooltip" ></asp:LinkButton> <asp:LinkButton ID="LnkAgregarPagoP" runat="server" OnClick="LnkAgregarPago_Click" CssClass="btn btn-sm blue" Visible="false" data-toggle="tooltip" ></asp:LinkButton>
</ItemTemplate> </ItemTemplate>
<ItemStyle HorizontalAlign="Center" /> <ItemStyle HorizontalAlign="Center" />

4
Compras/eFacturas.aspx.vb
View File

@@ -898,7 +898,7 @@ Partial Class Compras_eFacturas
End If End If
If e.Row.DBCampo("CveCompra") <> "" Then If e.Row.DBCampo("CveCompra") <> "" Then
e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_newtab');"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio")) '1\Compras\GAPC480413QL3\A-69.xml e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_blank' rel='opener' );"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio")) '1\Compras\GAPC480413QL3\A-69.xml
End If End If
If e.Row.DBCampo("CveProveedor") = "" Then If e.Row.DBCampo("CveProveedor") = "" Then
@@ -1059,7 +1059,7 @@ Partial Class Compras_eFacturas
End If End If
If e.Row.DBCampo("CveCompra") <> "" Then If e.Row.DBCampo("CveCompra") <> "" Then
e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_newtab');"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio")) '1\Compras\GAPC480413QL3\A-69.xml e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_blank' rel='opener');"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio")) '1\Compras\GAPC480413QL3\A-69.xml
End If End If
If e.Row.DBCampo("CveProveedor") = "" Then If e.Row.DBCampo("CveProveedor") = "" Then

4
LogIn.aspx.vb
View File

@@ -198,13 +198,13 @@ Partial Class LogIn
Dim Usuario As Usuario = Nothing Dim Usuario As Usuario = Nothing
'Dim UsuarioAsignaciones As Usuario = Nothing 'Dim UsuarioAsignaciones As Usuario = Nothing
Usuario = ObjUsuario.ValidaUsuario(txtUsuario.Text, Encripta(TxtContraseña.Text.Trim), IMEI) Dim isgps = Request.Url.Host.ToUpper().Contains("SIGNALSGPS".ToUpper())
Usuario = ObjUsuario.ValidaUsuario(txtUsuario.Text, Encripta(TxtContraseña.Text.Trim), IMEI, CvePlataforma:=If(isgps, 3, 1))
'UsuarioAsignaciones = ObjUsuario.ValidaUsuarioAsignacion(Usuario.CveUsuario, Usuario.CveEmpresa) 'UsuarioAsignaciones = ObjUsuario.ValidaUsuarioAsignacion(Usuario.CveUsuario, Usuario.CveEmpresa)
ADSSessionConfig.sessionUser = Usuario ADSSessionConfig.sessionUser = Usuario
ADSSessionConfig.sessionDpage = False ADSSessionConfig.sessionDpage = False
ObjUsuario.Dispose() ObjUsuario.Dispose()
Dim isgps = Request.Url.Host.ToUpper().Contains("SIGNALSGPS".ToUpper())
If Usuario IsNot Nothing AndAlso ( If Usuario IsNot Nothing AndAlso (
Usuario.CveRol = 1 OrElse ( Usuario.CveRol = 1 OrElse (
(isgps AndAlso (Usuario.CvePlataforma = 3 OrElse Usuario.CveRol = 1200)) OrElse (isgps AndAlso (Usuario.CvePlataforma = 3 OrElse Usuario.CveRol = 1200)) OrElse

2
vwd.webinfo
View File

@@ -174,6 +174,8 @@