From 5cda2592ecff0076732ac5aebec100462fea6ee0 Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Thu, 2 Jul 2020 17:47:27 -0700
Subject: [PATCH]

---
 AF/AF.aspx             |  50 ++++++-
 AF/AF.aspx.vb          |  58 +++++++-
 Nomina/Nomina2.aspx    | 302 ++++++++++++++++++-----------------------
 Nomina/Nomina2.aspx.cs |  89 +++++++++++-
 Scripts/custom.js      |  18 +--
 5 files changed, 333 insertions(+), 184 deletions(-)

diff --git a/AF/AF.aspx b/AF/AF.aspx
index 506805e0f..49c50f5fc 100644
--- a/AF/AF.aspx
+++ b/AF/AF.aspx
@@ -1362,7 +1362,55 @@
                                     </asp:UpdatePanel>
                                 </ContentTemplate>
                             </ajax:TabPanel>
-
+                            <ajax:TabPanel ID="TabOrdenesdeServicio" Visible="false" runat="server" HeaderText="Ordenes de Servicio">
+                                <ContentTemplate>
+                                    
+                                    <asp:GridView ID="GVOrdenesdeServicio" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall" AutoGenerateColumns="False" data-height="400">
+                                        <Columns>
+                                            <asp:TemplateField HeaderText="Folio">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("Folio")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Fecha">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("Fecha", "{0:dd/MM/yyyy}")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Obra">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("Obra")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Tipo de Servicio">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("TipodeServicio")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Servicio">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("Servicio")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Estatus">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("Estatus")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Duración">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("Duracion")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Atendió">
+                                                <ItemTemplate>
+                                                    <asp:Label  runat="server" Text='<%# Eval("Atendio")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                        </Columns>
+                                    </asp:GridView>
+                                </ContentTemplate>
+                            </ajax:TabPanel>
                             <ajax:TabPanel ID="TabGPS" HeaderText="GPS" runat="server" Visible="false">
                                 <ContentTemplate>
                                     <ajax:TabContainer ID="TabGPSContenido" runat="server" Width="100%">
diff --git a/AF/AF.aspx.vb b/AF/AF.aspx.vb
index d47cf410c..edfc7507a 100644
--- a/AF/AF.aspx.vb
+++ b/AF/AF.aspx.vb
@@ -284,8 +284,64 @@ Partial Class AF_AF
             End If
 
             CargaAFInv()
+            cargaOrdenesdeservicio()
         End If
     End Sub
+    Private Sub cargaOrdenesdeservicio()
+        Dim dt As New DataTable()
+        dt.Columns.Add("Folio", GetType(String))
+        dt.Columns.Add("Fecha", GetType(Date))
+        dt.Columns.Add("Obra", GetType(String))
+        dt.Columns.Add("TipodeServicio", GetType(String))
+        dt.Columns.Add("Servicio", GetType(String))
+        dt.Columns.Add("Estatus", GetType(String))
+        dt.Columns.Add("Duracion", GetType(String))
+        dt.Columns.Add("Atendio", GetType(String))
+
+        Dim dr As DataRow = dt.NewRow()
+        dr("Folio") = "101"
+        dr("Fecha") = "2019/08/23"
+        dr("Obra") = "Ganaderos"
+        dr("TipodeServicio") = "Preventivo"
+        dr("Servicio") = "100 Hrs"
+        dr("Estatus") = "Terminada"
+        dr("Duracion") = "5 Hrs"
+        dr("Atendio") = "Juan perez"
+        dt.Rows.Add(dr)
+        dr = dt.NewRow()
+        dr("Folio") = "190"
+        dr("Fecha") = "2019/09/30"
+        dr("Obra") = "Ganaderos"
+        dr("TipodeServicio") = "Preventivo"
+        dr("Servicio") = "200 Hrs"
+        dr("Estatus") = "Terminada"
+        dr("Duracion") = "5 hrs"
+        dr("Atendio") = "Ernesto Lopez"
+        dt.Rows.Add(dr)
+        dr = dt.NewRow()
+        dr("Folio") = "501"
+        dr("Fecha") = "2019/11/30"
+        dr("Obra") = "Vildósola"
+        dr("TipodeServicio") = "Preventivo"
+        dr("Servicio") = "400 Hrs"
+        dr("Estatus") = "Terminada"
+        dr("Duracion") = "8 hrs"
+        dr("Atendio") = "Juan perez"
+        dt.Rows.Add(dr)
+        dr = dt.NewRow()
+        dr("Folio") = "505"
+        dr("Fecha") = "2019/12/14"
+        dr("Obra") = "Vildósola"
+        dr("TipodeServicio") = "Correctivo"
+        dr("Servicio") = "Rep. Mayor motor"
+        dr("Estatus") = "En proceso"
+        dr("Duracion") = "ND"
+        dr("Atendio") = "Juan perez"
+        dt.Rows.Add(dr)
+
+        GVOrdenesdeServicio.DataSource = dt
+        GVOrdenesdeServicio.DataBind()
+    End Sub
     Private Sub CargaFechaGPS()
         TxtFechaIH.Text = $"01/{DateTime.Now.ToString("MM")}/{DateTime.Now.Year} 00:00"
         TxtFechaFH.Text = $"{DateTime.Now.ToString("dd/MM/yyyy")} 23:59"
