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-07-04 10:47:41 -07:00
parent 1064eae93e
commit a28cc5492d
14 changed files with 6988 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
App_Code/ClsNominas.vb
View File

@@ -3267,6 +3267,29 @@ Public Class ClsNominas
Return retorno
End Function
Public Function PreNominaTotalSemana(numeroPeriodo As Int32, cveEmpresa As Int32, cveSubProyecto As Int32, cveTipoNomina As Int32, tipoTrabajador As String, ejercicio As Int32, facturado As Boolean) As Boolean
Dim retorno As Boolean = False
DataAdapter("PA_RH_PreNominaTotalSemana", CommandType.StoredProcedure)
addParameters("@NumeroPeriodo", SqlDbType.Int, numeroPeriodo)
addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa)
addParameters("@CveSubProyecto", SqlDbType.Int, cveSubProyecto)
addParameters("@CveTipoNomina", SqlDbType.Int, cveTipoNomina)
addParameters("@TipoTrabajador", SqlDbType.VarChar, tipoTrabajador)
addParameters("@Ejercicio", SqlDbType.Int, ejercicio)
addParameters("@Facturado", SqlDbType.Bit, facturado)
retorno = RunQuery("Ocurrió un error al obtener el PA_RH_PreNominaTotalSemana.")
Return retorno
End Function
Public Function Embarque_TableroGet(cveEmpresa As Int32, cveSubproyecto As Int32, cveEstatus As Int32, cveCultivoCuadro As Int32) As Boolean
Dim retorno As Boolean = False
DataAdapter("PA_Agro_Embarque_TableroGet", CommandType.StoredProcedure)
addParameters("@CveEmpresa", SqlDbType.Int, cveEmpresa)
addParameters("@CveSubproyecto", SqlDbType.Int, cveSubproyecto)
addParameters("@CveEstatus", SqlDbType.Int, cveEstatus)
addParameters("@CveCultivoCuadro", SqlDbType.Int, cveCultivoCuadro)
retorno = RunQuery("Ocurrió un error al obtener el PA_Agro_Embarque_TableroGet.")
Return retorno
End Function
#Region "IDisposable Support"
' IDisposable

16
App_Code/ClsRH.vb
View File

@@ -11,6 +11,13 @@ Public Class ClsRH
#Region "Campos"
'SQL
Private noguardoXcurp As Boolean = False
Public ReadOnly Property noguardoXcurpb As Boolean
Get
noguardoXcurpb = noguardoXcurp
End Get
End Property
Private SqlConexion As SqlConnection
Private SqlAdapter As SqlDataAdapter
Private SqlTransacc As SqlTransaction
@@ -1915,8 +1922,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
End Try
Return Retorno
End Function
End Function
Public Function AddPersonal(Codigo As String, APaterno As String, AMaterno As String, Nombres As String, Correo As String, FechaIngreso As Date, CveTipoPeriodo As Integer, NumeroSS As String, SeInscribioSS As Boolean, SalarioDiarioPago As Double, SalarioDiario As Double, SDI As Double,
SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String,
CveTipoContrato As Integer, Ubicacion As String, CveTurno As Integer, CvePuesto As Integer, CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer,
@@ -1928,7 +1934,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
Optional Pensionado As Boolean = False, Optional CveMedioTransporte As Integer = -1, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1) As Boolean
Dim Retorno As Boolean = False
Dim noguardoXcurp = False
SqlDataAdapter("PA_RH_PersonalAdd")
With SqlAdapter.SelectCommand.Parameters
@@ -2033,7 +2039,9 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
ElseIf Ex1.Message.Contains("Chk_RH_PersonalSalarioIMSS") Then
Alert("El nuevo personal no se guardo debido a que se presento un problema al calcular el salario", TipoMensaje.MsgAdvertencia)
GuardaLog(String.Format("{0} DESCRIPCIÓN DETALLADA: {1} {2} {3}", "Ocurrió un error al guardar el nuevo personal.", Ex1.ToString, vbCrLf, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()))
ElseIf Ex1.Message.Contains("dbo.Vw_Val_Nom_Curps") Then
ElseIf Ex1.Message.Contains("dbo.Vw_Val_Nom_Curps") Then
Retorno = True
noguardoXcurp = True
Alert(String.Format("El nuevo personal no se guardo, ya existe un personal con esta curp '{0}'", CURP), TipoMensaje.MsgAdvertencia)
GuardaLog(String.Format("{0} DESCRIPCIÓN DETALLADA: {1} {2} {3}", "Ocurrió un error al guardar el nuevo personal.", Ex1.ToString, vbCrLf, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()))
Else

