This commit is contained in:
@@ -622,13 +622,13 @@
|
||||
<asp:Literal ID="LtlUsuario" runat="server" Text='<%# Eval("Usuario") %>'></asp:Literal>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Left" Visible="false">
|
||||
<asp:TemplateField ItemStyle-HorizontalAlign="Left" Visible="false">
|
||||
<HeaderTemplate>Riesgo de puesto</HeaderTemplate>
|
||||
<ItemTemplate>
|
||||
<asp:Literal ID="LtlRiesgoPuesto" runat="server" Text='<%# Eval("RiesgoPuesto") %>'></asp:Literal>
|
||||
</ItemTemplate>
|
||||
</asp:TemplateField>
|
||||
|
||||
|
||||
</Columns>
|
||||
<RowStyle CssClass="Texto" />
|
||||
<AlternatingRowStyle CssClass="TextoAlterno" />
|
||||
@@ -1014,12 +1014,22 @@
|
||||
<asp:RequiredFieldValidator ID="RFVDepartamento" runat="server" ControlToValidate="DdlDepartamentoAdd" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Departamento''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardarAddS"></asp:RequiredFieldValidator>
|
||||
<i></i>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:DropDownList ID="DdlTurno2" runat="server" Width="100%" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="Turno" DataValueField="CveTurno" ValidationGroup="GrpGuardar">
|
||||
<asp:ListItem Selected="True" Text="Todos" Value="-1"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
<asp:Label AssociatedControlID="DdlTurno2" runat="server" Text="Turno:"></asp:Label>
|
||||
<asp:RequiredFieldValidator ID="rfvDdlTurno2" runat="server" ControlToValidate="DdlTurno2" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''turno''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardarAddS"></asp:RequiredFieldValidator>
|
||||
<i></i>
|
||||
</div>
|
||||
<div class="form-group form-md-line-input input-iconright" style="display: none">
|
||||
<asp:DropDownList Width="100%" ID="DdlJornada" runat="server" AppendDataBoundItems="True" DataTextField="Jornada" DataValueField="CveJornada" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardarAddS">
|
||||
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
|
||||
</asp:DropDownList>
|
||||
<asp:Label AssociatedControlID="DdlJornada" runat="server" Text="Jornada:"></asp:Label>
|
||||
<asp:RequiredFieldValidator ID="RFVJornada" runat="server" ControlToValidate="DdlJornada" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Jornada''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardarAddS"></asp:RequiredFieldValidator>
|
||||
<%--<asp:RequiredFieldValidator ID="RFVJornada" runat="server" ControlToValidate="DdlJornada" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Jornada''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardarAddS"></asp:RequiredFieldValidator>--%>
|
||||
<i></i>
|
||||
</div>
|
||||
|
||||
@@ -1144,7 +1154,7 @@
|
||||
<asp:DropDownList Width="100%" ID="DdlMedioTransporte" CssClass="form-control input-sm select2me" runat="server" AutoPostBack="true"
|
||||
DataTextField="Nombre" DataValueField="CveOrigen" ValidationGroup="GrpGuardar">
|
||||
</asp:DropDownList>
|
||||
<%-- <asp:DropDownList Width="100%" ID="DdlMedioTransporte" CssClass="form-control input-sm select2me" runat="server" DataTextField="MedioTransporte" DataValueField="CveMedioTransporte" ValidationGroup="GrpGuardar">
|
||||
<%-- <asp:DropDownList Width="100%" ID="DdlMedioTransporte" CssClass="form-control input-sm select2me" runat="server" DataTextField="MedioTransporte" DataValueField="CveMedioTransporte" ValidationGroup="GrpGuardar">
|
||||
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
|
||||
<asp:ListItem Value="1" Text="Hermosillo"></asp:ListItem>
|
||||
<asp:ListItem Value="2" Text="Taxi-1"></asp:ListItem>
|
||||
@@ -1166,7 +1176,7 @@
|
||||
<asp:Label AssociatedControlID="DDlAgroDepartamento" runat="server" Text="Depto:"></asp:Label>
|
||||
</div>
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<div style="height: 35px;padding-top: 12px;">
|
||||
<div style="height: 35px; padding-top: 12px;">
|
||||
<asp:CheckBox ID="ChkCharolaForanea" CssClass="chksino " Text=" " runat="server" />
|
||||
</div>
|
||||
<input type="text" class="form-control hidden" />
|
||||
|
||||
@@ -234,6 +234,8 @@ Partial Class RH_CatPersonal
|
||||
|
||||
Private Sub CargaTurno()
|
||||
DdlTurno.DataSource = GlobalDTTurno.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)
|
||||
DdlTurno2.DataSource = GlobalDTTurno.FiltraParametros("CveEmpresa = " & UsuarioActual.CveEmpresa)
|
||||
DdlTurno2.DataBind()
|
||||
DdlTurno.DataBind()
|
||||
End Sub
|
||||
|
||||
@@ -1158,7 +1160,7 @@ Partial Class RH_CatPersonal
|
||||
DdlTipoPeriodoAdd.SelectedValue.ToEntero, TxtNumeroSS.Text.Trim, True, SalarioDiario,
|
||||
SalarioDiario, 0, 0, 0, 15, 25, DdlMetodoPagoAdd.SelectedValue.ToEntero, TxtFechaIngreso.Text.Trim.ToDate, "-1",
|
||||
DdlTipoContratoAdd.SelectedValue.ToEntero, "",
|
||||
DdlTurno.SelectedValue.ToEntero, CvePuesto,
|
||||
DdlTurno2.SelectedValue.ToEntero, CvePuesto,
|
||||
DdlDepartamentoAdd.SelectedValue.ToEntero,
|
||||
-1, CveEscolaridad,
|
||||
CveEtadoCivil, DdlGeneroAdd.SelectedValue.ToEntero(),
|
||||
|
||||
@@ -3996,8 +3996,8 @@
|
||||
<i class="fa fa-commenting font-green"></i>
|
||||
<span class="caption-subject bold">Agregar</span>
|
||||
</div>--%>
|
||||
<asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green' style='font-weight: 700 !important;' ><span class='caption-subject bold'>Agregar</span></i>" Style="cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
|
||||
<asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Text=" <i class='fa fa-calendar-plus-o font-green' style='font-weight: 700 !important;' >Agendar</i>" Visible="false" Style="cursor: pointer;" ToolTip="Agendar"></asp:HyperLink><br />
|
||||
<asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green'></i><span class='caption-subject bold'>Agregar</span>" Style="font-weight: 700 !important;cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
|
||||
<asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Text=" <i class='fa fa-calendar-plus-o font-green'></i>Agendar" Visible="false" Style="font-weight: 700 !important;cursor: pointer;" ToolTip="Agendar"></asp:HyperLink><br />
|
||||
<asp:Literal ID="LtlTareaNueva" runat="server"></asp:Literal>
|
||||
<UserControl:TareaNueva runat="server" ID="TareaNueva" />
|
||||
</div>
|
||||
|
||||
@@ -485,8 +485,8 @@
|
||||
</div>
|
||||
<div class="actions">
|
||||
<div class="btn-group">
|
||||
<asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green' style='font-weight: 700 !important;' ><span class='caption-subject bold'>Agregar</span></i>" Style="cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
|
||||
<asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Text=" <i class='fa fa-calendar-plus-o font-green' style='font-weight: 700 !important;' >Agendar</i>" Visible="false" Style="cursor: pointer;" ToolTip="Agendar"></asp:HyperLink>
|
||||
<asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green' ></i><span class='caption-subject bold'>Agregar</span>" Style="font-weight: 700 !important;cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
|
||||
<asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Text=" <i class='fa fa-calendar-plus-o font-green' ></i>Agendar" Visible="false" Style="font-weight: 700 !important;cursor: pointer;" ToolTip="Agendar"></asp:HyperLink>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -552,7 +552,7 @@
|
||||
<tr>
|
||||
<td align="left" class="rep_titulo" style="width: 980px">
|
||||
<b>Bitácora</b> <asp:Image ID="ImgAddObs" runat="server" ImageUrl="~/Imagenes/add_comment.png" AlternateText="Agregar Observación" Style="cursor: pointer;" ToolTip="Agregar a Bitacora" />
|
||||
<asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green' style='font-weight: 700 !important;' ><span class='caption-subject bold'>Agregar</span></i>" Style="cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
|
||||
<asp:HyperLink ID="ImgAddObs" CssClass="caption-subject bold" data-toggle="modal" data-target="#ModalBitacora" runat="server" Text=" <i class='fa fa-commenting font-green'></i><span class='caption-subject bold'>Agregar</span>" Style="font-weight: 700 !important;cursor: pointer;" ToolTip="Observaciones"></asp:HyperLink><br />
|
||||
<asp:HyperLink ID="HlEvento" CssClass="Texto thickbox" runat="server" Text="Agendar..." Visible="false" ImageUrl="/Imagenes/date_add.png" Style="cursor: pointer;" ToolTip="Agendar"></asp:HyperLink>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
Reference in New Issue
Block a user