@@ -476,7 +532,7 @@ Partial Class AF_AF
     Private Sub CargaAFInv()
         If UsuarioActual.Empresa.UsaInventarios AndAlso CveActivoFijo <= 0 Then
 
-            HLAFInv.Visible = True
+            HLAFInv.Visible= True
 
             Dim StrAlmacenes As String = "CveTipoAlmacen IN (1,2)"
             DdlAFInvAlmacen.DataSource = GlobalDTAlmacenUsuarios(UsuarioActual.CveUsuario, CveEmpresaActual, -1).FiltraParametros(StrAlmacenes)
diff --git a/Nomina/Nomina2.aspx b/Nomina/Nomina2.aspx
index 176fdd0eb..43b852e4f 100644
--- a/Nomina/Nomina2.aspx
+++ b/Nomina/Nomina2.aspx
@@ -4,6 +4,10 @@
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
     <style>
+        td.cellFail {
+            color:red;
+
+        }
         .addropzone {
             min-height: 130px;
         }
@@ -1298,7 +1302,6 @@
     </div>
 
 
-
     <div id="DmodalCompareSua" class="modal ADS fade" role="dialog">
         <asp:UpdatePanel ID="UpArchivoSua" class="modal-dialog" tabindex="-1" runat="server" UpdateMode="Conditional">
             <ContentTemplate>
@@ -1338,59 +1341,25 @@
                                 <div class="tools">
                                     <a href="javascript:;" class="expand" data-original-title="" title=""></a>
                                 </div>
-                                <script>
-                                    function shownew() {
-
-                                        setTimeout(function () {
-                                            let collapse = $('#resultadoprocesasua .collapse');
-                                            let body = $('#resultadoprocesasua .portlet-body');
-                                            if (collapse && collapse.length > 0) {
-                                                collapse.removeClass('collapse');
-                                                collapse.addClass('expand');
-                                            }
-                                            if (body && body.length > 0) {
-                                                body.css('display', 'none');
-                                            }
-                                            collapse = $('#cargaarchivoprocesasua .expand');
-                                            body = $('#cargaarchivoprocesasua .portlet-body');
-                                            if (collapse && collapse.length > 0) {
-                                                collapse.addClass('collapse');
-                                                collapse.removeClass('expand');
-                                            }
-                                            if (body && body.length > 0) {
-                                                body.css('display', '');
-                                            }
-                                        }, 400);
-                                    }
-                                    function showResult() {
-
-                                        setTimeout(function () {
-                                            let collapse = $('#cargaarchivoprocesasua .expand');
-                                            let body = $('#cargaarchivoprocesasua .portlet-body');
-                                            if (collapse && collapse.length > 0) {
-                                                collapse.removeClass('collapse');
-                                                collapse.addClass('expand');
-                                            }
-                                            if (body && body.length > 0) {
-                                                body.css('display', 'none');
-                                            }
-                                            collapse = $('#resultadoprocesasua .collapse');
-                                            body = $('#resultadoprocesasua .portlet-body');
-                                            if (collapse && collapse.length > 0) {
-                                                collapse.addClass('collapse');
-                                                collapse.removeClass('expand');
-                                            }
-                                            if (body && body.length > 0) {
-                                                body.css('display', '');
-                                            }
-                                        }, 400);
-                                    }
-                                </script>
                             </div>
                             <div class="portlet-body rowpadding " style="display: none;">
