From 8de7efe0f7f10f7f72126a3244459ff2391f58fc Mon Sep 17 00:00:00 2001
From: caudillochon <caudillo_90@hotmail.com>
Date: Wed, 19 Mar 2025 13:19:38 -0700
Subject: [PATCH] --

---
 Nomina/Nomina.aspx               | 33 +++++++++++++++++++++-----------
 Nomina/Nomina.aspx.cs            |  8 ++++----
 Nomina/RepMovtosPermanentes.aspx |  6 ++++++
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx
index e338287c5..1fede38ff 100644
--- a/Nomina/Nomina.aspx
+++ b/Nomina/Nomina.aspx
@@ -206,6 +206,15 @@
         .form-group.form-md-line-input .form-control.input-sm ~ label {
             padding-bottom: 20px;
         }
+        .allspacevhwh{
+            width:100vw !important;
+            height:100vh !important;
+            padding-right: calc((100% - 900px) / 2);
+            padding-left: calc((100% - 910px) / 2);
+        }
+        .allspacevhwh >.modal-content{
+            width:900px !important
+        }
     </style>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
@@ -830,8 +839,12 @@
     <asp:Button ID="BtnImprimirsobrerecibo" OnClick="BtnImprimirsobrerecibo_Click" UseSubmitBehavior="false" runat="server" Text="Imprimir" CssClass="btn btn-primary hidden" />
     <div id="ModalConceptos" class="modal ADS fade" role="dialog">
 
-        <asp:UpdatePanel class="modal-dialog modal-lg" runat="server" ID="UpModalConceptos" UpdateMode="Conditional">
+        <asp:UpdatePanel class="modal-dialog modal-lg " runat="server" ID="UpModalConceptos" UpdateMode="Conditional">
             <ContentTemplate>
+                
+    <asp:TextBox ID="TxtCvePeriodo" CssClass="TxtCvePeriodo hidden" runat="server"></asp:TextBox>
+    <asp:TextBox ID="TxtCvePersonal" CssClass="TxtCvePersonal hidden" runat="server"></asp:TextBox>
+            <asp:Button ID="BtnSobreRecibo" CssClass="BtnSobreRecibo hidden" OnClick="LnkSobreRecibo_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
                 <div class="modal-content">
                     <div class="modal-header ">
                         <h4 class="modal-title">Sobre Recibo</h4>
@@ -2185,13 +2198,6 @@
                     </div>
                 </div>
 
-            </ContentTemplate>
-            <Triggers>
-                <%--<asp:PostBackTrigger  ControlID="BtnImprimirsobrerecibo"  />--%>
-            </Triggers>
-        </asp:UpdatePanel>
-    </div>
-
     <div id="ModalMovtoPermanente" class="modal ADS fade" role="dialog">
         <asp:UpdatePanel ID="UpMovtosPermanentesModal" UpdateMode="Conditional" class="modal-dialog" runat="server">
             <ContentTemplate>
@@ -2362,6 +2368,14 @@
         </asp:UpdatePanel>
     </div>
 
+            </ContentTemplate>
+            <Triggers>
+                <%--<asp:PostBackTrigger  ControlID="BtnImprimirsobrerecibo"  />--%>
+            </Triggers>
+        </asp:UpdatePanel>
+    </div>
+
+
     <div id="ModalUpConcepto" class="modal ADS fade" role="dialog">
 
         <asp:UpdatePanel class="modal-dialog " runat="server" ID="UPpanelModalUpConcepto" UpdateMode="Conditional">
@@ -5263,13 +5277,10 @@
             </Triggers>
         </asp:UpdatePanel>
     </div>
-    <asp:TextBox ID="TxtCvePeriodo" CssClass="TxtCvePeriodo hidden" runat="server"></asp:TextBox>
-    <asp:TextBox ID="TxtCvePersonal" CssClass="TxtCvePersonal hidden" runat="server"></asp:TextBox>
     <asp:Button ID="BtnGeneratepdf" CssClass="BtnGeneratepdf hidden" OnClick="BtnGeneratepdf_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
 
     <asp:UpdatePanel runat="server" UpdateMode="Conditional">
         <ContentTemplate>
-            <asp:Button ID="BtnSobreRecibo" CssClass="BtnSobreRecibo hidden" OnClick="LnkSobreRecibo_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
             <asp:Button ID="BtnGenerateXml" CssClass="BtnGenerateXml hidden" OnClick="BtnGenerateXml_Click" UseSubmitBehavior="false" runat="server" Text="Button" />
             <span class="ltlxml">
                 <asp:Literal ID="LtlXml" runat="server"></asp:Literal></span>
diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs
index eeb186ce7..d1407318a 100644
--- a/Nomina/Nomina.aspx.cs
+++ b/Nomina/Nomina.aspx.cs
@@ -2950,7 +2950,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
         pnlAddupMovto.Visible = false;
         CargaMovtoPermanente();
         CargaPersonalIncapacidad();
-        RegistraScript("$('#ModalConceptos').modal();");
+        RegistraScript("$('#C_UpModalConceptos.allspacevhwh').removeClass('allspacevhwh');$('#ModalConceptos').modal();");
     }
 
     #region Asistencias
@@ -7666,14 +7666,14 @@ public partial class Nomina_Nomina2 : ClsPaginas
     }
     protected void DdlTipo_SelectedIndexChanged(object sender, EventArgs e)
     {
-        CargaConcepto();
+        //CargaConcepto();
         UpMovtosPermanentesModal.Update();
     }
 
     protected void LnkAddMovtoPermanente_Click(object sender, EventArgs e)
     {
         DdlTipo.SelectedValue = "D";
-        CargaConcepto();
+        //CargaConcepto();
         DdlTipoDescto_SelectedIndexChanged(null, null);
         pnlAddupMovto.Visible = true;
         LnkAddMovto.Visible = true;
@@ -7692,7 +7692,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
         GVMovtoPermanenteSaldos.DataBind();
 
         UpMovtosPermanentesModal.Update();
-        RegistraScript("$('#ModalMovtoPermanente').modal({backdrop: 'static', keyboard: false});");
+        RegistraScript("$('#C_UpModalConceptos:not(.allspacevhwh)').addClass('allspacevhwh');$('#ModalMovtoPermanente').modal({backdrop: 'static', keyboard: false});");
 
     }
 
diff --git a/Nomina/RepMovtosPermanentes.aspx b/Nomina/RepMovtosPermanentes.aspx
index a78516e2e..32e59cbbb 100644
--- a/Nomina/RepMovtosPermanentes.aspx
+++ b/Nomina/RepMovtosPermanentes.aspx
@@ -192,6 +192,11 @@
                             <asp:Label ID="lblmontoLimite" runat="server" Text='<%# Eval("MontoLimite","{0:N2}")%>'> </asp:Label>
                         </ItemTemplate>
                     </asp:TemplateField>
+                    <asp:TemplateField HeaderText="">
+                        <ItemTemplate>
+                            <asp:Label ID="lblAcumulado" runat="server" Text='<%# Eval("Acumulado","{0:N2}")%>'> </asp:Label>
+                        </ItemTemplate>
+                    </asp:TemplateField>
                     <asp:TemplateField HeaderText="">
                         <ItemTemplate>
                             <asp:Label ID="lblsaldo" runat="server" Text='<%# Eval("Saldo","{0:N2}")%>'> </asp:Label>
@@ -230,6 +235,7 @@
                             <th>Movimientos</th>
                             <th>Activos</th>
                             <th>Inactivos</th>
+                            <th>Acumulado</th>
                             <th>Saldo</th>
                             <th></th>
                         </tr>