This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
@@ -954,11 +954,7 @@
|
||||
|
||||
<asp:GridView ID="GvBitacora" OnRowDataBound="GvBitacora_RowDataBound" runat="server" GridLines="None" Width="100%" CssClass="table table-striped table-advance table-hover Widthall ScrollAD Gvbitacora mysmallbtn" data-sort="true" CellSpacing="0" AutoGenerateColumns="False">
|
||||
<Columns>
|
||||
<asp:TemplateField HeaderText="Fecha" ItemStyle-HorizontalAlign="Center">
|
||||
<ItemTemplate>
|
||||
<asp:Literal ID="LtlFecha" runat="server" Text='<%# Eval("FechaIng","{0:dd-MM-yyyy}") %>' />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="FechaIng" HeaderText="Fecha" DataFormatString="{0:dd-MM-yyyy}" ItemStyle-HorizontalAlign="Center" />
|
||||
<asp:BoundField DataField="Descripcion" HeaderText="Descripción" ItemStyle-HorizontalAlign="Left" />
|
||||
<asp:BoundField DataField="Anterior" HeaderText="Anterior" ItemStyle-HorizontalAlign="Left" />
|
||||
<asp:BoundField DataField="Actual" HeaderText="Actual" ItemStyle-HorizontalAlign="Left" />
|
||||
@@ -1066,11 +1062,173 @@
|
||||
</div>
|
||||
<div class="actions">
|
||||
<div class="btn-group">
|
||||
<asp:LinkButton ID="LnAddFonacot" OnClick="LnAddFonacot_Click" runat="server" Text="Agregar" class="btn yellow-gold" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet-body form">
|
||||
<div class="row">
|
||||
|
||||
<asp:UpdatePanel runat="server" ID="UpFonacotGrid" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<asp:GridView ID="GVNomFonacot" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall"
|
||||
AutoGenerateColumns="False" ShowHeaderWhenEmpty="true" EmptyDataText="No ahi créditos fonacot registrados."
|
||||
DataKeyNames="CveFonacot,CvePersonal,NumeroCredito,Descripcion,Periodo,CveTipoCalculo,ImporteCredito,ImporteFijo,PagosHechos,MontoAcumulado,Saldo,CveEstatus,Observaciones,CveUsuarioIng">
|
||||
<Columns>
|
||||
<asp:TemplateField HeaderText="Numero crédito">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblnumeroCredito" runat="server" Text='<%# Eval("NumeroCredito")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Tipo aplicación">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# Eval("TipoCalculo")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Descripcion">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lbldescripcion" runat="server" Text='<%# Eval("Descripcion")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Importe">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# Eval("ImporteFijo", "{0:N2}")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Importe crédito">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblimporteCredito" runat="server" Text='<%# Eval("ImporteCredito", "{0:N2}")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Saldo">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblsaldo" runat="server" Text='<%# Eval("Saldo", "{0:N2}")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Estatus">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblcveEstatus" runat="server" Text='<%#(Eval("CveEstatus").ToString() == "1"? "Activo": "Inactivo") %>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField>
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton data-toggle="tooltip" title="Editar" ID="LnkEditarNomFonacot" OnClick="LnkEditarNomFonacot_Click" CssClass="btn btn-circle btn-sm green" runat="server" Text="<i class='fa fa-pencil'></i>"></asp:LinkButton>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField>
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="LnkEliminarNomFonacot" runat="server" OnClick="LnkEliminarNomFonacot_Click" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar el NomFonacot?" data-btn-ok-label="si" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
|
||||
|
||||
<div id="ModalFonacot" class="modal ADS fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header ">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button><h4 class="modal-title">Fonacot</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<asp:UpdatePanel runat="server" ID="UpModalFonacot" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtFonNumCredito" runat="server" MaxLength="20"></asp:TextBox>
|
||||
<asp:Label AssociatedControlID="TxtFonNumCredito" runat="server" Text="Número de crédito"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtFonDescripcion" runat="server" MaxLength="20"></asp:TextBox>
|
||||
<asp:Label AssociatedControlID="TxtFonDescripcion" runat="server" Text="Descripción"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-4">
|
||||
<div class="">
|
||||
<asp:Label AssociatedControlID="DdlFonTipoAplicacion" CssClass="ddlInfolabel" runat="server" Text="Tipo Aplicación"></asp:Label>
|
||||
|
||||
<asp:DropDownList ID="DdlFonTipoAplicacion" runat="server" Class="form-control select2me" Width="100%">
|
||||
<asp:ListItem Text="Seleccione" Value="-1"></asp:ListItem>
|
||||
<asp:ListItem Text="Importe fijo" Value="1"></asp:ListItem>
|
||||
<asp:ListItem Text="Por días Laborados" Value="2"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtFonValor" runat="server" MaxLength="20"></asp:TextBox>
|
||||
<asp:Label AssociatedControlID="TxtFonValor" runat="server" Text="Importe"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox CssClass="form-control TxtFonImporteCredito" ID="TxtFonImporteCredito" runat="server" MaxLength="20"></asp:TextBox>
|
||||
<asp:Label AssociatedControlID="TxtFonImporteCredito" runat="server" Text="Importe total crédito"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox CssClass="form-control TxtFonPagosHechos " ID="TxtFonPagosHechos" runat="server" MaxLength="20"></asp:TextBox>
|
||||
<asp:Label AssociatedControlID="TxtFonPagosHechos" runat="server" Text="Pagos Anteriores"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox CssClass="form-control TxtFonSaldo" Enabled="false" ID="TxtFonSaldo" runat="server" MaxLength="20"></asp:TextBox>
|
||||
<asp:Label AssociatedControlID="TxtFonSaldo" runat="server" Text="Saldo"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="form-group form-md-line-input input-iconright " style="width: 120px !important; display: inline-block;">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtFonFechaInicio" runat="server" MaxLength="20"></asp:TextBox>
|
||||
<asp:Label AssociatedControlID="TxtFonFechaInicio" runat="server" Text="Fecha Inicio"></asp:Label>
|
||||
<asp:RequiredFieldValidator runat="server" ID="rfvFonFechaFEstFin" ControlToValidate="TxtFonFechaInicio" ErrorMessage="Debe ingresar una fecha" ValidationGroup="vgEstFon" />
|
||||
<ajax:MaskedEditExtender ID="MEEFonFechaFEstFin" runat="server" TargetControlID="TxtFonFechaInicio" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
|
||||
<ajax:CalendarExtender runat="server" ID="CEEFonFechaFEstFin" TargetControlID="TxtFonFechaInicio" PopupButtonID="LnkFonFechaFEstFin" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
|
||||
</div>
|
||||
<div style="display: inline-block; vertical-align: top; padding-top: 10px;">
|
||||
<span class="input-group-btn ">
|
||||
<asp:LinkButton ID="LnkFonFechaFEstFin" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<div class="">
|
||||
<asp:Label AssociatedControlID="ChkFonacot" runat="server" Text="Estado (Activo)"></asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<asp:CheckBox ID="ChkFonacot" CssClass="chksino" runat="server" Text=" " />
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<asp:UpdatePanel runat="server">
|
||||
<ContentTemplate>
|
||||
<asp:LinkButton ID="LnkGuardarFonacot" OnClick="LnkGuardarFonacot_Click" runat="server" Text="Guardar" class="btn btn-primary" />
|
||||
<button type="button" class="btn btn-danger" onclick="$('#ModalFonacot').modal('hide');return;">Cancelar</button>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<%--<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtFonNumCredito" runat="server" MaxLength="20"></asp:TextBox>
|
||||
@@ -1129,7 +1287,7 @@
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<asp:LinkButton ID="LnkGuardarFonacot" OnClick="LnkGuardarFonacot_Click" runat="server" Text="Guardar" class="btn btn-primary" />
|
||||
</div>
|
||||
</div>--%>
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
@@ -2491,6 +2649,100 @@
|
||||
<ajax:TabPanel ID="TTAntiguedad" runat="server" HeaderText="Antiguedad" Visible="false">
|
||||
<ContentTemplate>
|
||||
<asp:GridView ID="gvAntigudad" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
|
||||
|
||||
</ContentTemplate>
|
||||
</ajax:TabPanel>
|
||||
<ajax:TabPanel ID="TabVacacionesEmpresa" runat="server" HeaderText="Vacaciones">
|
||||
<ContentTemplate>
|
||||
<asp:UpdatePanel ID="upDatosVacaEmpre" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<div class="portlet light xspadding bordered" id="pnlVacEmpresa">
|
||||
<div class="portlet-title">
|
||||
<div class="caption ">
|
||||
<i class="fa fa-bookmark font-yellow-gold"></i>
|
||||
<span class="caption-subject bold uppercase font-yellow-gold">Agregar</span>
|
||||
</div>
|
||||
<div class="tools">
|
||||
<a href="javascript:;" class="expand" data-original-title="" title=""></a>
|
||||
<a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet-body " style="display: none">
|
||||
<div class="row">
|
||||
<div class="col-md-4 truncate ">Inicio</div>
|
||||
<div class="col-md-4">
|
||||
<asp:TextBox ID="TxtVacaInicio" type="number" CssClass="form-control input-sm " runat="server"></asp:TextBox>
|
||||
<%--<asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" ControlToValidate="TxtVacadiasVacaciones" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Dias Vacaciones''</b> es necesario, por favor ingréselo." ValidationGroup="VGMVaca"></asp:RequiredFieldValidator>--%>
|
||||
<%--<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender4" runat="server" HighlightCssClass="vco" TargetControlID="RfvVacadiasVacaciones"></ajax:ValidatorCalloutExtender>--%>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 truncate ">Fin</div>
|
||||
<div class="col-md-4">
|
||||
<asp:TextBox ID="TxtVacaFin" type="number" CssClass="form-control input-sm " runat="server"></asp:TextBox>
|
||||
<%--<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="TxtVacadiasVacaciones" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Dias Vacaciones''</b> es necesario, por favor ingréselo." ValidationGroup="VGMVaca"></asp:RequiredFieldValidator>--%>
|
||||
<%--<ajax:ValidatorCalloutExtender ID="ValidatorCalloutExtender3" runat="server" HighlightCssClass="vco" TargetControlID="RfvVacadiasVacaciones"></ajax:ValidatorCalloutExtender>--%>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 truncate ">Dias Vacaciones</div>
|
||||
<div class="col-md-4">
|
||||
<asp:TextBox ID="TxtVacadiasVacaciones" CssClass="form-control input-sm " runat="server"></asp:TextBox>
|
||||
<asp:RequiredFieldValidator ID="RfvVacadiasVacaciones" runat="server" ControlToValidate="TxtVacadiasVacaciones" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Dias Vacaciones''</b> es necesario, por favor ingréselo." ValidationGroup="VGMVacaEmpresa"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VcoVacadiasVacaciones" runat="server" HighlightCssClass="vco" TargetControlID="RfvVacadiasVacaciones"></ajax:ValidatorCalloutExtender>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<asp:Button ID="BtnVacaADD" OnClick="BtnVacaADD_Click" runat="server" Text="Agregar" CssClass="btn btn-primary" ValidationGroup="VGMVacaEmpresa" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet light xspadding bordered" id="pnlgridVacEmpresa">
|
||||
<div class="portlet-title">
|
||||
<div class="caption ">
|
||||
<i class="fa fa-bookmark font-yellow-gold"></i>
|
||||
<span class="caption-subject bold uppercase font-yellow-gold"></span>
|
||||
</div>
|
||||
<div class="tools">
|
||||
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
|
||||
<a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet-body">
|
||||
<asp:GridView ID="GVVacacionesEmpresas" runat="server" GridLines="None" CssClass="table table-hover table-striped Widthall ScrollAD" AutoGenerateColumns="False"
|
||||
DataKeyNames="CveEmpresa,Inicio,Fin,DiasVacaciones">
|
||||
<Columns>
|
||||
<asp:TemplateField HeaderText="Inicio">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblinicio" runat="server" Text='<%# Eval("Inicio")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Fin">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblfin" runat="server" Text='<%# Eval("Fin")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Dias Vacaciones">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label5" runat="server" Text='<%# Eval("DiasVacaciones")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<%--<asp:TemplateField Visible="false">
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton data-toggle="tooltip" title="Editar" ID="LnkEditar" OnClick="LnkEditarVaca_Click" CssClass="btn btn-circle btn-sm green" runat="server" Text="<i class='fa fa-pencil'></i>"></asp:LinkButton>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>--%>
|
||||
<asp:TemplateField>
|
||||
<ItemTemplate>
|
||||
<asp:LinkButton ID="LnkEliminarVaca" runat="server" OnClick="LnkEliminarVaca_Click" CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar el VacacionesEmpresas?" data-btn-ok-label="si" />
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</ContentTemplate>
|
||||
</ajax:TabPanel>
|
||||
<ajax:TabPanel ID="TTFactorDesctInfonavit" runat="server" HeaderText="Factor descuento Infonavit">
|
||||
@@ -2675,7 +2927,7 @@
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</ajax:TabPanel>
|
||||
<ajax:TabPanel ID="TTVigSubEmpAnual" runat="server" HeaderText="Subsidio Anual">
|
||||
<ajax:TabPanel ID="TTVigSubEmpAnual" runat="server" HeaderText="Subsidio Anual" Visible="false">
|
||||
<ContentTemplate>
|
||||
<asp:GridView ID="GVVigSubEmpAnual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
|
||||
</ContentTemplate>
|
||||
@@ -2702,6 +2954,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox ID="TxtValorUma" CssClass="form-control input-sm " runat="server" type="number" step=".01"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="TxtValorUma">Valor</asp:Label>
|
||||
<asp:RequiredFieldValidator ID="RfvValorUma" runat="server" ControlToValidate="TxtValorUma" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Fecha Inicio''</b> es necesario, por favor ingréselo." ValidationGroup="VGAddUma"></asp:RequiredFieldValidator>
|
||||
<ajax:ValidatorCalloutExtender ID="VcoValorUma" runat="server" HighlightCssClass="vco" TargetControlID="RfvValorUma"></ajax:ValidatorCalloutExtender>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user