138
Ashx/SIGWeb.ashx
View File

@@ -1529,6 +1529,144 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState
xfile.SetAttributeValue("EXT", Path.GetExtension(urfile))
xfile.SetAttributeValue("urlfile", urfile)
xfolder.Add(xfile)
Dim fecha As String = ""
Dim uuid As String = ""
If Path.GetExtension(urfile).ToUpper() = ".XML" Then
fecha = ""
uuid = ""
Dim settings As System.Xml.XmlReaderSettings = New System.Xml.XmlReaderSettings()
settings.ConformanceLevel = System.Xml.ConformanceLevel.Fragment
settings.IgnoreWhitespace = True
settings.IgnoreComments = True
Using xtr As System.Xml.XmlReader = System.Xml.XmlReader.Create(urfile, settings)
Dim canread As Boolean = True
Dim keyComprobante As String = "cfdi:Comprobante"
Dim keyCfdiRelacionados As String = "cfdi:CfdiRelacionados"
Dim keyEmisor As String = "cfdi:Emisor"
Dim keyReceptor As String = "cfdi:Receptor"
Dim keyConceptos As String = "cfdi:Conceptos"
Dim keyImpuestos As String = "cfdi:Impuestos"
Dim keyComplemento As String = "cfdi:Complemento"
xtr.Read()
While xtr.Read()
If xtr.NodeType = System.Xml.XmlNodeType.Element AndAlso xtr.Name = keyComprobante Then
Dim Nivel As Integer = xtr.Depth
Dim cont As Boolean = xtr.MoveToFirstAttribute()
While cont
Select Case xtr.Name.ToUpper()
Case "XMLNS:CFDI"
'xmlCFDI.comprobante.xmlns_cfdi = xtr.Value
Case "XMLNS:XSI"
'xmlCFDI.comprobante.xmlns_xsi = xtr.Value
'Case "XSI:SCHEMALOCATION"
' xmlCFDI.comprobante.xsi_schemaLocation = xtr.Value
'Case "VERSION"
' xmlCFDI.comprobante.Version = xtr.Value
'Case "SERIE"
' xmlCFDI.comprobante.Serie = xtr.Value
'Case "FOLIO"
' xmlCFDI.comprobante.Folio = xtr.Value
Case "FECHA"
fecha = xtr.Value
'Case "MONEDA"
' xmlCFDI.comprobante.Moneda = xtr.Value
'Case "SUBTOTAL"
' Dim SubTotal As Decimal = 0
' Decimal.TryParse(xtr.Value, SubTotal)
' xmlCFDI.comprobante.SubTotal = SubTotal
'Case "TOTAL"
' Dim Total As Decimal = 0
' Decimal.TryParse(xtr.Value, Total)
' xmlCFDI.comprobante.Total = Total
'Case "DESCUENTO"
' Dim Descuento As Decimal = 0
' Decimal.TryParse(xtr.Value, Descuento)
' xmlCFDI.comprobante.Descuento = Descuento
'Case "TIPOCAMBIO"
' Dim TipoCambio As Decimal = 0
' Decimal.TryParse(xtr.Value, TipoCambio)
' xmlCFDI.comprobante.TipoCambio = TipoCambio
'Case "TIPODECOMPROBANTE"
' xmlCFDI.comprobante.TipoDeComprobante = xtr.Value
'Case "FORMAPAGO"
' xmlCFDI.comprobante.FormaPago = xtr.Value
'Case "FORMADEPAGO"
' xmlCFDI.comprobante.FormaPago = xtr.Value
'Case "METODOPAGO"
' xmlCFDI.comprobante.MetodoPago = xtr.Value
'Case "METODODEPAGO"
' xmlCFDI.comprobante.MetodoPago = xtr.Value
'Case "CONDICIONESDEPAGO"
' xmlCFDI.comprobante.CondicionesDePago = xtr.Value
'Case "LUGAREXPEDICION"
' xmlCFDI.comprobante.LugarExpedicion = xtr.Value
'Case "CONFIRMACION"
' xmlCFDI.comprobante.Confirmacion = xtr.Value
'Case "NOCERTIFICADO"
' xmlCFDI.comprobante.NoCertificado = xtr.Value
'Case "SELLO"
' xmlCFDI.comprobante.Sello = xtr.Value
'Case "CERTIFICADO"
' xmlCFDI.comprobante.Certificado = xtr.Value
End Select
cont = xtr.MoveToNextAttribute()
End While
cont = xtr.MoveToFirstAttribute()
While xtr.Read() AndAlso xtr.NodeType <> System.Xml.XmlNodeType.Element
End While
End If
If xtr.NodeType = System.Xml.XmlNodeType.Element AndAlso xtr.Name = keyComplemento Then
Dim cDepth As Integer = xtr.Depth
While xtr.Read() AndAlso xtr.NodeType <> System.Xml.XmlNodeType.Element
End While
While xtr.Read() AndAlso xtr.Depth > cDepth
If xtr.NodeType = System.Xml.XmlNodeType.Element AndAlso xtr.LocalName = "TimbreFiscalDigital" Then
'xmlCFDI.complemento.xmlns_tfd = xtr.GetAttribute("xmlns:tfd")
'xmlCFDI.complemento.xsi_schemaLocation = xtr.GetAttribute("xsi:schemaLocation")
'xmlCFDI.complemento.Version = xtr.GetAttribute("Version")
uuid = xtr.GetAttribute("UUID")
'xmlCFDI.complemento.FechaTimbrado = xtr.GetAttribute("FechaTimbrado")
'xmlCFDI.complemento.RfcProvCertif = xtr.GetAttribute("RfcProvCertif")
'xmlCFDI.complemento.SelloCFD = If((xmlCFDI.comprobante.Version = "3.3" OrElse xmlCFDI.comprobante.Version = "4.0"), xtr.GetAttribute("SelloCFD"), xtr.GetAttribute("selloCFD"))
'xmlCFDI.complemento.NoCertificadoSAT = If(xmlCFDI.comprobante.Version = "3.3", xtr.GetAttribute("NoCertificadoSAT"), xtr.GetAttribute("noCertificadoSAT"))
'xmlCFDI.complemento.SelloSAT = If((xmlCFDI.comprobante.Version = "3.3" OrElse xmlCFDI.comprobante.Version = "4.0"), xtr.GetAttribute("SelloSAT"), xtr.GetAttribute("selloSAT"))
End If
End While
End If
End While
xtr.Close()
xtr.
End Using
If (System.IO.File.Exists(urfile)) Then
Dim fechita As DateTime = fecha.ToDateTime()
Dim direct As String = $"C:\Users\caudi\Desktop\Nueva carpeta\APH20210302\{fechita:yyyyMMdd}\"
If Not System.IO.Directory.Exists(direct) Then
System.IO.Directory.CreateDirectory(direct)
End If
Dim fileurl As String = $"{direct}{Path.GetFileName(urfile)}"
If uuid.Length Then
fileurl = $"{direct}{uuid}{Path.GetExtension(urfile)}"
End If
System.IO.File.Move(urfile, fileurl)
Dim x = ""
End If
End If
Next
xmlarchivos.Add(xfolder)