-                                <div style="width: 1200px; height: 350px; overflow: auto;">
+                                <div style="width: 1200px; min-height: 340px;">
+                                    <table id="headerProcesaSUA" style="display: none">
+                                        <tr>
+                                            <th></th>
+                                            <th colspan="2">Salario</th>
+                                            <th colspan="2">Cuota Fija</th>
+                                            <th colspan="2">Cuota Excedente</th>
+                                            <th colspan="2">Prestaciones en Dinero</th>
+                                            <th colspan="2">Gastos Medicos</th>
+                                            <th colspan="2">Riesgos de Trabajo</th>
+                                            <th colspan="2">Invalidez y Vida</th>
+                                            <th colspan="2">Guarderia</th>
+                                            <th colspan="2">Retiro</th>
+                                        </tr>
+                                    </table>
                                     <asp:GridView ID="GVProcesarSUA" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD" AutoGenerateColumns="False"
-                                        OnDataBound="GVProcesarSUA_DataBound" data-height="300"
+                                        OnRowDataBound="GVProcesarSUA_RowDataBound" data-height="300" data-tableheader="#headerProcesaSUA"
                                         DataKeyNames="CvePersonal,CodigoNombreCompleto,CuotaFijaSUA,CuotaFijaSIG,CuotaExcedenteSUA,CuotaExcedenteSIG,PrestacionesDineroSUA,PrestacionesSIG,GastosMedPenSUA,GastosMedicosSIG,RiesgosdeTrabajoSUA,RiesgoTrabajoSIG,InvalidezyVidaSUA,InvalidezyVidaSIG,GuarderiaSUA,GuarderiaSIG,RetiroSUA,RetiroSIG,SalarioSUA,SalarioSIG">
                                         <Columns>
                                             <asp:TemplateField HeaderText="Nombre">
@@ -1398,148 +1367,94 @@
                                                     <asp:Label ID="lblcodigoNombreCompleto" runat="server" Text='<%# Eval("CodigoNombreCompleto")%>'> </asp:Label>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Salario">
