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

Merge branch 'master' of http://agonzalez@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Antonio Gonzalez
2020-07-30 19:19:13 -07:00
parent 7a1e2154d7 f4d6abbeaf
commit 6ad6a3d0f1
7 changed files with 570 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
App_Code/ClsPaginas.vb
View File

@@ -1457,14 +1457,14 @@ Public Class ClsPaginas
Get Get
Dim AppNombre As String = String.Format("GlobalDTBancosCuentas-{0}", CveEmpresa) Dim AppNombre As String = String.Format("GlobalDTBancosCuentas-{0}", CveEmpresa)
'sino existe, recarga los datos 'sino existe, recarga los datos
If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then If HttpContext.Current.Application(AppNombre) Is Nothing Then
Dim ObjBancos As New ClsBancos Using ObjBancos As New ClsBancos
If ObjBancos.GetBancosCuentasUsuarios(-1, CveEmpresa) Then If ObjBancos.GetBancosCuentasUsuarios(-1, CveEmpresa) Then
Application(AppNombre) = ObjBancos.DtResultados Application(AppNombre) = ObjBancos.DtResultados
Else Else
Application(AppNombre) = Nothing Application(AppNombre) = Nothing
End If End If
ObjBancos.Dispose() End Using
End If End If
Dim Str As String = String.Format("CveEmpresa = {0} ", UsuarioActual.CveEmpresa) Dim Str As String = String.Format("CveEmpresa = {0} ", UsuarioActual.CveEmpresa)

3
Bancos/IE.aspx.vb
View File

@@ -3800,6 +3800,9 @@ Partial Class Bancos_IE
Else Else
ObjIE.RollBack() ObjIE.RollBack()
Alert(MsgError, TipoMensaje.MsgAdvertencia) Alert(MsgError, TipoMensaje.MsgAdvertencia)
If Opcion = "INGPC" Then
CveIE = -1
End If
End If End If
If Msg.ToString <> "" Then If Msg.ToString <> "" Then

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.

1051
Global.asax
View File

File diff suppressed because it is too large Load Diff

5
RH/ActualizacionMasiva.aspx.vb
View File

@@ -195,6 +195,7 @@ Partial Class RH_ActualizacionMasiva
Dim OcurrioError As Boolean = False Dim OcurrioError As Boolean = False
Using ObjPersonal As ClsRH = New ClsRH() Using ObjPersonal As ClsRH = New ClsRH()
ObjPersonal.IniciaTransacSQL()
For Each Row As GridViewRow In GvDatos.Rows For Each Row As GridViewRow In GvDatos.Rows
If Row.DataKey("CvePersonal") <> "" Then If Row.DataKey("CvePersonal") <> "" Then
'If Not ObjPersonal.UpdatePersonalMasivo(Row.FCDropDownList("DdlTurno").SelectedValue.ToEntero, Row.FCDropDownList("DdlGVSubProyecto").SelectedValue.ToEntero, Row.FCDropDownList("DdlSupervisor").SelectedValue.ToEntero, 'If Not ObjPersonal.UpdatePersonalMasivo(Row.FCDropDownList("DdlTurno").SelectedValue.ToEntero, Row.FCDropDownList("DdlGVSubProyecto").SelectedValue.ToEntero, Row.FCDropDownList("DdlSupervisor").SelectedValue.ToEntero,
@@ -217,7 +218,7 @@ Partial Class RH_ActualizacionMasiva
Next Next
If Not OcurrioError Then If Not OcurrioError Then
'ObjPersonal.Commit() ObjPersonal.Commit()
Alert("La información se guardó correctamente.", TipoMensaje.MsgInformacion) Alert("La información se guardó correctamente.", TipoMensaje.MsgInformacion)
Else Else
Alert("Ocurrió un error al guardar la información.", TipoMensaje.MsgError) Alert("Ocurrió un error al guardar la información.", TipoMensaje.MsgError)
@@ -352,6 +353,8 @@ Partial Class RH_ActualizacionMasiva
Dim OcurrioError As Boolean = False Dim OcurrioError As Boolean = False
Dim contador As Integer = 0 Dim contador As Integer = 0
Using ObjPersonal As ClsRH = New ClsRH() Using ObjPersonal As ClsRH = New ClsRH()
ObjPersonal.IniciaTransacSQL()
For Each Row As DataRow In DTEXcel.Rows For Each Row As DataRow In DTEXcel.Rows
If Row("Codigo").ToString() <> "" Then If Row("Codigo").ToString() <> "" Then
Dim drow As DataRow = DTEmpleados.FiltroPrimero(String.Format("Codigo='{0}'", Row("Codigo"))) Dim drow As DataRow = DTEmpleados.FiltroPrimero(String.Format("Codigo='{0}'", Row("Codigo")))