AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correcion personal vacaiones, reacomodo rolesDetalle

Browse Source
This commit is contained in:
Oscar Irigoyen
2023-07-22 13:31:40 -07:00
parent c592ef2025
commit 25b6a93303
3 changed files with 77 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RH/Personal.aspx
View File

@@ -3030,6 +3030,8 @@
<br /> <br />
</div> </div>
<br /> <br />
<div id="ModalAddVacaciones" class="modal ADS fade" role="dialog"> <div id="ModalAddVacaciones" class="modal ADS fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content" style="width: 700px;"> <div class="modal-content" style="width: 700px;">
@@ -3188,6 +3190,11 @@
</div> </div>
</div> </div>
</div> </div>
<div id="DvPermisosMotivos2" runat="server" visible="false"> <div id="DvPermisosMotivos2" runat="server" visible="false">
<div class="form-group form-md-line-input input-iconright"> <div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtPermisoMotivo" runat="server" MaxLength="200"></asp:TextBox> <asp:TextBox CssClass="form-control" ID="TxtPermisoMotivo" runat="server" MaxLength="200"></asp:TextBox>

13
RH/Personal.aspx.vb
View File

@@ -7825,7 +7825,7 @@ Partial Class RH_Personal
Dim diaDescanso As Integer = GlobalDTTurno(UsuarioActual.CveEmpresa).FiltroPrimeroValor("DiaDescanso", $" CveTurno = {DdlTurno.SelectedValue.ToEntero}").ToEntero Dim diaDescanso As Integer = GlobalDTTurno(UsuarioActual.CveEmpresa).FiltroPrimeroValor("DiaDescanso", $" CveTurno = {DdlTurno.SelectedValue.ToEntero}").ToEntero
diaDescanso = If(diaDescanso <= 0, 1, diaDescanso) diaDescanso = If(diaDescanso <= 0, 1, diaDescanso)
LblModalAddVacacionesTitulo.Text = $"Agregar Vacaciones - días disponibles <b>{diaDescanso}</b>" LblModalAddVacacionesTitulo.Text = $"Agregar Vacaciones - días disponibles <b>{VacDiasDisponibles}</b>"
UpModalAddVacacionesTitulo.Update() UpModalAddVacacionesTitulo.Update()
@@ -7868,12 +7868,13 @@ Partial Class RH_Personal
Next x Next x
If diasVacaciones >= (DiferenciaEntreFechas - DiasNolavorales) Then If (DiferenciaEntreFechas - DiasNolavorales) >= VacDiasDisponibles Then
diasVacaciones = VacDiasDisponibles
Else
diasVacaciones = DiferenciaEntreFechas - DiasNolavorales diasVacaciones = DiferenciaEntreFechas - DiasNolavorales
TxtVacDiasPago.Text = diasVacaciones.ToString
End If End If
TxtVacDiasPago.Text = diasVacaciones.ToString
End If End If
@@ -7917,7 +7918,7 @@ Partial Class RH_Personal
Protected Sub LnkCalculaFechasVacacionesFechaFin_Click(sender As Object, e As EventArgs) Protected Sub LnkCalculaFechasVacacionesFechaFin_Click(sender As Object, e As EventArgs)
If Not validaFehcasVaciones() Then If Not validaFechasVaciones() Then
Exit Sub Exit Sub
End If End If
@@ -7925,7 +7926,7 @@ Partial Class RH_Personal
End Sub End Sub
Private Function validaFehcasVaciones() As Boolean Private Function validaFechasVaciones() As Boolean
If Not IsDate(TxtFechaFinVac.Text) Then If Not IsDate(TxtFechaFinVac.Text) Then
Alert("Fecha fin invalida", TipoMensaje.MsgAdvertencia) Alert("Fecha fin invalida", TipoMensaje.MsgAdvertencia)

139
Sistemas/RolesDetalle.aspx
View File