97
Compras/PopUpVerFactura.aspx.vb
View File

@@ -198,27 +198,110 @@ Partial Class PopUpVerFactura
End If
If Request("onlyPrint") IsNot Nothing Then
If Request("onlyPrint").ToString() = "Pallet" Then
If Request("onlyPrint").ToString() = "Pallet" AndAlso Not IsNothing(Request("CvePallet")) Then
imprimirpallet2(Request("CvePallet").ToString.ToEntero())
End If
If Request("onlyPrint").ToString() = "PalletCaja" Then
If Request("onlyPrint").ToString() = "PalletCaja" AndAlso Not IsNothing(Request("CvePallet")) Then
imprimirpallet(Request("CvePallet").ToString.ToEntero())
End If
If Request("onlyPrint").ToString() = "manifiesto" Then
If Request("onlyPrint").ToString() = "manifiesto" AndAlso Not IsNothing(Request("cveEmbarqueManifiesto")) Then
imprimirManifiesto(Request("cveEmbarqueManifiesto").ToString.ToEntero())
End If
If Request("onlyPrint").ToString() = "manifiestoRemision" Then
If Request("onlyPrint").ToString() = "manifiestoRemision" AndAlso Not IsNothing(Request("cveEmbarqueManifiesto")) Then
imprimirManifiestoRemision(Request("cveEmbarqueManifiesto").ToString.ToEntero())
End If
If Request("onlyPrint").ToString() = "manifiestoCartaPorte" Then
If Request("onlyPrint").ToString() = "manifiestoCartaPorte" AndAlso Not IsNothing(Request("cveEmbarqueManifiesto")) Then
imprimirManifiestoCartaPorte(Request("cveEmbarqueManifiesto").ToString.ToEntero())
End If
If Request("onlyPrint").ToString() = "rfctxtvalidar" Then
rfctxtvalidar()
End If
If Request("onlyPrint").ToString() = "Recibo" Then
ReciboAgropecuaria()
End If
End If
End If
End If
End Sub
Private Sub ReciboAgropecuaria()
Dim numeroPeriodo As Integer = 0
Dim cveSubProyecto As Integer = -1
Dim cveTipoNomina As Integer = -1
Dim ejercicio As Integer = 0
Dim cvePersonal As Integer = 0
Dim tipoTrabajador As String = ""
Dim facturado As Boolean = False
If Not IsNothing(Request("numeroPeriodo")) Then
numeroPeriodo = Request("numeroPeriodo").ToString.ToEntero()
End If
If Not IsNothing(Request("ejercicio")) Then
ejercicio = Request("ejercicio").ToString.ToEntero()
End If
If Not IsNothing(Request("cvePersonal")) Then
cvePersonal = Request("cvePersonal").ToString.ToEntero()
End If
Dim params As New List(Of ReportParameter)
Dim lrds As New List(Of ReportDataSource)
Using objnom As New ClsNominas
If objnom.PreNominaTotalSemana(numeroPeriodo, UsuarioActual.CveEmpresa, cveSubProyecto, cveTipoNomina, tipoTrabajador, ejercicio, facturado) Then
Dim dt As New DataTable
dt = objnom.DtResultados.FiltraParametros("CvePersonal >0")
If (cvePersonal > 0) Then
dt = dt.FiltraParametros($"CvePersonal ={cvePersonal }")
End If
lrds.Add(New ReportDataSource With {.Name = "DataSet1", .Value = dt})
End If
End Using
'endimg
'"Empresas/Grales/Formatos/EquiposGPS.rdlc"
'"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc"
ImprimirPDF("GPS/ReciboNom.rdlc", lrds, params, "Pallet", Content_Disposition:="Inline")
End Sub
Private Sub rfctxtvalidar()
Dim numeroPeriodo As Integer = 0
Dim cveSubProyecto As Integer = -1
Dim cveTipoNomina As Integer = -1
Dim ejercicio As Integer = 0
Dim cvePersonal As Integer = 0
Dim tipoTrabajador As String = ""
Dim facturado As Boolean = False
If Not IsNothing(Request("numeroPeriodo")) Then
numeroPeriodo = Request("numeroPeriodo").ToString.ToEntero()
End If
If Not IsNothing(Request("ejercicio")) Then
ejercicio = Request("ejercicio").ToString.ToEntero()
End If
If Not IsNothing(Request("cvePersonal")) Then
cvePersonal = Request("cvePersonal").ToString.ToEntero()
End If
Dim RFCs As New StringBuilder
Dim contador = 0
Using objnom As New ClsNominas
If objnom.PreNominaTotalSemana(numeroPeriodo, UsuarioActual.CveEmpresa, cveSubProyecto, cveTipoNomina, tipoTrabajador, ejercicio, facturado) Then
For Each item As DataRow In objnom.DtResultados.Select("CvePersonal > 0")
Dim rfc As String = item("RFC").ToString().Trim()
If rfc.Length > 0 Then
contador = contador + 1
RFCs.AppendLine(String.Format("{0}|{1}", contador, rfc))
End If
Next
End If
End Using
Response.Clear()
Response.ContentType = "text/plain"
Response.AppendHeader("content-disposition", "attachment;filename=RFCs_Validacion_Masiva.txt")
'Response.Write(contador.ToString())
Response.Write(RFCs.ToString())
Response.End()
End Sub
Private Sub imprimirManifiesto(cveEmbarqueManifiesto As Integer)
Dim NoEmbarque As String = ""
@@ -506,7 +589,6 @@ Partial Class PopUpVerFactura
ImprimirPDF("GPS/EmbarqueManifiestoRemision.rdlc", lrds, params, "Remisión", Content_Disposition:="Inline")
End Sub
Private Sub imprimirManifiestoCartaPorte(cveEmbarqueManifiesto As Integer)
Dim NoEmbarque As String = ""
Dim Fecha As String = ""
@@ -675,7 +757,6 @@ Partial Class PopUpVerFactura
End Sub
Private Sub imprimirpallet2(cvePallet As Integer)
Dim Envase As String = ""
Dim Tamano As String = ""

