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

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2022-10-04 22:57:46 -07:00
parent ebe6618165
commit fa0fa097ba
8 changed files with 4310 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
App_Code/ClsRH.vb
View File

@@ -2264,6 +2264,24 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
End Try
Return Retorno
End Function
Public Function PersonalUitimoCodigoGET(CveEmpresa As Integer, prefijo As String) As String
Dim Codigo As String = "-1"
SqlDataAdapter("PA_RH_PersonalUitimoCodigoGET")
With SqlAdapter.SelectCommand.Parameters
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
.Add("@Prefijo", SqlDbType.VarChar).Value = prefijo
.Add("@Codigo", SqlDbType.Int).Direction = ParameterDirection.Output
End With
Try
SqlAdapter.Fill(Data)
Codigo = SqlAdapter.SelectCommand.Parameters("@Codigo").Value.ToString()
Catch ex As SqlException
OnError("Ocurrió un error al intentar guardar los cambios en el Personal.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
End Try
Return Codigo
End Function
Public Function Updateestemporal(CvePersonal As Integer, CveEmpresa As Integer, estemporal As Boolean) As Boolean
Dim Retorno As Boolean = False
SqlDataAdapter("PA_RH_PersonalUpdateesTemporal")

4
Ashx/SigFiles.ashx
View File

@@ -12,6 +12,10 @@ public class SigFiles : IHttpHandler
//context.Response.ContentType = "text/plain";
//context.Response.Write("Hello World");
string path = "";
if (context.Request["Ru"] != null)
{
path = string.Format("{0}",ModExtensiones.Decripta( context.Request["Ru"]));
}
if (context.Request["FileUrl"] != null)
{
path = string.Format("{0}{1}", ModExtensiones.DirectorioBaseEmpresas, context.Request["FileUrl"]);

3684
GPS/PalletEtiqueta2 - copia.rdlc Normal file
View File

File diff suppressed because it is too large Load Diff

1108
GPS/PalletEtiqueta2.rdlc
View File

File diff suppressed because it is too large Load Diff

29
RH/CatPersonal.aspx
View File

@@ -313,7 +313,7 @@
</div>
</div>
</div>
</div>
<div class="row">
<label class="col-md-1 truncate">clasificación:</label>
@@ -347,7 +347,7 @@
<div class="portlet light smmallpadding bordered">
<div class="portlet-title">
<div class="caption">
<i class="icon-user"></i><span class="caption-subject bold uppercase" style="font-size: 18px;">Personal (<span id="contaper" ></span>)</span>
<i class="icon-user"></i><span class="caption-subject bold uppercase" style="font-size: 18px;">Personal (<span id="contaper"></span>)</span>
</div>
<div class="tools">
<div style="display: inline-block">
@@ -651,7 +651,7 @@
<asp:Literal ID="LtlTipodeSalario" runat="server" Text='<%# Eval("TipodeSalario") %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
</Columns>
<RowStyle CssClass="Texto" />
<AlternatingRowStyle CssClass="TextoAlterno" />
@@ -758,7 +758,7 @@
<asp:CheckBox ID="ChkRiesgoPuesto" runat="server" Text="Riesgo de puesto" Checked="false" />
</div>
</div>
<div class="row" runat="server" Visible="false">
<div class="row" runat="server" visible="false">
<div class="col-md-3">
<asp:CheckBox ID="ChkSalarioDiarioSS" runat="server" Text="SalarioDiarioSS" />
</div>
@@ -832,7 +832,7 @@
<div class="col-md-3">
<asp:CheckBox ID="ChkTipodeSalario" runat="server" Text="Tipo de salario" />
</div>
</div>
</div>
<div class="modal-footer">
@@ -1070,13 +1070,13 @@
<asp:Label runat="server" AssociatedControlID="DdlRiesgoPuesto" Text="Riesgo Puesto:"></asp:Label>
<asp:RequiredFieldValidator ID="RFVRiesgoPuesto" runat="server" ControlToValidate="DdlRiesgoPuesto" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Riesgo Puesto''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardarAddS"></asp:RequiredFieldValidator>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:DropDownList ID="DdlRegistroPatronal" runat="server" Width="100%" DataTextField="RegistroPatronal" CssClass="form-control input-sm select2me" DataValueField="CveRegistroPatronal">
</asp:DropDownList>
<asp:Label runat="server" AssociatedControlID="DdlRegistroPatronal" Text="Registro Patronal:"></asp:Label>
<%--<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="DdlRiesgoPuesto" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Riesgo Puesto''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>--%>
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:DropDownList ID="DdlRegistroPatronal" runat="server" Width="100%" DataTextField="RegistroPatronal" CssClass="form-control input-sm select2me" DataValueField="CveRegistroPatronal">
</asp:DropDownList>
<asp:Label runat="server" AssociatedControlID="DdlRegistroPatronal" Text="Registro Patronal:"></asp:Label>
<%--<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="DdlRiesgoPuesto" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Riesgo Puesto''</b> es necesario, por favor seleccione uno." InitialValue="-1" ValidationGroup="GrpGuardar"></asp:RequiredFieldValidator>--%>
</div>
</div>
<div class="col-md-3">
<div class="form-group form-md-line-input input-iconright">
@@ -1114,6 +1114,11 @@
<asp:RequiredFieldValidator ID="RFVPuesto" runat="server" ControlToValidate="DdlPuestoAdd" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Puesto''</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:Label AssociatedControlID="ChkEstemporal" CssClass="lblforchk" runat="server" Text="¿es Temporal?:"></asp:Label>
<asp:CheckBox ID="ChkEstemporal" Text=" " CssClass="chksino" runat="server" />
</div>
</div>
<div class="col-md-4">
<div class="form-group form-md-line-input input-iconright">

7
RH/CatPersonal.aspx.vb
View File

@@ -73,6 +73,7 @@ Partial Class RH_CatPersonal
DdlRegistroPatronal.DataSource = Nothing
End If
DdlRegistroPatronal.DataBind()
DdlRegistroPatronal.SelectedValueExist("21") 'empresa 158
ObjRH.Dispose()
' GvDatos.Rows(0).FCLabel("LtlSubProyectoConfigurado").Text = LblSubProyectoAsignado.Text
@@ -1217,6 +1218,8 @@ Partial Class RH_CatPersonal
Alert(String.Format("El empleado a sido agregado satisfactoriamente <a href=""/RH/Personal.aspx?CvePersonal={0}"">Ver empleado</a>", ObjPersonal.CvePersonal), TipoMensaje.ToastInformacion, "", 0)
End If
If ObjPersonal.Updateestemporal(ObjPersonal.CvePersonal, UsuarioActual.CveEmpresa, ChkEstemporal.Checked) Then
End If
ObjPersonal.AgroDepartamentoPersonalUp(UsuarioActual.CveEmpresa, DDlAgroDepartamento.SelectedValue.ToEntero(), ObjPersonal.CvePersonal, If(ChkCharolaForanea.Checked, 1, 0))
TxtFoto.Text = "[]"
@@ -1247,6 +1250,10 @@ Partial Class RH_CatPersonal
TxtNumeroSS.Text = ""
TxtCURP.Text = ""
TxtRFC.Text = ""
TxtCodigo.Text = "-1"
Using objrh = New ClsRH()
TxtCodigo.Text = objrh.PersonalUitimoCodigoGET(UsuarioActual.CveEmpresa, "")
End Using
End Sub
Protected Sub LnkAddPersonalSimplificado_Click(sender As Object, e As EventArgs)

15
RH/Personal.aspx.vb
View File

@@ -1642,18 +1642,21 @@ Partial Class RH_Personal
End If
If File.Exists(UsuarioActual.Empresa.Ruta & "RH\Personal\" & CvePersonal & ".jpg") Then
Dim LogoRutaFisica As String = String.Format("Empresas\{0}\RH\Personal\{1}.jpg", UsuarioActual.CveEmpresa, CvePersonal)
Dim logouri = String.Format("{0}://{1}:{2}/ashx/sigfiles.ashx?P={3}", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, Encripta(LogoRutaFisica))
'Dim LogoRutaFisica As String = String.Format("Empresas\{0}\RH\Personal\{1}.jpg", UsuarioActual.CveEmpresa, CvePersonal)
Dim LogoRutaFisica As String = String.Format("{0}RH\Personal\{1}.jpg", UsuarioActual.Empresa.Ruta, CvePersonal)
Dim logouri = String.Format("{0}://{1}:{2}/ashx/sigfiles.ashx?Ru={3}", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, Encripta(LogoRutaFisica))
ImgPersonal.ImageUrl = logouri
ElseIf File.Exists(UsuarioActual.Empresa.Ruta & "RH\Personal\" & CvePersonal & ".png") Then
Dim LogoRutaFisica As String = String.Format("Empresas\{0}\RH\Personal\{1}.png", UsuarioActual.CveEmpresa, CvePersonal)
Dim logouri = String.Format("{0}://{1}:{2}/ashx/sigfiles.ashx?P={3}", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, Encripta(LogoRutaFisica))
'Dim LogoRutaFisica As String = String.Format("Empresas\{0}\RH\Personal\{1}.png", UsuarioActual.CveEmpresa, CvePersonal)
Dim LogoRutaFisica As String = String.Format("{0}RH\Personal\{1}.png", UsuarioActual.Empresa.Ruta, CvePersonal)
Dim logouri = String.Format("{0}://{1}:{2}/ashx/sigfiles.ashx?Ru={3}", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, Encripta(LogoRutaFisica))
ImgPersonal.ImageUrl = logouri
ElseIf File.Exists(UsuarioActual.Empresa.Ruta & "RH\Personal\" & CvePersonal & ".bmp") Then
Dim LogoRutaFisica As String = String.Format("Empresas\{0}\RH\Personal\{1}.bmp", UsuarioActual.CveEmpresa, CvePersonal)
Dim logouri = String.Format("{0}://{1}:{2}/ashx/sigfiles.ashx?P={3}", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, Encripta(LogoRutaFisica))
'Dim LogoRutaFisica As String = String.Format("Empresas\{0}\RH\Personal\{1}.bmp", UsuarioActual.CveEmpresa, CvePersonal)
Dim LogoRutaFisica As String = String.Format("{0}RH\Personal\{1}.bmp", UsuarioActual.Empresa.Ruta, CvePersonal)
Dim logouri = String.Format("{0}://{1}:{2}/ashx/sigfiles.ashx?Ru={3}", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, Encripta(LogoRutaFisica))
ImgPersonal.ImageUrl = logouri
End If

2
vwd.webinfo
View File

@@ -566,6 +566,8 @@