Cxc Impresión, rep preasistenciachecador, dia siguienete marcado como retardo
This commit is contained in:
rakcsle
@@ -1615,14 +1615,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright" runat="server" id="DVCodigoDispersionVale" visible="true">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtCodigoDispersionVale" runat="server" MaxLength="25"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="TxtCodigoDispersionVale" Text="Código Dispersión Vale:"></asp:Label>
|
||||
<i></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright" runat="server" id="DVNetoPeriodo" visible="false">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtNetoPeriodo" runat="server" MaxLength="10"></asp:TextBox>
|
||||
@@ -1630,7 +1626,17 @@
|
||||
<i></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group form-md-line-input input-iconright" runat="server" id="DVCodigoDispersionVale" visible="false">
|
||||
<asp:TextBox CssClass="form-control" ID="TxtCodigoDispersionVale" runat="server" MaxLength="25"></asp:TextBox>
|
||||
<asp:Label runat="server" AssociatedControlID="TxtNetoPeriodo" Text="Código Dispersión Vale:"></asp:Label>
|
||||
<i></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="form-group form-md-line-input input-iconright">
|
||||
<asp:DropDownList ID="DdlMetodoPago" Width="100%" runat="server" AppendDataBoundItems="true" CausesValidation="true" CssClass="form-control input-sm select2me" DataTextField="MetodoPago" DataValueField="CveMetodoPago" ValidationGroup="GrpGuardar">
|
||||
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
|
||||
|
||||
@@ -189,6 +189,9 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
If Not Page.IsPostBack Then
|
||||
cargaEjercicios()
|
||||
CargaCombos()
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
' GvBind()
|
||||
@@ -663,7 +666,7 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
Dim diaSemana As Integer = Fecha.DayOfWeek
|
||||
Dim Asistencia As Boolean = True
|
||||
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso)
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso, dRow("CveTurno").ToString().ToEntero)
|
||||
Dim DiaLaboral As Boolean = Boolean.Parse(Horario(0)(0).ToString())
|
||||
|
||||
Dim HorarioEntrada As TimeSpan = TimeSpan.Parse(Horario(0)(1).ToString())
|
||||
@@ -917,7 +920,7 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
ReRow("CveAsistenciasInasistencias") = CveAsistenciaInasistenciaFalta
|
||||
End If
|
||||
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso)
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso, dRow("CveTurno").ToString().ToEntero)
|
||||
Dim DiaLaboral As Boolean = Boolean.Parse(Horario(0)(0).ToString())
|
||||
|
||||
If Not DiaLaboral Then
|
||||
@@ -1523,7 +1526,7 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
|
||||
'End Sub
|
||||
|
||||
Private Function HorarioDiario(Fecha As Date, DTHorarioPersonal As DataTable, DiaDescanso As Integer) As DataTable
|
||||
Private Function HorarioDiario(Fecha As Date, DTHorarioPersonal As DataTable, DiaDescanso As Integer, CveTurno As Integer) As DataTable
|
||||
Dim respuesta As New DataTable
|
||||
respuesta.Columns.Add("TRABAJO", System.Type.GetType("System.Boolean"))
|
||||
|
||||
@@ -1533,8 +1536,24 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
respuesta.Columns.Add("SALIDA", System.Type.GetType("System.TimeSpan"))
|
||||
Dim Drow As DataRow = respuesta.NewRow
|
||||
Dim drp As DataRow = Nothing
|
||||
|
||||
|
||||
Dim EntradaTurno As String = ""
|
||||
Dim SalidaTurno As String = ""
|
||||
|
||||
If DTHorarioPersonal.Rows.Count > 0 Then
|
||||
drp = DTHorarioPersonal(0)
|
||||
Else
|
||||
|
||||
Dim DTTemp As DataTable = GlobalDTTurno(UsuarioActual.CveEmpresa).FiltraParametros("CveTurno = " & CveTurno)
|
||||
If DTTemp.Rows.Count > 0 Then
|
||||
EntradaTurno = DTTemp.Rows(0)("HorarioDe").ToString
|
||||
SalidaTurno = DTTemp.Rows(0)("HorarioA").ToString
|
||||
Else
|
||||
EntradaTurno = "00:00"
|
||||
SalidaTurno = "09:00"
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Dim diaSemana As Integer = Fecha.DayOfWeek
|
||||
@@ -1545,59 +1564,59 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
Case 0
|
||||
Drow(0) = Boolean.Parse(If(IsNothing(drp), $"{(DiaDescanso <> diaSemana).ToString}", drp("Domingo").ToString()))
|
||||
'Drow(0) = Boolean.Parse(If(IsNothing(drp), "true", drp("Domingo").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("DomingoEntrada").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), EntradaTurno, drp("DomingoEntrada").ToString()))
|
||||
Drow(2) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("DomingoSalidaComida").ToString()))
|
||||
Drow(3) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("DomingoEntradaComida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), "09:00", drp("DomingoSalida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), SalidaTurno, drp("DomingoSalida").ToString()))
|
||||
|
||||
Exit Select
|
||||
Case 1
|
||||
Drow(0) = Boolean.Parse(If(IsNothing(drp), $"{(DiaDescanso <> diaSemana).ToString}", drp("Lunes").ToString()))
|
||||
'Drow(0) = Boolean.Parse(If(IsNothing(drp), "true", drp("Lunes").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("LunesEntrada").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), EntradaTurno, drp("LunesEntrada").ToString()))
|
||||
Drow(2) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("LunesSalidaComida").ToString()))
|
||||
Drow(3) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("LunesEntradaComida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), "09:00", drp("LunesSalida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), SalidaTurno, drp("LunesSalida").ToString()))
|
||||
Exit Select
|
||||
Case 2
|
||||
Drow(0) = Boolean.Parse(If(IsNothing(drp), $"{(DiaDescanso <> diaSemana).ToString}", drp("Martes").ToString()))
|
||||
'Drow(0) = Boolean.Parse(If(IsNothing(drp), "true", drp("Martes").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("MartesEntrada").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), EntradaTurno, drp("MartesEntrada").ToString()))
|
||||
Drow(2) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("MartesSalidaComida").ToString()))
|
||||
Drow(3) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("MartesEntradaComida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), "09:00", drp("MartesSalida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), SalidaTurno, drp("MartesSalida").ToString()))
|
||||
Exit Select
|
||||
Case 3
|
||||
Drow(0) = Boolean.Parse(If(IsNothing(drp), $"{(DiaDescanso <> diaSemana).ToString}", drp("Miercoles").ToString()))
|
||||
'Drow(0) = Boolean.Parse(If(IsNothing(drp), "true", drp("Miercoles").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("MiercolesEntrada").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), EntradaTurno, drp("MiercolesEntrada").ToString()))
|
||||
Drow(2) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("MiercolesSalidaComida").ToString()))
|
||||
Drow(3) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("MiercolesEntradaComida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), "09:00", drp("MiercolesSalida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), SalidaTurno, drp("MiercolesSalida").ToString()))
|
||||
Exit Select
|
||||
Case 4
|
||||
Drow(0) = Boolean.Parse(If(IsNothing(drp), $"{(DiaDescanso <> diaSemana).ToString}", drp("Jueves").ToString()))
|
||||
'Drow(0) = Boolean.Parse(If(IsNothing(drp), "true", drp("Jueves").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("JuevesEntrada").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), EntradaTurno, drp("JuevesEntrada").ToString()))
|
||||
Drow(2) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("JuevesSalidaComida").ToString()))
|
||||
Drow(3) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("JuevesEntradaComida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), "09:00", drp("JuevesSalida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), SalidaTurno, drp("JuevesSalida").ToString()))
|
||||
Exit Select
|
||||
Case 5
|
||||
Drow(0) = Boolean.Parse(If(IsNothing(drp), $"{(DiaDescanso <> diaSemana).ToString}", drp("Viernes").ToString()))
|
||||
'Drow(0) = Boolean.Parse(If(IsNothing(drp), "true", drp("Viernes").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("ViernesEntrada").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), EntradaTurno, drp("ViernesEntrada").ToString()))
|
||||
Drow(2) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("ViernesSalidaComida").ToString()))
|
||||
Drow(3) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("ViernesEntradaComida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), "09:00", drp("ViernesSalida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), SalidaTurno, drp("ViernesSalida").ToString()))
|
||||
Exit Select
|
||||
Case 6
|
||||
Drow(0) = Boolean.Parse(If(IsNothing(drp), $"{(DiaDescanso <> diaSemana).ToString}", drp("Sabado").ToString()))
|
||||
'Drow(0) = Boolean.Parse(If(IsNothing(drp), "False", drp("Sabado").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("SabadoEntrada").ToString()))
|
||||
Drow(1) = TimeSpan.Parse(If(IsNothing(drp), EntradaTurno, drp("SabadoEntrada").ToString()))
|
||||
Drow(2) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("SabadoSalidaComida").ToString()))
|
||||
Drow(3) = TimeSpan.Parse(If(IsNothing(drp), "00:00", drp("SabadoEntradaComida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), "09:00", drp("SabadoSalida").ToString()))
|
||||
Drow(4) = TimeSpan.Parse(If(IsNothing(drp), SalidaTurno, drp("SabadoSalida").ToString()))
|
||||
Exit Select
|
||||
End Select
|
||||
|
||||
@@ -1780,7 +1799,7 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
Dim arrayComands As String()
|
||||
|
||||
Dim Fecha As Date = FechaInicioPeriodo
|
||||
|
||||
Dim Fecha2 As Date = New Date(2024, 7, 2)
|
||||
For x As Integer = 3 To 33
|
||||
|
||||
NombreLink = "LnkFecha" & CountFecha
|
||||
@@ -2710,7 +2729,7 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
Dim diaSemana As Integer = Fecha.DayOfWeek
|
||||
Dim Asistencia As Boolean = True
|
||||
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso)
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso, dRow("CveTurno").ToString().ToEntero)
|
||||
Dim DiaLaboral As Boolean = Boolean.Parse(Horario(0)(0).ToString())
|
||||
|
||||
Dim HorarioEntrada As TimeSpan = TimeSpan.Parse(Horario(0)(1).ToString())
|
||||
@@ -2955,7 +2974,7 @@ Partial Class RH_RepChecadorPreAsistencia
|
||||
ReRow("CveAsistenciasInasistencias") = CveAsistenciaInasistenciaFalta
|
||||
End If
|
||||
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso)
|
||||
Dim Horario As DataTable = HorarioDiario(Fecha, DTHorarioPersonal, DiaDescanso, dRow("CveTurno").ToString().ToEntero)
|
||||
Dim DiaLaboral As Boolean = Boolean.Parse(Horario(0)(0).ToString())
|
||||
|
||||
If Not DiaLaboral Then
|
||||
|
||||
Reference in New Issue
Block a user