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:
rrene
2023-02-14 19:36:07 -07:00
parent 5b40986f95 209415285a
commit efb7df9797
5 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
App_Code/modExtensiones.vb
View File

@@ -24,8 +24,7 @@ Imports iText.Layout
Imports iText.Html2pdf Imports iText.Html2pdf
Imports iText.Html2pdf.Resolver.Font Imports iText.Html2pdf.Resolver.Font
Imports iText.Layout.Properties Imports iText.Layout.Properties
Imports Newtonsoft.Json Imports Newtonsoft.Json
Namespace Extensiones Namespace Extensiones
#Region "E X T E N S I O N E S" #Region "E X T E N S I O N E S"
@@ -1647,20 +1646,32 @@ Namespace Extensiones
<Runtime.CompilerServices.Extension()> <Runtime.CompilerServices.Extension()>
Public Function FBColumn(gv As GridView, name As String) As DataControlField Public Function FBColumn(gv As GridView, name As String) As DataControlField
name = name.ToLower name = name.ToLower()
For Each col As DataControlField In gv.Columns Dim headerCells As TableCellCollection = Nothing
If TypeOf col Is BoundField Then If gv.Columns.Count > 0 Then
Dim field As BoundField = CType(col, BoundField) For i = 0 To gv.Columns.Count - 1 'Si las columnas son autogeneradas, el número de columnas siempre es 0
If field.DataField.ToLower = name OrElse field.SortExpression.ToLower = name OrElse field.HeaderText.Trim.ToLower = name Then Dim col = gv.Columns(i)
Return col If TypeOf col Is BoundField Then
Dim field As BoundField = CType(col, BoundField)
If field.DataField.ToLower() = name OrElse field.SortExpression.ToLower() = name OrElse field.HeaderText.Trim().ToLower() = name Then
Return col
End If
Continue For
ElseIf TypeOf col Is HyperLinkField Then
Dim field As HyperLinkField = CType(col, HyperLinkField)
If field.DataTextField.ToLower() = name OrElse field.SortExpression.ToLower() = name OrElse field.HeaderText.Trim().ToLower() = name Then
Return col
End If
Continue For
End If End If
ElseIf TypeOf col Is HyperLinkField Then If headerCells Is Nothing Then headerCells = gv.HeaderRow?.Cells
Dim field As HyperLinkField = CType(col, HyperLinkField) If headerCells IsNot Nothing Then
If field.DataTextField.ToLower = name OrElse field.SortExpression.ToLower = name OrElse field.HeaderText.Trim.ToLower = name Then If headerCells(i).Text.Trim().ToLower() = name Then
Return col Return col
End If
End If End If
End If Next
Next End If
Return Nothing Return Nothing
End Function End Function

2
OI/Circular.aspx
View File

@@ -73,7 +73,7 @@
<Columns> <Columns>
<asp:HyperLinkField HeaderText="Asunto" DataTextField="Asunto" DataNavigateUrlFields="CveCircular" DataNavigateUrlFormatString="/OI/CircularDetalleB.aspx?CveCircular={0}" /> <asp:HyperLinkField HeaderText="Asunto" DataTextField="Asunto" DataNavigateUrlFields="CveCircular" DataNavigateUrlFormatString="/OI/CircularDetalleB.aspx?CveCircular={0}" />
<asp:HyperLinkField HeaderText="Usuario" DataTextField="Usuario" DataNavigateUrlFields="CveCircular" DataNavigateUrlFormatString="/OI/CircularDetalleB.aspx?CveCircular={0}" /> <asp:HyperLinkField HeaderText="Usuario" DataTextField="Usuario" DataNavigateUrlFields="CveCircular" DataNavigateUrlFormatString="/OI/CircularDetalleB.aspx?CveCircular={0}" />
<asp:HyperLinkField HeaderText="Fecha Ing." DataTextField="FechaIng" DataNavigateUrlFields="CveCircular" DataNavigateUrlFormatString="/OI/CircularDetalleB.aspx?CveCircular={0}" ItemStyle-Width="250px" /> <asp:HyperLinkField HeaderText="Fecha Ing." DataTextField="FechaIng" DataTextFormatString="{0:d}" DataNavigateUrlFields="CveCircular" DataNavigateUrlFormatString="/OI/CircularDetalleB.aspx?CveCircular={0}" ItemStyle-Width="250px" />
</Columns> </Columns>
</asp:GridView> </asp:GridView>
</ContentTemplate> </ContentTemplate>

29
OI/CircularDetalleB.aspx
View File