@@ -26,7 +26,7 @@
<ContentTemplate> <ContentTemplate>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="portlet light smmallpadding bordered "> <div class="portlet light xspadding bordered ">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption font-green"> <div class="caption font-green">
<i class="icon-pin font-green"></i> <i class="icon-pin font-green"></i>
@@ -73,55 +73,41 @@
<ContentTemplate> <ContentTemplate>
<asp:UpdatePanel ID="UPPAltaRep" runat="server" UpdateMode="Conditional"> <asp:UpdatePanel ID="UPPAltaRep" runat="server" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
<div class="row">
<div class="col-md-12"> <div class="row" align="right">
<div class="portlet light smmallpadding bordered ">
<div class="portlet-title">
<div class="caption font-green">
<i class="icon-pin font-green"></i>
<span class="caption-subject bold uppercase">Módulos</span>
</div>
<div class="actions">
<div class="btn-group">
</div>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
</div>
</div>
<div class="portlet-body">
<div class="row" align="right">
<input type="text" id="TxtBusqueda2" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvPermisos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" /> <input type="text" id="TxtBusqueda2" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvPermisos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvPermisos.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a> <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda2','{0}')", GvPermisos.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</div> </div>
<br />
<div class="row"> <div class="row">
<div> <div class="col-md-12">
<asp:GridView ID="GvPermisos" runat="server" CssClass="table table-striped table-hover Widthall ScrollAD" data-sort="true" AutoGenerateColumns="False" Width="100%" DataKeyNames="CveRol,CveModulo" GridLines="None">
<Columns> <asp:GridView ID="GvPermisos" runat="server" CssClass="table table-striped table-hover Widthall ScrollAD" data-sort="true" AutoGenerateColumns="False" Width="100%" DataKeyNames="CveRol,CveModulo" GridLines="None">
<asp:BoundField DataField="Padres" HeaderText="Módulo Padre"> <Columns>
<ControlStyle Width="175px" /> <asp:BoundField DataField="Padres" HeaderText="Módulo Padre">
<ItemStyle HorizontalAlign="Left" /> <ControlStyle Width="175px" />
</asp:BoundField> <ItemStyle HorizontalAlign="Left" />
<asp:BoundField DataField="Modulo" HeaderText="Módulo"> </asp:BoundField>
<ControlStyle Width="175px" /> <asp:BoundField DataField="Modulo" HeaderText="Módulo">
<ItemStyle HorizontalAlign="Left" /> <ControlStyle Width="175px" />
</asp:BoundField> <ItemStyle HorizontalAlign="Left" />
<asp:TemplateField> </asp:BoundField>
<HeaderTemplate><span title="Permitir">P</span></HeaderTemplate> <asp:TemplateField>
<ItemTemplate> <HeaderTemplate><span title="Permitir">P</span></HeaderTemplate>
<asp:CheckBox runat="server" ID="ChkP"></asp:CheckBox> <ItemTemplate>
</ItemTemplate> <asp:CheckBox runat="server" ID="ChkP"></asp:CheckBox>
<ControlStyle Width="25px" /> </ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle> <ControlStyle Width="25px" />
</asp:TemplateField> <ItemStyle HorizontalAlign="Center"></ItemStyle>
</Columns> </asp:TemplateField>
<HeaderStyle CssClass="Titulos" Height="15px"></HeaderStyle> </Columns>
</asp:GridView> <HeaderStyle CssClass="Titulos" Height="15px"></HeaderStyle>
</div> </asp:GridView>
</div>
</div>
</div>
</div> </div>
</div> </div>
</ContentTemplate> </ContentTemplate>
@@ -134,31 +120,17 @@
<ContentTemplate> <ContentTemplate>
<asp:UpdatePanel ID="UPPAltaProcesos" runat="server" UpdateMode="Conditional"> <asp:UpdatePanel ID="UPPAltaProcesos" runat="server" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
<div class="row">
<div class="col-md-12">
<div class="portlet light smmallpadding bordered "> <div class="row" align="right">
<div class="portlet-title">
<div class="caption font-green">
<i class="icon-pin font-green"></i>
<span class="caption-subject bold uppercase">Procesos</span>
</div>
<div class="actions">
<div class="btn-group">
</div>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
</div>
</div>
<div class="portlet-body">
<div class="row" align="right">
<input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvProcesos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" /> <input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvProcesos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvProcesos.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a> <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvProcesos.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</div> </div>
<br />
<div class="row"> <div class="row">
<div> <div class="col-md-12">
<asp:GridView ID="GvProcesos" runat="server" CssClass="table table-striped table-hover Widthall ScrollAD" data-sort="true" AutoGenerateColumns="False" Width="100%" DataKeyNames="CveRol,CveModulo,CveProceso" GridLines="None">
<asp:GridView ID="GvProcesos" runat="server" CssClass="table table-striped table-hover Widthall ScrollAD" data-sort="true" AutoGenerateColumns="False" Width="100%" DataKeyNames="CveRol,CveModulo,CveProceso" GridLines="None">
<Columns> <Columns>
<asp:BoundField DataField="Modulo" HeaderText="Módulo"> <asp:BoundField DataField="Modulo" HeaderText="Módulo">
<ControlStyle Width="150px" /> <ControlStyle Width="150px" />
@@ -179,10 +151,8 @@
</Columns> </Columns>
<HeaderStyle CssClass="Titulos" Height="15px"></HeaderStyle> <HeaderStyle CssClass="Titulos" Height="15px"></HeaderStyle>
</asp:GridView> </asp:GridView>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</ContentTemplate> </ContentTemplate>
@@ -200,7 +170,7 @@
<ContentTemplate> <ContentTemplate>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="portlet light smmallpadding bordered "> <div class="portlet light xspadding bordered ">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption font-green"> <div class="caption font-green">
<i class="icon-pin font-green"></i> <i class="icon-pin font-green"></i>
@@ -208,10 +178,16 @@
</div> </div>
<div class="actions"> <div class="actions">
<div class="btn-group"> <div class="btn-group">
<div class="row ">
<div class="col-md-12">
<input type="text" id="TxtBusquedaIndicador" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusquedaIndicador','{0}')", GvIndicadores.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusquedaIndicador','{0}')", GvIndicadores.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</div>
</div>
</div> </div>
</div> </div>
<div class="tools"> <div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
@@ -243,7 +219,8 @@
<ContentTemplate> <ContentTemplate>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="portlet light smmallpadding bordered ">
<div class="portlet light xspadding bordered ">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption font-green"> <div class="caption font-green">
<i class="icon-pin font-green"></i> <i class="icon-pin font-green"></i>
@@ -251,10 +228,18 @@
</div> </div>
<div class="actions"> <div class="actions">
<div class="btn-group"> <div class="btn-group">
<div class="row ">
<div class="col-md-12">
<input type="text" id="TxtBusquedaUsuario" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusquedaUsuario','{0}')", GvUsurios.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusquedaUsuario','{0}')", GvUsurios.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</div>
</div>
</div> </div>
</div> </div>
<div class="tools"> <div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
</div> </div>
</div> </div>
<div class="portlet-body"> <div class="portlet-body">