This commit is contained in:
@@ -262,6 +262,7 @@ partial class Nomina_Finiquito : ClsPaginas
|
||||
ChkesLiquidacion.Checked = esLiquidacion;
|
||||
}
|
||||
}
|
||||
Timbrado tr;
|
||||
if (DdlMotivoBaja.SelectedValue.ToEntero() > 0)
|
||||
LblMotivoBaja.Text = DdlMotivoBaja.SelectedItem.Text;
|
||||
else
|
||||
|
||||
@@ -274,6 +274,15 @@
|
||||
<asp:ListItem Text="Todos" Value="3"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</div>
|
||||
|
||||
<label class="col-md-1 " style="line-height: 1;">Agrupador:</label>
|
||||
<div class="col-md-1">
|
||||
<asp:DropDownList ID="DdlAgrupadorB" runat="server" Style="width: 100% !important;" CssClass="select2me">
|
||||
<asp:ListItem Text="Sin Agrupación" Value="-1" Selected ="True"></asp:ListItem>
|
||||
<asp:ListItem Text="Centro de costos" Value="1"></asp:ListItem>
|
||||
<asp:ListItem Text="Departamento" Value="2"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -307,7 +316,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom ">
|
||||
<asp:GridView ID="GvNominas" runat="server" DataKeyNames="CvePeriodo,CvePersonal,CveNomina,SeTimbro,SerieFolio,Nombre,Correo,Codigo,Turno,SubProyecto,NomAutorizado" AutoGenerateColumns="False" OnRowDataBound="GvNominas_RowDataBound"
|
||||
<asp:GridView ID="GvNominas" runat="server" DataKeyNames="CvePeriodo,CvePersonal,CveNomina,SeTimbro,SerieFolio,Nombre,Correo,Codigo,Turno,Departamento,SubProyecto,NomAutorizado" AutoGenerateColumns="False" OnRowDataBound="GvNominas_RowDataBound"
|
||||
CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" Style="text-align: center;" GridLines="None" data-cols="2" data-rows="2" data-heighterror="360">
|
||||
<Columns>
|
||||
|
||||
@@ -323,7 +332,7 @@
|
||||
<ItemTemplate>
|
||||
<asp:Literal ID="LtlNombre" runat="server"></asp:Literal>
|
||||
</ItemTemplate>
|
||||
<ItemStyle Width="350px" HorizontalAlign="Left" />
|
||||
<ItemStyle Width="300px" HorizontalAlign="Left" />
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" />
|
||||
<asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" />
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,33 +1,23 @@
|
||||
<%@ Page Title="Nómina - Pre Nómina" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PreNomina.aspx.vb" Inherits="Nomina_PreNomina" %>
|
||||
<%@ Page Title="Nómina - Pre nómina" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PreNomina.aspx.vb" Inherits="Nomina_PreNomina" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="HB" runat="Server">
|
||||
|
||||
<asp:UpdatePanel ID="UpnTools" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<li>
|
||||
<%-- <asp:LinkButton ID="ImgExcel" runat="server"><i class="fa fa-ad-excel"></i> Imprimir EXCEL</asp:LinkButton>--%>
|
||||
|
||||
<asp:ImageButton ID="ImgExcel" runat="server" ImageUrl="/Imagenes/IconoExcel.gif" Width="17px" Height="17px" />
|
||||
<asp:LinkButton ID="ImgExcel" Target="_blank" runat="server"> <i class="fa fa-ad-excel"></i> Imprimir</asp:LinkButton>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<asp:HyperLink ID="HLImgImprimir" Target="_blank" runat="server" NavigateUrl="#"> <i class="fa fa-ad-pdf"></i> Imprimir</asp:HyperLink>
|
||||
<%--<a id="HLImgImprimir" runat="server" href="#" class="Texto">
|
||||
<img alt="Imprimir" src="/Imagenes/btnImprimir.gif"/>
|
||||
</a>--%>
|
||||
</li>
|
||||
|
||||
</ContentTemplate>
|
||||
|
||||
</asp:UpdatePanel>
|
||||
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="E" runat="Server">
|
||||
Pre Nómina
|
||||
Pre nómina
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
|
||||
</asp:Content>
|
||||
@@ -57,10 +47,10 @@
|
||||
</div>
|
||||
<div class="tools">
|
||||
<asp:Button ID="BtnConsultar" runat="server" Text="Consultar" class="btn btn-primary" />
|
||||
<a href="javascript:;" class="expand"></a>
|
||||
<a onclick="document.getElementById('C_BtnConsultar').click();" class="reload"></a>
|
||||
<asp:Button ID="BtnGuardarBono" runat="server" Text="Guardar Bonos" class="btn btn-primary" />
|
||||
<asp:Button ID="BtnImpresion" runat="server" Text="Cerrar Nómina" class="btn btn-primary" />
|
||||
<a href="javascript:;" class="expand"></a>
|
||||
<a onclick="document.getElementById('C_BtnConsultar').click();" class="reload"></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet-body" style="display: none;">
|
||||
@@ -79,7 +69,12 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table id="TblHeader" runat="server" class="table table-striped table-advance table-hover" width="1385px">
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
<br />
|
||||
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<table id="TblHeader" runat="server" class="table table-striped table-advance table-hover Widthall TblHeader" >
|
||||
<thead>
|
||||
<tr class="Titulos">
|
||||
<th rowspan="2" width="250px">Nombre</th>
|
||||
@@ -99,7 +94,6 @@
|
||||
<th id="TDBono" runat="server" rowspan="2" style="width: 60px;">Bono</th>
|
||||
<th id="TDPagoAdicional" runat="server" rowspan="2" style="width: 60px;">Pago Adi</th>
|
||||
<th id="TDDescuento" runat="server" rowspan="2" style="width: 60px;">Desc Adi</th>--%>
|
||||
<th rowspan="2"> </th>
|
||||
</tr>
|
||||
<tr class="Titulos">
|
||||
<th width="35px">Tipo</th>
|
||||
@@ -133,12 +127,8 @@
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
<br />
|
||||
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePersonal" EmptyDataText="No se encontraron Ventas con los filtros especificados" ToolTip="Pre Nómina" Width="1385px" CssClass="table table-striped table-advance table-hover" Style="margin-top: -10px; text-align: center;" GridLines="None">
|
||||
<asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePersonal" EmptyDataText="No se encontraron Ventas con los filtros especificados" data-tableheader=".TblHeader"
|
||||
ToolTip="Pre Nómina" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" Style=" text-align: center;" GridLines="None" data-scrollwidthrow=".scrollwidthrow">
|
||||
<Columns>
|
||||
<asp:TemplateField>
|
||||
<ItemTemplate>
|
||||
@@ -345,37 +335,37 @@
|
||||
</ItemTemplate>
|
||||
<ItemStyle Width="60px" />
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField>
|
||||
<asp:TemplateField Visible="false">
|
||||
<ItemTemplate>
|
||||
<asp:CheckBox ID="ChkAplica" runat="server" Visible="false" Checked='<%# Eval("AplicaBono") %>' />
|
||||
</ItemTemplate>
|
||||
<ItemStyle Width="70px" />
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField>
|
||||
<asp:TemplateField Visible="false">
|
||||
<ItemTemplate>
|
||||
<asp:TextBox ID="TxtBono" runat="server" Visible="false" Text='<%# Eval("Importe", "{0:N0}") %>' Width="44px"></asp:TextBox>
|
||||
</ItemTemplate>
|
||||
<ItemStyle Width="60px" />
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField>
|
||||
<asp:TemplateField Visible="false">
|
||||
<ItemTemplate>
|
||||
<asp:TextBox ID="TxtPagoAdicional" Visible="false" runat="server" Text='<%# Eval("PagoAdicional", "{0:N0}") %>' Width="44px"></asp:TextBox>
|
||||
</ItemTemplate>
|
||||
<ItemStyle Width="60px" />
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField>
|
||||
<asp:TemplateField Visible="false">
|
||||
<ItemTemplate>
|
||||
<asp:TextBox ID="TxtDescuentoAdicional" Visible="false" runat="server" Text='<%# Eval("DescuentoAdicional", "{0:N0}") %>' Width="44px"></asp:TextBox>
|
||||
</ItemTemplate>
|
||||
<ItemStyle Width="60px" />
|
||||
</asp:TemplateField>
|
||||
</asp:TemplateField>
|
||||
<%--<asp:TemplateField>
|
||||
<ItemTemplate>
|
||||
<asp:Literal ID="LtlHorasTriples" runat="server" Text='<%# Eval("HorasTriples") %>'></asp:Literal>
|
||||
</ItemTemplate>
|
||||
<ItemStyle Width="65px" />
|
||||
</asp:TemplateField>--%>
|
||||
<asp:TemplateField>
|
||||
<asp:TemplateField Visible="false">
|
||||
<ItemTemplate>
|
||||
|
||||
</ItemTemplate>
|
||||
|
||||
@@ -205,11 +205,12 @@ Partial Class Nomina_PreNomina
|
||||
If e.Row.DBCampo("Asistencias").ToDouble = 0 Then e.Row.FCLiteral("LtlAsistencias").Text = ""
|
||||
If e.Row.DBCampo("Faltas").ToDouble = 0 Then e.Row.FCLiteral("LtlFaltas").Text = ""
|
||||
If e.Row.DBCampo("HorasDobles").ToDouble = 0 Then e.Row.FCLiteral("LtlHorasExtras").Text = ""
|
||||
e.Row.CssClass = "scrollwidthrow"
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Protected Sub ImgExcel_Click(sender As Object, e As System.Web.UI.ImageClickEventArgs) Handles ImgExcel.Click
|
||||
Protected Sub ImgExcel_Click(sender As Object, e As EventArgs) Handles ImgExcel.Click
|
||||
GvDatos.ExportToExcel("PreNomina", TblHeader)
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user