@@ -234,7 +234,7 @@
<div class="col-md-12"> <div class="col-md-12">
<asp:GridView ID="GVUsuarios" runat="server" AutoGenerateColumns="false" DataKeyNames="Nombre,Correo,Empresa,CveRol,CveSubProyecto" <asp:GridView ID="GVUsuarios" runat="server" AutoGenerateColumns="false" DataKeyNames="Nombre,Correo,Empresa,CveRol,CveSubProyecto,CveClasificacion"
CssClass="table table-striped table-advance table-hover Widthall ScrollAD GVUsuarios" GridLines="None" data-height="200" CssClass="table table-striped table-advance table-hover Widthall ScrollAD GVUsuarios" GridLines="None" data-height="200"
OnRowDataBound="GVUsuarios_RowDataBound"> OnRowDataBound="GVUsuarios_RowDataBound">
<Columns> <Columns>
@@ -247,18 +247,11 @@
<asp:CheckBox ID="ChkOk" CssClass="ChkOk" Checked="false" runat="server" /> <asp:CheckBox ID="ChkOk" CssClass="ChkOk" Checked="false" runat="server" />
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField> <asp:BoundField DataField="Nombre" HeaderText="Nombre" />
<HeaderTemplate></HeaderTemplate> <asp:BoundField DataField="Rol" HeaderText="Rol" />
<ItemTemplate> <asp:BoundField DataField="CveRol" HeaderText="CveRol" HeaderStyle-CssClass="hidden" ItemStyle-CssClass="hidden" />
<asp:Literal ID="LtlNombre" runat="server" Text='<%# Eval("Nombre") %>'></asp:Literal> <asp:BoundField DataField="CveSubProyecto" HeaderText="CveSubProyecto" HeaderStyle-CssClass="hidden" ItemStyle-CssClass="hidden" />
</ItemTemplate> <asp:BoundField DataField="CveClasificacion" HeaderText="CveClasificacion" HeaderStyle-CssClass="hidden" ItemStyle-CssClass="hidden" />
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>Rol</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlRol" runat="server" Text='<%# Eval("Rol") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
</Columns> </Columns>
</asp:GridView> </asp:GridView>
@@ -348,13 +341,15 @@
//} //}
function filtrarx() { function filtrarx() {
//console.log('Entre 3') //console.log('Entre 3')
//var filtro = sotext($("div[id^='C_DVModalFiltros'] select:first").attr("id")); var filtros = $("div[id^='C_DVModalFiltros'] select").map(function () {
//console.log(filtro) return soval(this.id);
FiltrarTablaStrMulti('<%=GVUsuarios.ClientID %>', null, sotext('<%=DdlRoles.ClientID %>'), $('#TxtBusquedaCorreos').val()); }).get();
//console.log(filtros)
FiltrarTablaStrMulti('<%=GVUsuarios.ClientID %>', null, $('#TxtBusquedaCorreos').val(), ...filtros);
} }
function ADSBegin() { function ADSBegin() {
// loadeventos(); // loadeventos();
// showhideUser() // showhideUser();
} }
//inicializa tablas select2me etc etc..... //inicializa tablas select2me etc etc.....
function ADSReady() { function ADSReady() {

24
OI/CircularDetalleB.aspx.cs
View File

@@ -157,39 +157,37 @@ public partial class OI_CircularDetalleB : ClsPaginas
DVModalFiltrosProveedores.Visible = false; DVModalFiltrosProveedores.Visible = false;
DVModalFiltrosPersonal.Visible = false; DVModalFiltrosPersonal.Visible = false;
DVModalFiltrosCliente.Visible = false; DVModalFiltrosCliente.Visible = false;
GVUsuarios.FBColumn("Rol").Visible = false;
switch (RLBTipoEnvioTipo.SelectedValue.ToEntero())
switch (RLBTipoEnvioTipo.SelectedValue.ToEntero())
{ {
case 1: case 1:
DVModalFiltrosUsuarios.Visible = true; DVModalFiltrosUsuarios.Visible = true;
GVUsuarios.Columns[2].Visible = true; GVUsuarios.FBColumn("Rol").Visible = true;
intTipoConsulta = 1; intTipoConsulta = 1;
break; break;
case 2: case 2:
DVModalFiltrosProveedores.Visible = true; DVModalFiltrosProveedores.Visible = true;
GVUsuarios.Columns[2].Visible = false;
intTipoConsulta = 2; intTipoConsulta = 2;
break; break;
case 3: case 3:
DVModalFiltrosPersonal.Visible = true; DVModalFiltrosPersonal.Visible = true;
GVUsuarios.Columns[2].Visible = false;
intTipoConsulta = 3; intTipoConsulta = 3;
break; break;
case 4: case 4:
DVModalFiltrosCliente.Visible = true; DVModalFiltrosCliente.Visible = true;
GVUsuarios.Columns[2].Visible = false;
intTipoConsulta = 4; intTipoConsulta = 4;
break; break;
default: default:
DVModalFiltrosUsuarios.Visible = true; DVModalFiltrosUsuarios.Visible = true;
GVUsuarios.Columns[2].Visible = true; GVUsuarios.FBColumn("Rol").Visible = true;
intTipoConsulta = 1; intTipoConsulta = 1;
break; break;
} }
ClsOIEventos ObjOI = new ClsOIEventos(); ClsOIEventos ObjOI = new ClsOIEventos();
if (ObjOI.GetCircularCorreos(intTipoConsulta, UsuarioActual.CveEmpresa, -1, -1, -1, -1, -1))
if (ObjOI.GetCircularCorreos(intTipoConsulta, UsuarioActual.CveEmpresa, -1, DdlSubProyecto.SelectedValue.ToEntero(), DdlCveClasificacionProveedor.SelectedValue.ToEntero(), DdlSubProyectoPersonal.SelectedValue.ToEntero(), DdlClasificacion.SelectedValue.ToEntero()))
{ {
if (ObjOI.DtResultados.Rows.Count >= 1000) if (ObjOI.DtResultados.Rows.Count >= 1000)
@@ -220,7 +218,7 @@ public partial class OI_CircularDetalleB : ClsPaginas
ObjOI.Dispose(); ObjOI.Dispose();
GVUsuarios.DataBind(); GVUsuarios.DataBind();
UpModalSeleccionCorreos.Update(); UpModalSeleccionCorreos.Update();
} }
protected void GVUsuarios_RowDataBound(object sender, GridViewRowEventArgs e) protected void GVUsuarios_RowDataBound(object sender, GridViewRowEventArgs e)
@@ -527,22 +525,22 @@ public partial class OI_CircularDetalleB : ClsPaginas
protected void DdlSubProyecto_SelectedIndexChanged(object sender, EventArgs e) protected void DdlSubProyecto_SelectedIndexChanged(object sender, EventArgs e)
{ {
ConsultaCorreos(); //ConsultaCorreos();
} }
protected void DdlCveClasificacionProveedor_SelectedIndexChanged(object sender, EventArgs e) protected void DdlCveClasificacionProveedor_SelectedIndexChanged(object sender, EventArgs e)
{ {
ConsultaCorreos(); //ConsultaCorreos();
} }
protected void DdlSubProyectoPersonal_SelectedIndexChanged(object sender, EventArgs e) protected void DdlSubProyectoPersonal_SelectedIndexChanged(object sender, EventArgs e)
{ {
ConsultaCorreos(); //ConsultaCorreos();
} }
protected void DdlClasificacion_SelectedIndexChanged(object sender, EventArgs e) protected void DdlClasificacion_SelectedIndexChanged(object sender, EventArgs e)
{ {
ConsultaCorreos(); //ConsultaCorreos();
} }
protected void LnlActualizarCorreos_Click(object sender, EventArgs e) protected void LnlActualizarCorreos_Click(object sender, EventArgs e)

4
Scripts/custom.js
View File

@@ -90,7 +90,7 @@ function FiltrarTabla(idtxt, idtable, idcontador) {
} }
function FiltrarTablaStr(str, idtable, idcontador) { function FiltrarTablaStr(str, idtable, idcontador) {
if (str == '' || str == 'Todos') { $('table#' + idtable + ' tr').css('display', ''); } if (str == '' || str == "-1" || str == 'Todos') { $('table#' + idtable + ' tr').css('display', ''); }
else { else {
$('table#' + idtable + ' tr:not(.ADtr)').css('display', 'none'); $('table#' + idtable + ' tr:not(.ADtr)').css('display', 'none');
$('table#' + idtable + ' tr:contains("' + str + '")').css('display', ''); $('table#' + idtable + ' tr:contains("' + str + '")').css('display', '');
@@ -106,7 +106,7 @@ function FiltrarTablaStrMulti(idtable, idcontador /*, str1, str2, str3...*/ ) {
let strc = ''; let strc = '';
for (let i = 2 /*a partir del 3er argumento obtiene los str*/; i < arguments.length; i++) { for (let i = 2 /*a partir del 3er argumento obtiene los str*/; i < arguments.length; i++) {
let str = arguments[i]; let str = arguments[i];
if (str != '' && str != 'Todos') { if (str != '' && str != "-1" && str != 'Todos') {
strc += ':contains("' + str + '")'; strc += ':contains("' + str + '")';
} }
} }