6663
GPS/ReciboNom.rdlc Normal file
View File

File diff suppressed because it is too large Load Diff

5
GPS/RepUnidades.aspx
View File

@@ -142,13 +142,13 @@
<asp:DropDownList ID="DdlCliente" runat="server" Width="200px" DataTextField="Nombre" DataValueField="CveCliente" CssClass="form-control input-sm select2me">
</asp:DropDownList>
</li>
<li>Fecha Inicio:
<li>Fecha Inicio:
<div class="input-group input-sm date date-picker " data-date-format="dd/mm/yyyy hh:mm" style="display: inline-block;">
<asp:TextBox ID="txtFechaI" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
</div>
</li>
<li>Fecha Fin:
<li>Fecha Fin:
<div class="input-group input-sm date date-picker " data-date-format="dd/mm/yyyy" style="display: inline-block;">
<asp:TextBox ID="txtFechaF" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
@@ -247,6 +247,7 @@
<asp:BoundField DataField="IMEI" ItemStyle-Width="12.5%" HeaderText="IMEI" ItemStyle-HorizontalAlign="Center" />
<asp:BoundField DataField="FechaIng" DataFormatString="{0:dd/MM/yyyy}" ItemStyle-Width="12.5%" HeaderText="Fecha Ingreso" ItemStyle-HorizontalAlign="Center" />
<asp:BoundField DataField="FechaAlta" DataFormatString="{0:dd/MM/yyyy}" ItemStyle-Width="12.5%" HeaderText="Fecha Alta" ItemStyle-HorizontalAlign="Center" />
<asp:BoundField DataField="FechaBaja" DataFormatString="{0:dd/MM/yyyy}" ItemStyle-Width="15%" HeaderText="Fecha Baja" ItemStyle-HorizontalAlign="Left" />
<asp:TemplateField ItemStyle-Width="12.5%" HeaderText="Estatus" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:Label ID="LblEstatus" runat="server" Text='<%# Eval("Estatus") %>'></asp:Label>

