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
2021-05-24 10:17:17 -07:00
parent 728626fb40
commit 84dbf283d0
20 changed files with 1485 additions and 1443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/ClosedXML.dll
View File

Binary file not shown.

BIN
Bin/DocumentFormat.OpenXml.dll
View File

Binary file not shown.

BIN
Bin/GoCfdi.dll
View File

Binary file not shown.

2895
Bin/Microsoft.AspNet.SignalR.Core.xml
View File

File diff suppressed because it is too large Load Diff

BIN
Bin/Microsoft.IdentityModel.JsonWebTokens.dll
View File

Binary file not shown.

BIN
Bin/Microsoft.IdentityModel.Logging.dll
View File

Binary file not shown.

BIN
Bin/Microsoft.IdentityModel.Tokens.dll
View File

Binary file not shown.

BIN
Bin/Microsoft.Owin.Security.OAuth.dll
View File

Binary file not shown.

BIN
Bin/Microsoft.Owin.Security.dll
View File

Binary file not shown.

BIN
Bin/Microsoft.Owin.dll
View File

Binary file not shown.

BIN
Bin/Microsoft.SqlServer.Types.dll
View File

Binary file not shown.

BIN
Bin/System.IdentityModel.Tokens.Jwt.dll
View File

Binary file not shown.

BIN
Bin/System.IdentityModel.Tokens.Jwt.dll.refresh
View File

Binary file not shown.

BIN
Bin/WebGrease.dll
View File

Binary file not shown.

3
Nomina/Nomina2.aspx.cs
View File

@@ -367,6 +367,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
dtConceptos = null;
DataTable dtPeriodo = new DataTable();
DataTable dtasistencia = new DataTable();
LnkAutorizar.Visible = false;
if (FiltCvePeriodo > 0)
{
@@ -380,7 +381,6 @@ public partial class Nomina_Nomina2 : ClsPaginas
int CvePrePolizaProvision = drow["CvePrePolizaProvision"].ToString().ToEntero();
int CvePrePolizaProvisionAsimilados = drow["CvePrePolizaAsimilables"].ToString().ToEntero();
LnkConceptoEmpleado.Visible = (Estatus == 1);
LnkAutorizar.Visible = (Estatus == 1);
LnkRegistrarProvision.Visible = (Estatus >= 2) && CvePrePolizaProvision <= 0;
LnkConceptoEmpleado.Visible = (Estatus < 2);
LnkCargaAsistenciaMasiva.Visible = (Estatus < 2);
@@ -819,6 +819,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
#endregion
UpDatos.Update();
LnkAutorizar.Visible = dtempleados.COUNT("CvePersonal", " CvePersonal > 0 AND NomAutorizado =0")>0 ;
}
private void setGVNominas()
{

9
RH/CalculoSBC.aspx.cs
View File

@@ -21,7 +21,16 @@ public partial class RH_CalculoSBC : ClsPaginas
//}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
ADSNetLibrary.SIGAPI.Services.Agropecuaria.IAgropecuariaService servicioAgro = new ADSNetLibrary.SIGAPI.Services.Agropecuaria.AgropecuariaService(System.Configuration.ConfigurationManager.ConnectionStrings["Conexion"].ConnectionString);
ADSNetLibrary.SIGAPI.Models.Agropecuaria.Request.ActividadGET acmo = new ADSNetLibrary.SIGAPI.Models.Agropecuaria.Request.ActividadGET();
acmo.cveEmpresa = UsuarioActual.CveEmpresa; acmo.cveActividad = -1;
var obj = servicioAgro.ActividadesGet(acmo);
GVDetalleParteVariable.DataSource = obj.Result;
GVDetalleParteVariable.DataBind();
}
}
protected void LnkCalcular_Click(object sender, EventArgs e)

BIN
WEB.rar
View File

Binary file not shown.

BIN
WEB.zip Normal file
View File

Binary file not shown.

15
packages.config
View File

@@ -3,6 +3,9 @@
<package id="AjaxControlToolkit" version="15.1.4.0" targetFramework="net461" />
<package id="AjaxControlToolkit.StaticResources" version="15.1.4.0" targetFramework="net461" />
<package id="Antlr" version="3.4.1.9004" targetFramework="net461" />
<package id="ClosedXML" version="0.95.4" targetFramework="net461" />
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net461" />
<package id="ExcelNumberFormat" version="1.0.10" targetFramework="net461" />
<package id="jQuery" version="1.6.4" targetFramework="net461" />
<package id="log4net" version="1.2.10" targetFramework="net461" />
<package id="Microsoft.AspNet.SignalR" version="2.4.1" targetFramework="net461" />
@@ -19,6 +22,7 @@
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net461" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net461" />
<package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net461" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
<package id="Microsoft.EntityFrameworkCore" version="3.1.14" targetFramework="net461" />
<package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.14" targetFramework="net461" />
<package id="Microsoft.EntityFrameworkCore.Analyzers" version="3.1.14" targetFramework="net461" />
@@ -36,10 +40,9 @@
<package id="Microsoft.IdentityModel.JsonWebTokens" version="6.11.0" targetFramework="net461" />
<package id="Microsoft.IdentityModel.Logging" version="6.11.0" targetFramework="net461" />
<package id="Microsoft.IdentityModel.Tokens" version="6.11.0" targetFramework="net461" />
<package id="Microsoft.Owin" version="4.1.1" targetFramework="net461" />
<package id="Microsoft.Owin" version="4.2.0" targetFramework="net461" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net461" />
<package id="Microsoft.Owin.Security" version="4.1.0" targetFramework="net461" />
<package id="Microsoft.Owin.Security.Jwt" version="4.1.0" targetFramework="net461" />
<package id="Microsoft.Owin.Security" version="4.2.0" targetFramework="net461" />
<package id="Microsoft.Owin.Security.OAuth" version="4.1.0" targetFramework="net461" />
<package id="Microsoft.ReportingServices.ReportViewerControl.WebForms" version="150.1358.0" targetFramework="net461" />
<package id="Microsoft.ReportViewer.2015.Runtime" version="12.0.2.2402" targetFramework="net461" />
@@ -48,6 +51,7 @@
<package id="Microsoft.SqlServer.Types" version="14.0.1016.290" targetFramework="net461" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net461" />
<package id="morelinq" version="3.3.2" targetFramework="net461" />
<package id="NC-OS-SessionStateProvider" version="4.4.0.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
<package id="NuGet.Core" version="2.8.0" targetFramework="net461" />
@@ -56,8 +60,11 @@
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
<package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net461" />
<package id="System.Data.SqlClient" version="4.8.2" targetFramework="net461" />
<package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net461" />
<package id="System.IdentityModel.Tokens.Jwt" version="6.10.1" targetFramework="net461" />
<package id="System.IdentityModel.Tokens.Jwt" version="6.11.0" targetFramework="net461" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net461" />
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />

6
vwd.webinfo
View File

@@ -242,6 +242,12 @@