This commit is contained in:
220
RH/Personal.aspx
220
RH/Personal.aspx
@@ -33,7 +33,9 @@
|
||||
.GvVacaciones tr td:nth-child(1) {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.form-group.form-md-line-input .form-control.input-sm.form-small ~ label {
|
||||
padding-bottom: 22px;
|
||||
}
|
||||
</style>
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="HB" runat="Server">
|
||||
@@ -2339,7 +2341,7 @@
|
||||
<div class="portlet-body ">
|
||||
<asp:UpdatePanel ID="UpGvVacacionesResumen" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<asp:GridView ID="GvVacacionesResumen" Width="100%" runat="server" GridLines="None" BorderWidth="0" data-heighterror="330" data-freezecols="0" data-freezerows="1"
|
||||
<asp:GridView ID="GvVacacionesResumen" Visible="false" Width="100%" runat="server" GridLines="None" BorderWidth="0" data-heighterror="330" data-freezecols="0" data-freezerows="1"
|
||||
CssClass=" table table-striped table-advance table-hover Widthall" ShowHeader="True" EmptyDataText="No se encontraron resultados." ShowHeaderWhenEmpty="true"
|
||||
AutoGenerateColumns="False" AllowPaging="False" ShowFooter="False">
|
||||
<Columns>
|
||||
@@ -2353,6 +2355,82 @@
|
||||
<asp:BoundField Visible="true" DataField="DiasDisponibles" HeaderText="Días Disponibles" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Right" />
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:Repeater ID="Repeater1" runat="server"></asp:Repeater>
|
||||
|
||||
<asp:Repeater id="RPTVacacionesResumen" runat="server" OnItemDataBound="RPTVacacionesResumen_ItemDataBound">
|
||||
<HeaderTemplate>
|
||||
<!-- CvePersonal,CveEmpresa,InicioPeriodo,FinPeriodo,Antiguedad,Ejercicio,FechaIngreso,Dias,DiasDisfrutados,DiasPrima,DiasVacaciones-->
|
||||
<table class=" table table-striped table-advance table-hover Widthall"
|
||||
cellspacing="0" data-heighterror="330" data-freezecols="0" data-freezerows="1"
|
||||
id="C_Tab_TabVacaciones_GvVacacionesResumenx">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>Periodo</th>
|
||||
<th>Antigüedad</th>
|
||||
<th>Vacaciones disponibles</th>
|
||||
<th>Días pagados</th>
|
||||
<th>Días disfrutados</th>
|
||||
<th>Días prima</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</HeaderTemplate>
|
||||
<ItemTemplate>
|
||||
<tr>
|
||||
<td> <%# String.Format("{0:dd/MM/yyyy} - {1:dd/MM/yyyy}", DataBinder.Eval(Container.DataItem, "InicioPeriodo"), DataBinder.Eval(Container.DataItem, "FinPeriodo")) %> </td>
|
||||
<td> <%# DataBinder.Eval(Container.DataItem, "Antiguedad") %> </td>
|
||||
<td> <%# DataBinder.Eval(Container.DataItem, "DiasVacaciones") %> </td>
|
||||
<td> <%# DataBinder.Eval(Container.DataItem, "Dias") %> </td>
|
||||
<td> <%# DataBinder.Eval(Container.DataItem, "DiasDisfrutados") %> </td>
|
||||
<td> <%# DataBinder.Eval(Container.DataItem, "DiasPrima") %> </td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<%--<tr>
|
||||
<td colspan="7">
|
||||
<div class="portlet light smmallpadding bordered" style=" border: 0px solid #333 !important;">
|
||||
<div class="portlet-title" style="min-height: 20px;margin: 0px;">
|
||||
<div class="tools" style=" padding: 0px;"><a href="javascript;" class="collapse" data-original-title="" title=""></a></div>
|
||||
</div>
|
||||
<div class="portlet-body " style=" padding: 0px;">
|
||||
|
||||
<asp:GridView ID="GvVaczx" Width="100%" runat="server" GridLines="None" BorderWidth="0" AutoGenerateColumns="False"
|
||||
CssClass=" table table-striped table-advance table-hover Widthall" ShowHeader="True" EmptyDataText="No se encontraron resultados." >
|
||||
<Columns>
|
||||
<asp:BoundField DataField="FechaIng" DataFormatString="{0:dd/MM/yyyy}" HeaderText="Fecha ingreso" />
|
||||
<asp:BoundField DataField="Ejercicio" HeaderText="Ejercicio" />
|
||||
|
||||
<asp:TemplateField HeaderText="Periodo">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# Eval("FechaInicio", "{0:dd/MM/yyyy}")%>'> </asp:Label>-
|
||||
<asp:Label runat="server" Text='<%# Eval("FechaFin", "{0:dd/MM/yyyy}")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="FechaPago" DataFormatString="{0:dd/MM/yyyy}" HeaderText="Fecha pago" />
|
||||
<asp:BoundField DataField="diasinhabiles" HeaderText="Días feriados" />
|
||||
<asp:BoundField DataField="DiasextraAutorizado" HeaderText="Días extra" />
|
||||
<asp:BoundField DataField="diasPago" HeaderText="Días pago" />
|
||||
<asp:TemplateField HeaderText="Aplica prima">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# If(Eval("AplicaPrima").ToString() = "1" Or Eval("AplicaPrima").ToString().ToUpper() = "TRUE", "Sí", "No") %>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Cobro IMSS">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# If(Eval("CobrarIMSS").ToString() = "1" Or Eval("CobrarIMSS").ToString().ToUpper() = "TRUE", "Sí", "No") %>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>--%>
|
||||
</ItemTemplate>
|
||||
<FooterTemplate>
|
||||
</tbody>
|
||||
</table>
|
||||
</FooterTemplate>
|
||||
|
||||
</asp:Repeater>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
<div id="DvPermisosMotivos1" runat="server" visible="false">
|
||||
@@ -2417,8 +2495,29 @@
|
||||
<div class="modal-body">
|
||||
<asp:UpdatePanel runat="server" ID="UpdatePanel2" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="" style="padding-top: 0px;">
|
||||
<asp:Label runat="server" AssociatedControlID="DdlFormapagovacaciones" Style="padding-bottom: 0px; margin-bottom: 0px; font-size: 12px; color: #888; font-weight: 400;">Forma de pago</asp:Label><br />
|
||||
<asp:DropDownList ID="DdlFormapagovacaciones" DataValueField="Cve" DataTextField="Texto" Width="100%" CssClass="form-control select2me " runat="server" OnSelectedIndexChanged="DdlFormapagovacaciones_SelectedIndexChanged" AutoPostBack="true">
|
||||
<asp:ListItem Text="Pagar en fecha" Value="1" Selected="True"></asp:ListItem>
|
||||
<asp:ListItem Text="Pagar en periodo disfrutadas" Value="2"></asp:ListItem>
|
||||
<asp:ListItem Text="Vacaciones trabajadas" Value="3"></asp:ListItem>
|
||||
<asp:ListItem Text="Solo pagar" Value="4"></asp:ListItem>
|
||||
<asp:ListItem Text="Solo disfrutar" Value="5"></asp:ListItem>
|
||||
<asp:ListItem Text="Solo prima" Value="6"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox ID="TxtVacEjercicio" CssClass="form-control input-sm form-small" Text="2021" runat="server"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="TxtVacEjercicio">Ejercicio</asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<asp:Panel runat="server" ID="PnlVacfechas" CssClass="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright calendarlinealinput" style=" width: 100px !important">
|
||||
|
||||
@@ -2446,9 +2545,23 @@
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
</div>
|
||||
</asp:Panel>
|
||||
<asp:Panel runat="server" ID="PnlVacDias" CssClass="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright calendarlinealinput form-small">
|
||||
<asp:TextBox ID="Txtdiasinabiles" runat="server" TextMode="Number" CausesValidation="true" CssClass="form-control input-sm form-small"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="Txtdiasinabiles">Días feriados</asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox ID="TxtVacDiasExtra" CssClass="form-control input-sm form-small" runat="server"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="TxtVacDiasExtra">Días extras</asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</asp:Panel>
|
||||
<asp:Panel runat="server" ID="PnlVacFechapago" CssClass="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright calendarlinealinput" style=" width: 100px !important">
|
||||
|
||||
@@ -2463,32 +2576,28 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright calendarlinealinput" style=" width: 100px !important">
|
||||
<asp:TextBox ID="Txtdiasinabiles" runat="server" TextMode="Number" CausesValidation="true" CssClass="form-control input-sm"></asp:TextBox>
|
||||
<label>días inhábiles</label>
|
||||
<asp:Panel runat="server" ID="PnlVacDiasPago" CssClass="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox ID="TxtVacDiasPago" CssClass="form-control input-sm form-small" type="number" runat="server"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="TxtVacDiasPago">Días pago</asp:Label>
|
||||
</div>
|
||||
</asp:Panel>
|
||||
</asp:Panel>
|
||||
|
||||
<asp:Panel runat="server" ID="PnlVacChecks" CssClass="row">
|
||||
<div class="col-md-6" >
|
||||
<div style="padding-top: 0px; padding-bottom: 0px; font-size: 12px; color: #888; font-weight: 400; white-space: nowrap;">
|
||||
¿Prima Vacacional?
|
||||
</div>
|
||||
<asp:CheckBox ID="ChkVacPrimaVacacional" CssClass="chksino " Checked="true" Text=" " runat="server" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:Label runat="server" AssociatedControlID="DdlFormapagovacaciones">Forma de pago</asp:Label><br />
|
||||
<asp:DropDownList ID="DdlFormapagovacaciones" DataValueField="Cve" DataTextField="Texto" Width="100%" CssClass="form-control select2me " runat="server">
|
||||
<asp:ListItem Text="Pagadas por anticipado" Value="1" Selected="True"></asp:ListItem>
|
||||
<asp:ListItem Text="Por pagar" Value="2"></asp:ListItem>
|
||||
<asp:ListItem Text="Trabajadas" Value="3"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:TextBox ID="TxtVacDiasExtra" CssClass="form-control input-sm " runat="server"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="TxtVacDiasExtra">Días extras</asp:Label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6" >
|
||||
<div style="padding-top: 0px; padding-bottom: 0px; font-size: 12px; color: #888; font-weight: 400; white-space: nowrap;">
|
||||
¿Cobrar IMSS?
|
||||
</div>
|
||||
<asp:CheckBox ID="ChkVacCobrarIMSS" CssClass="chksino " Checked="true" Text=" " runat="server" />
|
||||
</div>
|
||||
</asp:Panel>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
@@ -2534,6 +2643,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-6" id="DvHistorialVacaiones" runat="server">
|
||||
<div class="portlet light smmallpadding bordered">
|
||||
<div class="portlet-title">
|
||||
@@ -2552,7 +2666,53 @@
|
||||
|
||||
<asp:UpdatePanel ID="UpGvVacaciones" runat="server" UpdateMode="Conditional">
|
||||
<ContentTemplate>
|
||||
<asp:GridView ID="GvVacaciones" Width="100%" runat="server" GridLines="None" BorderWidth="0" data-heighterror="330" data-freezecols="0" data-freezerows="1"
|
||||
|
||||
<asp:GridView ID="GvVaczxy" Width="100%" runat="server" GridLines="None" BorderWidth="0" AutoGenerateColumns="False" data-heighterror="330" data-freezecols="0" data-freezerows="1"
|
||||
DataKeyNames="CvePersonalVacaciones,Periodo,FechaIng,Estatus,CveAutoriza,Autoriza,Dias,Usuario,SEstatus,Folio,FechaInicio,FechaFin,Documento,Motivo"
|
||||
CssClass="table table-striped table-advance table-hover Widthall ScrollAD GvVacaciones" data-sort="true" data-height="300" ShowHeader="True" EmptyDataText="No se encontraron resultados." ShowHeaderWhenEmpty="true"
|
||||
OnRowDataBound="GvVacaciones_RowDataBound">
|
||||
<Columns>
|
||||
<asp:BoundField DataField="FechaIng" DataFormatString="{0:dd/MM/yyyy}" HeaderText="Fecha ingreso" />
|
||||
<asp:BoundField DataField="Ejercicio" HeaderText="Ejercicio" />
|
||||
|
||||
<asp:TemplateField HeaderText="Periodo">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# Eval("FechaInicio", "{0:dd/MM/yyyy}")%>'> </asp:Label>-
|
||||
<asp:Label runat="server" Text='<%# Eval("FechaFin", "{0:dd/MM/yyyy}")%>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:BoundField DataField="FechaPago" DataFormatString="{0:dd/MM/yyyy}" HeaderText="Fecha pago" />
|
||||
<asp:BoundField DataField="diasinhabiles" HeaderText="Días feriados" />
|
||||
<asp:BoundField DataField="DiasextraAutorizado" HeaderText="Días extra" />
|
||||
<asp:BoundField DataField="diasPago" HeaderText="Días pago" />
|
||||
<asp:TemplateField HeaderText="Aplica prima">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# If(Eval("AplicaPrima").ToString() = "1" Or Eval("AplicaPrima").ToString().ToUpper() = "TRUE", "Sí", "No") %>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="Cobro IMSS">
|
||||
<ItemTemplate>
|
||||
<asp:Label runat="server" Text='<%# If(Eval("CobrarIMSS").ToString() = "1" Or Eval("CobrarIMSS").ToString().ToUpper() = "TRUE", "Sí", "No") %>'> </asp:Label>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField ItemStyle-Width="124">
|
||||
<ItemTemplate>
|
||||
<div>
|
||||
|
||||
<asp:LinkButton ID="LnkEliminarSolicitud" runat="server" OnClick="LnkEliminarSolicitud_Click" AlternateText="Eliminar" CausesValidation="False" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar la solicitud de vacaciones?" data-btn-ok-label="si"
|
||||
CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-trash' title='Eliminar' ></i>" />
|
||||
<asp:LinkButton ID="ImgEditar" runat="server" OnClick="Edit_ClickVacacionDia" AlternateText="Autorizar" CausesValidation="False"
|
||||
CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-pencil' title='Autorizar' ></i>" />
|
||||
<asp:LinkButton ID="ImgDescargaFormato" runat="server" OnClick="DownLoad_ClickSolicitudVacaciones" AlternateText="Editar" CausesValidation="False"
|
||||
CssClass="btn btn-circle btn-sm green" Text="<i class='fa fa-download ' title='Descarga Solicitud' ></i>" />
|
||||
<asp:LinkButton ID="ImgDescargaAutorizacion" runat="server" OnClick="DownLoad_ClickSolicitudAutorizacion" AlternateText="Editar" CausesValidation="False"
|
||||
CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-download ' title='Descarga autorización' ></i>" />
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:GridView ID="GvVacaciones" Visible ="false" Width="100%" runat="server" GridLines="None" BorderWidth="0" data-heighterror="330" data-freezecols="0" data-freezerows="1"
|
||||
DataKeyNames="CvePersonalVacaciones,Periodo,FechaIng,Estatus,CveAutoriza,Autoriza,Dias,Usuario,SEstatus,Folio,FechaInicio,FechaFin,Documento,Motivo"
|
||||
CssClass="table table-striped table-advance table-hover Widthall ScrollAD GvVacaciones" data-sort="true" data-height="300" ShowHeader="True" EmptyDataText="No se encontraron resultados." ShowHeaderWhenEmpty="true"
|
||||
AutoGenerateColumns="False" AllowPaging="False" ShowFooter="False">
|
||||
|
||||
Reference in New Issue
Block a user