From f19cf2a1e69a1a8169535a57ecde89f3a2e16438 Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Mon, 2 Dec 2019 17:09:45 -0700
Subject: [PATCH]

---
 Nomina/Nomina2.aspx    | 68 ++++++++++++++++++++++++++++++++++++++++++
 Nomina/Nomina2.aspx.cs | 29 ++++++++++++------
 Scripts/custom.js      |  5 ++--
 3 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/Nomina/Nomina2.aspx b/Nomina/Nomina2.aspx
index 2e7e910a4..e6577b557 100644
--- a/Nomina/Nomina2.aspx
+++ b/Nomina/Nomina2.aspx
@@ -513,6 +513,74 @@
                                             <ItemStyle Width="80px" HorizontalAlign="Right" />
                                         </asp:BoundField>
 
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
+                                        <asp:BoundField Visible="false" DataFormatString="{0:N2}">
+                                            <ItemStyle Width="80px" HorizontalAlign="Right" />
+                                        </asp:BoundField>
+
                                         <asp:TemplateField>
                                             <ItemTemplate>
                                                 <div style="width: 70px; text-align: right;">
diff --git a/Nomina/Nomina2.aspx.cs b/Nomina/Nomina2.aspx.cs
index 2be97a4b0..b07e6318c 100644
--- a/Nomina/Nomina2.aspx.cs
+++ b/Nomina/Nomina2.aspx.cs
@@ -226,10 +226,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
         {
             if (objnom.GetNominaEmpleado(CveProyecto, CveSubProyecto, CveTurno, CvePeriodo, CveEmpresa, Agrupador) && objnom.DTSetResultados.Tables.Count > 1)
             {
-                dtempleados = objnom.DTSetResultados.Tables[0];
-                dtConceptos = objnom.DTSetResultados.Tables[1];
-                dtPeriodo = objnom.DTSetResultados.Tables[2];
-                dtasistencia = objnom.DTSetResultados.Tables[3];
+                dtempleados = objnom.DTSetResultados.Tables[3];
+                dtConceptos = objnom.DTSetResultados.Tables[0];
+                dtPeriodo = objnom.DTSetResultados.Tables[1];
+                dtasistencia = objnom.DTSetResultados.Tables[2];
                 CvePeriodoSeleccionado = CvePeriodo;
                 continuar = true;
             }
@@ -258,7 +258,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
                 bf = (BoundField)GvNominas.Columns[CurrentColumn];
                 bf.DataField = string.Format("V_{0}", CveConcepto);
                 bf.HeaderText = Concepto;
-                CurrentColumn++;
+                if (GvNominas.Columns[CurrentColumn].Visible)
+                {
+                    CurrentColumn++;
+                }
             }
             if (true)
             {
@@ -279,8 +282,11 @@ public partial class Nomina_Nomina2 : ClsPaginas
                 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;
-                CurrentColumn++;
+                bf.HeaderText = Concepto; 
+                if (GvNominas.Columns[CurrentColumn].Visible)
+                {
+                    CurrentColumn++;
+                }
             }
 
             if (true)
@@ -308,7 +314,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
                 GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
                 bf = (BoundField)GvNominas.Columns[CurrentColumn];
                 bf.DataField = string.Format("V_{0}", CveConcepto);
-                CurrentColumn++;
+                bf.HeaderText = Concepto;
+
+                if (GvNominas.Columns[CurrentColumn].Visible)
+                {
+                    CurrentColumn++;
+                }
             }
             if (true)
             {
@@ -1349,7 +1360,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
 
         using (ClsNominas objnom = new ClsNominas())
         {
-            if (objnom.GetTablasNomina (UsuarioActual.CveEmpresa) && objnom.DTSetResultados.Tables.Count > 1)
+            if (objnom.GetTablasNomina(UsuarioActual.CveEmpresa) && objnom.DTSetResultados.Tables.Count > 1)
             {
                 GVFactorDesctInfonavit.DataSource = objnom.DTSetResultados.Tables[0];
                 GVSalariosMinimos.DataSource = objnom.DTSetResultados.Tables[1];
diff --git a/Scripts/custom.js b/Scripts/custom.js
index 3df5108f9..034aef08c 100644
--- a/Scripts/custom.js
+++ b/Scripts/custom.js
@@ -1211,11 +1211,12 @@ function AdsTabWizard() {
         });
     }, 10)
 }
+
 function MoveFixedDiv() {
     var downMove = null;
     var x;
     var y;
-    $(".modal-content .modal-header").mousedown(function (e) {
+    $("body").on('mousedown', '.modal-content >.modal-header', function (e) {
         e.preventDefault();
         downMove = $(this).parent().parent();
         x = e.pageX;
@@ -1768,6 +1769,7 @@ jQuery(document).ready(function () {
 
     loadsortadscroll();
     QuickSidebar.init();
+        MoveFixedDiv();
 
     setswitch();
     function ocultarbtnmaster() { if ($('#btnmaster_actionssidebar + ul').text().trim() == "") { $('#btnmaster_actionssidebar').css('display', 'none'); } else { $('#btnmaster_actionssidebar').css('display', 'block'); } }
@@ -1778,7 +1780,6 @@ jQuery(document).ready(function () {
         loadwebservice();
         ocultarbtnmaster();
         movepanel();
-        MoveFixedDiv();
         loadADSortable();
         loadadscroll();
         CargaPickers();