+                                            <asp:TemplateField HeaderText="SUA">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("SalarioSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("SalarioSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("SalarioSUA","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Cuota Fija">
+                                            <asp:TemplateField HeaderText="SIG">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("CuotaFijaSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("CuotaFijaSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("SalarioSIG","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Cuota Excedente">
+                                            <asp:TemplateField HeaderText="SUA">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("CuotaExcedenteSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("CuotaExcedenteSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("CuotaFijaSUA","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Prestaciones en Dinero">
+                                            <asp:TemplateField HeaderText="SIG">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("PrestacionesDineroSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("PrestacionesSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("CuotaFijaSIG","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField> 
+                                            <asp:TemplateField HeaderText="SUA">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("CuotaExcedenteSUA","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Gastos Medicos">
+                                            <asp:TemplateField HeaderText="SIG">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("GastosMedPenSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("GastosMedicosSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("CuotaExcedenteSIG","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField> 
+                                            <asp:TemplateField HeaderText="SUA">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("PrestacionesDineroSUA","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Riesgos de Trabajo">
+                                            <asp:TemplateField HeaderText="SIG">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("RiesgosdeTrabajoSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("RiesgoTrabajoSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("PrestacionesSIG","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField> 
+                                            <asp:TemplateField HeaderText="SUA">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("GastosMedPenSUA","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Invalidez y Vida">
+                                            <asp:TemplateField HeaderText="SIG">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("InvalidezyVidaSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("InvalidezyVidaSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("GastosMedicosSIG","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Guarderia">
+                                            <asp:TemplateField HeaderText="SUA">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("GuarderiaSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("GuarderiaSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("RiesgosdeTrabajoSUA","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
-                                            <asp:TemplateField HeaderText="Retiro">
+                                            <asp:TemplateField HeaderText="SIG">
                                                 <ItemTemplate>
-                                                    <table>
-                                                        <tr class="titulorow">
-                                                            <td>SUA</td>
-                                                            <td>SIG</td>
-                                                        </tr>
-                                                        <tr class="itemrow">
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("RetiroSUA","{0:N2}")%>'> </asp:Label></td>
-                                                            <td>
-                                                                <asp:Label runat="server" Text='<%# Eval("RetiroSIG","{0:N2}")%>'> </asp:Label></td>
-                                                        </tr>
-                                                    </table>
+                                                    <asp:Label runat="server" Text='<%# Eval("RiesgoTrabajoSIG","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="SUA">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("InvalidezyVidaSUA","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="SIG">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("InvalidezyVidaSIG","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="SUA">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("GuarderiaSUA","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="SIG">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("GuarderiaSIG","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="SUA">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("RetiroSUA","{0:N2}")%>'> </asp:Label></td>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="SIG">
+                                                <ItemTemplate>
+                                                    <asp:Label runat="server" Text='<%# Eval("RetiroSIG","{0:N2}")%>'> </asp:Label></td>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
                                         </Columns>
@@ -1581,7 +1496,7 @@
                             <div class="col-md-6">
                                 <div style="width: 140px; display: inline-block;">
                                     <div class="form-group form-md-line-input">
-                                        <asp:TextBox ID="TxtFechaInicio" Enabled="false" CssClass="form-control" runat="server"></asp:TextBox>
+                                        <asp:TextBox ID="TxtFechaInicio"  CssClass="form-control" runat="server"></asp:TextBox>
                                         <asp:Label runat="server" AssociatedControlID="TxtFechaInicio">Fecha Inicio:</asp:Label>
                                         <ajax:MaskedEditExtender ID="MEEFechaInicio" runat="server" TargetControlID="TxtFechaInicio" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
                                         <ajax:CalendarExtender runat="server" ID="CEEFechaInicio" TargetControlID="TxtFechaInicio" PopupButtonID="LnkFechaInicio" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
@@ -1599,7 +1514,7 @@
                             <div class="col-md-6">
                                 <div style="width: 140px; display: inline-block;">
                                     <div class="form-group form-md-line-input">
-                                        <asp:TextBox ID="TXTFechaFin" Enabled="false" CssClass="form-control" runat="server"></asp:TextBox>
+                                        <asp:TextBox ID="TXTFechaFin"  CssClass="form-control" runat="server"></asp:TextBox>
                                         <asp:Label runat="server" AssociatedControlID="TXTFechaFin">Fecha Inicio:</asp:Label>
                                         <ajax:MaskedEditExtender ID="MEEFechaFin" runat="server" TargetControlID="TXTFechaFin" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
                                         <ajax:CalendarExtender runat="server" ID="CEEFechaFin" TargetControlID="TXTFechaFin" PopupButtonID="LnkFechaFin" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
@@ -1639,6 +1554,53 @@
 <asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
     <script>
 
+        function shownew() {
+
+            setTimeout(function () {
+                let collapse = $('#resultadoprocesasua .collapse');
+                let body = $('#resultadoprocesasua .portlet-body');
+                if (collapse && collapse.length > 0) {
+                    collapse.removeClass('collapse');
+                    collapse.addClass('expand');
+                }
+                if (body && body.length > 0) {
+                    body.css('display', 'none');
+                }
+                collapse = $('#cargaarchivoprocesasua .expand');
+                body = $('#cargaarchivoprocesasua .portlet-body');
+                if (collapse && collapse.length > 0) {
+                    collapse.addClass('collapse');
+                    collapse.removeClass('expand');
+                }
+                if (body && body.length > 0) {
+                    body.css('display', '');
+                }
+            }, 400);
+        }
+        function showResult() {
+
+            setTimeout(function () {
+                let collapse = $('#cargaarchivoprocesasua .expand');
+                let body = $('#cargaarchivoprocesasua .portlet-body');
+                if (collapse && collapse.length > 0) {
+                    collapse.removeClass('collapse');
+                    collapse.addClass('expand');
+                }
+                if (body && body.length > 0) {
+                    body.css('display', 'none');
+                }
+                collapse = $('#resultadoprocesasua .collapse');
+                body = $('#resultadoprocesasua .portlet-body');
+                if (collapse && collapse.length > 0) {
+                    collapse.addClass('collapse');
+                    collapse.removeClass('expand');
+                }
+                if (body && body.length > 0) {
+                    body.css('display', '');
+                }
+            setTimeout(function () { loadadscroll(); }, 50);
+            }, 400);
+        }
         function SaveCsv(filename, data) {
             var blob = new Blob([data], { type: 'text/csv' });
             if (window.navigator.msSaveOrOpenBlob) {
diff --git a/Nomina/Nomina2.aspx.cs b/Nomina/Nomina2.aspx.cs
index 8bd705cbe..317c33070 100644
--- a/Nomina/Nomina2.aspx.cs
+++ b/Nomina/Nomina2.aspx.cs
@@ -3841,12 +3841,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
     {
         TxtArchivoSua.Text = "";
         GVProcesarSUA.DataSource = null;
-        GVProcesarSUA.DataBind(); 
+        GVProcesarSUA.DataBind();
         RegistraScript("$('#DmodalCompareSua').modal();shownew();");
         UpArchivoSua.Update();
     }
     protected void LnkUpSuaFile_Click(object sender, EventArgs e)
-    { 
+    {
         string fileurl = "";
         GVProcesarSUA.DataSource = null;
         Files archivos = TxtArchivoSua.getfiles();
@@ -3870,8 +3870,91 @@ public partial class Nomina_Nomina2 : ClsPaginas
     }
 
 
-    protected void GVProcesarSUA_DataBound(object sender, EventArgs e)
+
+    protected void GVProcesarSUA_RowDataBound(object sender, GridViewRowEventArgs e)
     {
 
+        if (e.Row.RowType == DataControlRowType.DataRow)
+        {
+
+            //CvePersonal,CodigoNombreCompleto,,,,,
+            //,,,,,,
+            //,,,,,,,
+            //Literal LtlNombre = e.Row.FCLiteral("LtlNombre");
+            //LinkButton LnkTimbrar = (LinkButton)e.Row.FindControl("LnkTimbrar");
+            string SalarioSUA = string.Format("{0:N2}",e.Row.DataKey("SalarioSUA").ToDecimal());
+            string SalarioSIG = string.Format("{0:N2}", e.Row.DataKey("SalarioSIG").ToDecimal());
+            int celda = 1;
+            if (SalarioSUA != SalarioSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string CuotaFijaSUA = string.Format("{0:N2}", e.Row.DataKey("CuotaFijaSUA").ToDecimal());
+            string CuotaFijaSIG = string.Format("{0:N2}", e.Row.DataKey("CuotaFijaSIG").ToDecimal());
+            if (CuotaFijaSUA != CuotaFijaSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string CuotaExcedenteSUA = string.Format("{0:N2}", e.Row.DataKey("CuotaExcedenteSUA").ToDecimal());
+            string CuotaExcedenteSIG = string.Format("{0:N2}", e.Row.DataKey("CuotaExcedenteSIG").ToDecimal());
+            if (CuotaExcedenteSUA != CuotaExcedenteSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string PrestacionesDineroSUA = string.Format("{0:N2}", e.Row.DataKey("PrestacionesDineroSUA").ToDecimal());
+            string PrestacionesSIG = string.Format("{0:N2}", e.Row.DataKey("PrestacionesSIG").ToDecimal());
+            if (PrestacionesDineroSUA != PrestacionesSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string GastosMedPenSUA = string.Format("{0:N2}", e.Row.DataKey("GastosMedPenSUA").ToDecimal());
+            string GastosMedicosSIG = string.Format("{0:N2}", e.Row.DataKey("GastosMedicosSIG").ToDecimal());
+            if (GastosMedPenSUA != GastosMedicosSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string RiesgosdeTrabajoSUA = string.Format("{0:N2}", e.Row.DataKey("RiesgosdeTrabajoSUA").ToDecimal());
+            string RiesgoTrabajoSIG = string.Format("{0:N2}", e.Row.DataKey("RiesgoTrabajoSIG").ToDecimal());
+            if (RiesgosdeTrabajoSUA != RiesgoTrabajoSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string InvalidezyVidaSUA = string.Format("{0:N2}", e.Row.DataKey("InvalidezyVidaSUA").ToDecimal());
+            string InvalidezyVidaSIG = string.Format("{0:N2}", e.Row.DataKey("InvalidezyVidaSIG").ToDecimal());
+            if (InvalidezyVidaSUA != InvalidezyVidaSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string GuarderiaSUA = string.Format("{0:N2}", e.Row.DataKey("GuarderiaSUA").ToDecimal());
+            string GuarderiaSIG = string.Format("{0:N2}", e.Row.DataKey("GuarderiaSIG").ToDecimal());
+            if (GuarderiaSUA != GuarderiaSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+            celda = celda + 2;
+            string RetiroSUA = string.Format("{0:N2}", e.Row.DataKey("RetiroSUA").ToDecimal());
+            string RetiroSIG = string.Format("{0:N2}", e.Row.DataKey("RetiroSIG").ToDecimal());
+            if (RetiroSUA != RetiroSIG)
+            {
+                e.Row.Cells[celda].CssClass = "cellFail";
+                e.Row.Cells[celda + 1].CssClass = "cellFail";
+            }
+
+        }
     }
 }
\ No newline at end of file
diff --git a/Scripts/custom.js b/Scripts/custom.js
index abdd79df2..ae41c9092 100644
--- a/Scripts/custom.js
+++ b/Scripts/custom.js
@@ -136,8 +136,8 @@ function buscadorMenuCaudi() {
         $('ul#ulmenulateralmaster li.sidebar-toggler-wrapper').append(buscador);
 
         let tickBar = 0;
-        let input = $('#' + idTxtMaster)
-        function BuscarMenu() {
+        let input = $('#' + idTxtMaster);
+        let BuscarMenu =function() {
             tickBar = tickBar + 1;
             tickBarnew = tickBar;
 
@@ -232,7 +232,7 @@ setchecktotag = function () {
             $(mychecktotag.get(i)).css({ "display": "none" });
         }
     }
-}
+};
 setswitch = function () {
     if ($("span.make-switchsd input")) {
         var mycheckswitch = $("span.make-switchsd input");
@@ -304,7 +304,7 @@ setswitch = function () {
             mdspan.append(mdlbel);
         }
     }
-}
+};
 
 function ADScroller2() {
     $('table.ADSCROLLER2').each(function () {
@@ -738,14 +738,14 @@ ADSScroll = function (tablescroll) {
             });
         }
         sort = false;
-        let divcontainer = $('<div  class="ADScroller"></div>')
+        let divcontainer = $('<div  class="ADScroller"></div>');
         let divbody = $('<div  class="ADScroller-body"></div>');
         let divheader = $('<div  class="ADScroller-header"></div>');
         let divfooter = $('<div  class="ADScroller-footer"></div>');
         let tableheader = $('<table></table>').append($('<tbody></tbody>'));
-        tableheader.attr('id', 'ADSH-' + tablescroll.attr('id'))
+        tableheader.attr('id', 'ADSH-' + tablescroll.attr('id'));
         let tablefooter = $('<table></table>').append($('<tbody></tbody>'));
-        tablefooter.attr('id', 'ADSF-' + tablescroll.attr('id'))
+        tablefooter.attr('id', 'ADSF-' + tablescroll.attr('id'));
         let trWwidth = $('<tr class="trnopadding ADtr SearchADHeader"></tr>');
         let idTheader = tablescroll.data('tableheader');
         let rowVisibles = isNaN(Number(tablescroll.data('rows'))) ? 1 : Number(tablescroll.data('rows'));
@@ -768,7 +768,7 @@ ADSScroll = function (tablescroll) {
         if (sort) {
             trWwidth.addClass('TRSort');
         }
-        tablescroll.removeClass("ScrollAD")
+        tablescroll.removeClass("ScrollAD");
         tableheader.addClass(tablescroll.attr('class')).removeClass("table-advance");
         tableheader.attr('style', tablescroll.attr('style'));
         tablefooter.addClass(tablescroll.attr('class')).removeClass("table-advance");
@@ -782,7 +782,7 @@ ADSScroll = function (tablescroll) {
                     rowVisibles += 1;
                 });
             } else {
-                log("Tabla titulo No encontrada '" + idTheader + "'.")
+                log("Tabla titulo No encontrada '" + idTheader + "'.");
             }
         }
         let firsttr = null;