-
+
-
+ CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" Style="text-align: center;" GridLines="None" data-cols="2" data-rows="2">
-
+
diff --git a/Nomina/Nomina2.aspx.cs b/Nomina/Nomina2.aspx.cs
index 753099b93..757b5cd09 100644
--- a/Nomina/Nomina2.aspx.cs
+++ b/Nomina/Nomina2.aspx.cs
@@ -310,7 +310,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = "isOnlyVisible ";
}
- GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
+ GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) != 0);
bf = (BoundField)GvNominas.Columns[CurrentColumn];
bf.DataField = string.Format("V_{0}", CveConcepto);
bf.HeaderText = Concepto;
@@ -342,7 +342,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = "isOnlyVisible ";
}
- GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
+ GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) != 0);
bf = (BoundField)GvNominas.Columns[CurrentColumn];
bf.DataField = string.Format("V_{0}", CveConcepto);
bf.HeaderText = Concepto;
@@ -386,7 +386,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
GvNominas.Columns[CurrentColumn].HeaderStyle.CssClass = "isOnlyVisible ";
}
- GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
+ GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) != 0);
bf = (BoundField)GvNominas.Columns[CurrentColumn];
bf.DataField = string.Format("V_{0}", CveConcepto);
bf.HeaderText = Concepto;
diff --git a/Scripts/custom.js b/Scripts/custom.js
index e3135edfa..f3852450c 100644
--- a/Scripts/custom.js
+++ b/Scripts/custom.js
@@ -137,7 +137,7 @@ function buscadorMenuCaudi() {
let tickBar = 0;
let input = $('#' + idTxtMaster);
- let BuscarMenu =function() {
+ let BuscarMenu = function () {
tickBar = tickBar + 1;
tickBarnew = tickBar;
@@ -263,7 +263,7 @@ setswitch = function () {
var label;
var labeltext = ' ';
if ($($(this).find('label')).html()) {
- labeltext = $($(this).find('label')).html()
+ labeltext = $($(this).find('label')).html();
}
label = '';
label = $(label);
@@ -281,7 +281,7 @@ setswitch = function () {
var label;
var labeltext = ' ';
if ($($(this).find('label')).html()) {
- labeltext = $($(this).find('label')).html()
+ labeltext = $($(this).find('label')).html();
}
label = '';
label = $(label);
@@ -321,8 +321,8 @@ function ADScroller2() {
var widthGral = $(document).width() - WidthMenos;
var heightGral = $(window).height() - HeightMenos;
if (Heightfijo > 0) { heightGral = Heightfijo; }
- if (widthGral < 100) { widthGral = 100 }
- if (heightGral < 100) { heightGral = 100 }
+ if (widthGral < 100) { widthGral = 100; }
+ if (heightGral < 100) { heightGral = 100; }
widthGral = Tthis.parent().parent().width();
Tthis.removeClass('ADSCROLLER2');
@@ -377,7 +377,7 @@ function ADScroller2() {
for (var i = 0; i < txx1.length; i++) {
tr1 = $(txx1[i]).closest('tr');
td1 = $(txx1[i]).closest('td');
- tr1.append(td1)
+ tr1.append(td1);
var hr1 = tr1.outerHeight();
var hr2 = $(txx2[i]).closest('tr').outerHeight();
if (hr1 > hr2) {
@@ -393,7 +393,7 @@ function ADScroller2() {
- var contenedor = $('')
+ var contenedor = $('');
var divheader = $('');
var divcenter = $('');
var divheader1 = $('');
@@ -431,10 +431,34 @@ function ADScroller2() {
divcenter.append(divcenterbody);
divbodyScroll = $('').append(Tthis);
divcenterbody.append(divbodyScroll);
- divbodyScroll.scroll(function () {
- divheaderScroll.scrollLeft($(this).scrollLeft())
- divcolsScroll.scrollTop($(this).scrollTop())
+
+ let fncScroll = function (obj, $this, divheaderScroll, idx) {
+ if (idx) {
+ divheaderScroll.scrollLeft($this.scrollLeft());
+ }
+ obj.scrollTop($this.scrollTop());
+ };
+ divbodyScroll.mouseover(function () {
+ divbodyScroll.scroll(function () { fncScroll(divcolsScroll, divbodyScroll, divheaderScroll, true); });
});
+ divcolsScroll.mouseover(function () {
+ divcolsScroll.scroll(function () { fncScroll(divbodyScroll, divcolsScroll, divheaderScroll, false); });
+ });
+ divbodyScroll.mouseleave(function () {
+ divbodyScroll.unbind('scroll');
+ });
+ divcolsScroll.mouseleave(function () {
+ divcolsScroll.unbind('scroll');
+ });
+ let sizeoftablefunc = function () {
+ let sizetable = Tthis.outerHeight();
+ if (sizetable < divbodyScroll.height()) {
+ sizetable = sizetable + 20;
+ divcolsScroll.css('height', sizetable);
+ divbodyScroll.css('height', sizetable);
+ contenedor.css('width', sizetable + altoc1);
+ }
+ };
$(window).resize(function () {
var widthGral = $(window).width() - WidthMenos;
/*console.log(widthGral);*/
@@ -443,23 +467,25 @@ function ADScroller2() {
/* console.log(widthGral);*/
var heightGral = $(window).height() - HeightMenos;
if (Heightfijo > 0) { heightGral = Heightfijo; }
- if (widthGral < 100) { widthGral = 100 }
- if (heightGral < 100) { heightGral = 100 }
+ if (widthGral < 100) { widthGral = 100; }
+ if (heightGral < 100) { heightGral = 100; }
contenedor.css('width', widthGral);
divheader.css('width', widthGral);
divcenter.css('width', widthGral);
divheaderScroll.css('width', (widthGral - anchoc1));
- divcolsScroll.css('height', (heightGral - altoc1));
+ divcolsScroll.css('height', (heightGral - altoc1+20));
divbodyScroll.css('width', (widthGral - anchoc1));
divbodyScroll.css('height', (heightGral - altoc1 + 20));
+ setTimeout(sizeoftablefunc, 100);
});
$('table#ADCol' + Tid + ' tr').hover(
- function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover') },
- function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover') });
+ function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover');},
+ function () { $('table#' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover');});
$('table#' + Tid + ' tr').hover(
- function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover') },
- function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover') });
+ function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover');},
+ function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover'); });
+ setTimeout(sizeoftablefunc, 100);
}
catch (err) {
@@ -1817,7 +1843,7 @@ jQuery(document).ready(function () {
DataTablePaginatorScroll();
DataTablePaginatorScroll2();
loadAdDropzone();
- clonsbuttons();
+ clonsbuttons();
ADScroller2();
//setTimeout(ADScroller2, 500);
$('body').removeClass('page-portlet-fullscreen');
@@ -1853,7 +1879,7 @@ jQuery(document).ready(function () {
let showhideRows = function () {
usuariotext = input.val();
-
+
let strusuario = usuariotext.length > 0 ? ':contains("' + usuariotext + '")' : '';// td:nth-child(2)
$this.find('tr.items').attr('hide', '1');//oculto todos
$this.find('tr.items' + strusuario).attr('hide', '');//muestro los que tienen filtro
diff --git a/Ventas/RepConciliacionSat.aspx b/Ventas/RepConciliacionSat.aspx
index b8102a0e3..d5e7c5c20 100644
--- a/Ventas/RepConciliacionSat.aspx
+++ b/Ventas/RepConciliacionSat.aspx
@@ -137,12 +137,12 @@
<%# Eval("CFDISAT")%>
-
+
<%# Eval("CFDISIGSinSAT")%>
-
+
<%# Eval("CFDISATSinSIG")%>
diff --git a/Ventas/SolicitudesSAT.aspx b/Ventas/SolicitudesSAT.aspx
index ac492ae6a..66c61af18 100644
--- a/Ventas/SolicitudesSAT.aspx
+++ b/Ventas/SolicitudesSAT.aspx
@@ -239,7 +239,7 @@
- Solicitar Descarga SAT
+ Solicitar descarga SAT
diff --git a/vwd.webinfo b/vwd.webinfo
index 9d2d954bf..a5848e16b 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -106,6 +106,8 @@
+
+