1
GPS/ReporteUnidadesnoTransmiten.aspx
View File

@@ -81,6 +81,7 @@
<asp:BoundField DataField="IMEI" ItemStyle-Width="10%" HeaderText="IMEI" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField DataField="NumeroTelefono" ItemStyle-Width="20%" HeaderText="Número Teléfono" ItemStyle-HorizontalAlign="Center" />
<asp:BoundField DataField="Ultimaconexion" ItemStyle-Width="15%" HeaderText="Ultima conexión" ItemStyle-HorizontalAlign="Left" />
<asp:BoundField DataField="FechaBaja" DataFormatString="{0:dd/MM/yyyy}" ItemStyle-Width="15%" HeaderText="Fecha Baja" ItemStyle-HorizontalAlign="Left" />
</Columns>
</asp:GridView>

13
General/SaldosIniciales.aspx.vb
View File

@@ -2371,6 +2371,10 @@ Partial Class General_SaldosIniciales
Dim CvePersonal As Integer = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CvePersonal", $"NombreCompletoNombre = '{NombreCompleto}'").ToString.ToEntero()
If Not (CvePersonal > 0) Then
CvePersonal = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CvePersonal", $"CURP = '{CURP}'").ToString.ToEntero()
End If
'PENDIENTES POR MEJORAR
Dim CveSATRegimenContratacion As Integer = 1
@@ -2429,10 +2433,13 @@ Partial Class General_SaldosIniciales
-1, -1, -1, CveMetodoPago, FechaIn, FechaFn.ToString, CveTipoContrato, Direccion, CveTurno, CvePuesto, CveDepartamento, -1, CveEscolaridad, CveEstadoCivil, CveGenero, -1, FechaBaja, CveEstatusPersonal, FechaNac,
LugarNacimiento, Direccion, "", "", "", CodigoPostal, Ciudad, CveEstado, Telefono, Celular, RFC, CURP, NombrePadre, NombreMadre, -1, CveSATRiesgoPuesto, CveSATRegimenContratacion, -1, CveSubProyecto, "", -1,
ClabeInterbancaria, "", CveJornada, CveJornada, "", -1, "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveUsuarioNomina, CveRegistroPatronal:=CveRegistroPatronal) Then
ErrorRH = True
Exit For
If (ObjRH.noguardoXcurpb) Then
Else
ErrorRH = True
Exit For
End If
Else
ContadorAgregados = ContadorAgregados + 1
ContadorAgregados = ContadorAgregados + 1
End If
End If

5
Metronic/assets/admin/layout/css/custom.css
View File

@@ -12,6 +12,7 @@
.table-hover > tbody > tr:hover {
background-color: #e5e5e5;
}
.table-striped > tbody > tr:nth-of-type(odd).ADSRow,
table > tbody > tr.ADSRow > td, table.table > tbody > tr.ADSRow > td,
table > tr.ADSRow > td, table.table > tr.ADSRow > td,
@@ -2996,4 +2997,8 @@ div.mypaste * {
}
.btn-circle.btn-sm btn-xs {
line-height: 1;
}
table > tbody > tr.hidetrad {
display: none;
}

14
Nomina/Nomina.aspx.cs
View File

@@ -216,8 +216,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
using (ClsNominas objnom = new ClsNominas())
{
objnom.GetNominasSinTimbrar(-1, UsuarioActual.CveEmpresa);
if (objnom.DTSetResultados.Tables.Count > 0)
{
GVNominaPendiente.DataSource = objnom.DTSetResultados.Tables[0];
GVNominaPendiente.DataBind();
}
if (GVNominaPendiente.Rows.Count > 0)
{
RegistraScript("$('#ModalNominaPendiente').modal();");
@@ -2203,7 +2207,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
DataRow drow = dtempleados.FiltroPrimero(string.Format("CvePersonal = {0}", SRCvePersonal));
TxtCCSysSalarioMinimo.Text = "";
TxtCCSysUMA.Text = "$89.62";
TxtCCSysUMA.Text = "$96.22";
if (drow != null)
{
TxtCCSysSalarioMinimo.Text = string.Format("${0:N2}", drow["SalarioMinimo"]);
@@ -2245,7 +2249,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
if (drow != null)
{
int Fechafin = string.Format("{0:yyyyMMdd}", drow["FechaFin"]).ToEntero();
decimal UMA = 89.62M;
decimal UMA = 96.22M;
decimal SalarioDiarioIMSS = drow["SalarioDiarioIMSS"].ToString().ToDecimal();
decimal DiasIMSS = drow["DiasIMSS"].ToString().ToDecimal();
decimal importeparacuota = SalarioDiarioIMSS > (3 * UMA) ? SalarioDiarioIMSS - (3 * UMA) : 0M;
@@ -2298,13 +2302,13 @@ public partial class Nomina_Nomina2 : ClsPaginas
DataRow drow = dtempleados.FiltroPrimero(string.Format("CvePersonal = {0}", SRCvePersonal));
if (drow != null)
{
decimal UMA = 89.62M;
decimal UMA = 96.22M;
decimal HorasDobles = drow["HorasDobles"].ToString().ToDecimal();
decimal HorasTriples = drow["HorasTriples"].ToString().ToDecimal();
decimal ImporteHora = drow["SalarioDiario"].ToString().ToDecimal() / 8;
decimal Semanaslaboradas = Decimal.Truncate((drow["DiasLaborados"].ToString().ToDecimal() / 7));
decimal Semanaslaboradas = Decimal.Truncate((drow["DiasLaborados"].ToString().ToDecimal() / 7M));
bool seExentandobles = !(drow["SalarioDiario"].ToString().ToDecimal() > drow["SalarioMinimo"].ToString().ToDecimal());
decimal TopeHorasDobles = Semanaslaboradas * 9;
decimal TopeHorasDobles = Semanaslaboradas * 9M;
decimal HorasExcentas = HorasDobles > TopeHorasDobles ? TopeHorasDobles : HorasDobles;
decimal ImporteHorasExtrasAntes = HorasExcentas * ImporteHora * (seExentandobles ? 2 : 1);
decimal TopeImporte = Semanaslaboradas * 5 * UMA;

13
RH/CatPersonal.aspx
View File

@@ -336,12 +336,12 @@
<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>
<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">
<input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvDatos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px; height: 25px; border-color: #89C4F4;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvDatos.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
<input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTablaClass('TxtBusqueda','{0}','contaper')", GvDatos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px; height: 25px; border-color: #89C4F4;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTablaClass('TxtBusqueda','{0}','contaper')", GvDatos.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
</div>
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
</div>
@@ -1293,6 +1293,11 @@
<script src="/Metronic/assets/global/plugins/datatables/all.min.js"></script>
<script type="text/javascript">
Sys.Application.add_load(function (s, e) {
<%= String.Format("FiltrarTablaClass('TxtBusqueda','{0}','contaper');", GvDatos.ClientID) %>
});
function OrdenarGV() {
}
@@ -2168,8 +2173,6 @@
return homonimio;
}
function fnCalculaCURP(pstNombre, pstPaterno, pstMaterno, dfecha, pstSexo, pnuCveEntidad) {
pstCURP = "";

2
RH/Personal.aspx.vb
View File

@@ -1560,7 +1560,7 @@ Partial Class RH_Personal
CHKRFCValidado.Checked = drow("RFCValidado").ToString() = "1"
'ChkPensionado.Checked = drow("Pensionado").ToString().ToUpper().Contiene("1", "TRUE")
ChkSindicalizado.Checked = drow("Sindicalizado").ToString().ToUpper().Contiene("1", "TRUE")
TxtMailrecibonomina.Text = drow("MaiReciboNomina").ToString()
'TxtMailrecibonomina.Text = drow("MaiReciboNomina").ToString()
'Carga Datos Personales
LtlPersonal.Text = ObjPersonal.NombreCompleto
NombreCompleto = ObjPersonal.NombreCompleto

28
Scripts/custom.js
View File

@@ -70,21 +70,37 @@ function log(mensaje) {
console.log(mensaje);
}
function FiltrarTabla(idtxt, idtable, idcontador) {
if ($('#' + idtxt).val() == '') { $('table#' + idtable + ' tr').css('display', 'table-row'); }
if ($('#' + idtxt).val() == '') { $('table#' + idtable + ' tr').css('display', ''); }
else {
$('table#' + idtable + ' tr:not(.ADtr)').css('display', 'none'); $('table#' + idtable + ' tr:contains("' + $('#' + idtxt).val() + '")').css('display', 'table-row');
$('table#' + idtable + ' tr:not(.ADtr)').css('display', 'none'); $('table#' + idtable + ' tr:contains("' + $('#' + idtxt).val() + '")').css('display', '');
$('div.ADScroller .ADScroller-header table#' + idtable + ' tr:not(.ADtr)').css('display', '');
}
if ($('#' + idcontador).length > 0) {
$('#' + idcontador).html($('#' + idtable + ' tr:visible').length);
}
}
function FiltrarTablaClass(idtxt, idtable, idcontador, resta) {
if (resta == null) {
resta =1
}
if ($('#' + idtxt).val() == '') { $('table#' + idtable + ' tr').removeClass('hidetrad') }
else {
$('table#' + idtable + ' tr:not(.ADtr)').addClass('hidetrad'); $('table#' + idtable + ' tr:contains("' + $('#' + idtxt).val() + '")').removeClass('hidetrad');
$('div.ADScroller .ADScroller-header table#' + idtable + ' tr:not(.ADtr)').removeClass('hidetrad');
}
if ($('#' + idcontador).length > 0) {
let numconta = $('#' + idtable + ' tr:not(.hidetrad):not(.ADtr)').length;
if (numconta > 0) { numconta - resta}
$('#' + idcontador).html(numconta );
}
}
function FiltrarTablaV2(idtxt, idtable, idcontador) {
if ($(idtxt).val() == '') { $(idtable + ' tr').css('display', ''); }
else {
$(idtable + ' tr:not(.ADtr)').css('display', 'none'); $(idtable + ' tr:contains("' + $(idtxt).val() + '")').css('display', '');
$('div.ADScroller .ADScroller-header '+idtable + ' tr:not(.ADtr)').css('display', '');
$('div.ADScroller .ADScroller-header ' + idtable + ' tr:not(.ADtr)').css('display', '');
}
if ($('#' + idcontador).length > 0) {
$('#' + idcontador).html($(idtable + ' tr:visible').length);
@@ -542,7 +558,7 @@ function ADScroller2() {
function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').addClass('hover'); },
function () { $('table#ADCol' + Tid + ' tr:nth-child(' + ($(this).index() + 1) + ')').removeClass('hover'); });
setTimeout(sizeoftablefunc, 100);
Tthis.parent().parent().bind('resize', function () {
setTimeout(resizefncscroller, 100);
})
@@ -912,7 +928,7 @@ ADSScroll = function (tablescroll) {
//objDiv.append(tablescroll);
if (firsttr) {
let childitem = firsttr.find('> td,th').length;
let contador =1
let contador = 1
firsttr.find('> td,th').each(function () {
var thistd = $(this);
let widthitem = thistd.width();
@@ -1099,7 +1115,7 @@ function ADDropzone(txtid) {
document.getElementById(txtid + '-paste').onpaste = function (event) {
var __This = myDropzone;
var objfiles = JSON.parse(TxtField.val());
if ((maxFile != null) || (maxFile < 1) || objfiles.length < maxFile) {
if ((maxFile != null) || (maxFile < 1) || objfiles.length < maxFile) {
// use event.originalEvent.clipboard for newer chrome versions
var items = (event.clipboardData || event.originalEvent.clipboardData).items;
//console.log(JSON.stringify(items)); // will give you the mime types

4
vwd.webinfo
View File

@@ -510,6 +510,10 @@