Compare commits

..

7 Commits

340 changed files with 28037 additions and 4169 deletions

View File

@@ -0,0 +1,99 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" Async="true" CodeBehind="AnularPicadas.aspx.vb" Inherits="WebIntranet.AnularPicadas" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<%--<li id='intPicadaBL' runat="server" class='obtListLat'><a onclick="redirigir()" href="intPicada.aspx">Introducir picada</a></li>--%>
<li id='intPicadaPersBL' runat="server" class='obtListLat'><a onclick="redirigir()" href="intPicadaPersonal.aspx">Introducir picada a personal</a></li>
<li id='Li1' runat="server" class='obtListLat listActivo'><a onclick="redirigir()" href="intPicadaPersonal.aspx">Anular picada a personal</a></li>
<li id='informPicadasBL' class='obtListLat'><a onclick="redirigir()" href="listPicadas.aspx">Informe de listado de picadas</a></li>
<li id='informIncidenciasBL' class='obtListLat'><a onclick="redirigir()" href="listSolicitudesComunicaciones.aspx">Informe de permisos y comunicaciones</a></li>
<%--<li id='bolsaDeHorasBL' runat="server" class='obtListLat'><a onclick="redirigir()" href="/bolsaDeHoras.aspx">Bolsa de horas extraordinarias</a></li>--%>
<%--<li id='VAAPBCBL' runat="server" class='obtListLat'><a onclick="redirigir()" href="/VAAPBC.aspx">Situación de vacaciones, asuntos particulares y días compensatorios</a></li>--%>
<li id='VAAPBCBLpers' runat="server" class='obtListLat'><a onclick="redirigir()" href="/VAAPBCpers.aspx">Situación de vacaciones, asuntos particulares y días compensatorios</a></li>
<li id='resumenIncidenciasEntreFechasBL' class='obtListLat'><a onclick="redirigir()" href="/resumenSolicitudesComunicacionesEntreFechas.aspx">Resumen de permisos y comunicaciones entre fechas</a></li>
<li id='estIncPicBL' runat="server" class='obtListLat'><a onclick="redirigir()" href="/estadoInciPicada.aspx">Estado de incidencias y picadas</a></li>
</ul>
</div>
<div class="col">
<p class="tituloMobile">Introducir picada a personal</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Control Horario</li>
<li class="migaActiva">/ Anular picada a personal</li>
</ul>
</div>
<p id="mensajeResultado" style="text-align:center; font-weight:bold"></p>
<div class="secPicada d-flex justify-content-center align-items-center">
<div class="incidencias" style="width: 400px">
<p style="margin-right: 15px; font-family: 'Satoshi';">Persona:</p>
<dx:ASPxComboBox CssClass="selectIn" Width="100%" TextField="Nombre" ValueField="Dni" ID="cbPersonas" runat="server">
</dx:ASPxComboBox>
</div>
</div>
<div class="row IntroducirFechas align-items-center wrap" style="margin-left: auto !important; margin-right: auto !important; margin-bottom: 25px !important; margin-top: 0px;">
<div class="col-md-3 d-flex" style="gap: 15px">
<p style="margin-bottom: 0px; width: 50px; line-height: 35px">Del</p>
<input id="fechaInicioListInc" runat="server" class="inFecha" style="height: 35px;" runat="server" type="date" max="9999-12-31" />
</div>
<div class="col-md-3 d-flex" style="gap: 15px">
<p style="margin-bottom: 0px; width: 50px; line-height: 35px;">al</p>
<input id="fechaFinListInc" class="inFecha" runat="server" style="height: 35px;" runat="server" type="date" max="9999-12-31" />
</div>
<div class="col-md-3" style="display: flex; justify-content: center;">
<input type="button" class="btnAzul btnAlargado" id="btnAnuPic" runat="server" onserverclick="cargarPicadas" value="Buscar" />
</div>
</div>
<div id="tablaPicadasAnular" style="max-height: 325px !important; max-width:600px; display:none" class="tablaPicadas" runat="server">
</div>
<div style="width:100%;margin-top:20px;display:flex">
<input type="button" value="Guardar cambios" style="margin-inline:auto;" class="btnAzul btnAlargado" onclick="GuardarCambios()"/>
</div>
</div>
</div>
<script>
function GuardarCambios() {
$("#divLoading").css("display", "flex")
var checks = $(".cbPic")
var cbList = ""
for (var i = 0; i < checks.length; i++) {
if (i == 0) {
cbList += checks[i].value + "-" + checks[i].checked.toString()
}
else {
cbList +="/" + checks[i].value + "-" + checks[i].checked.toString()
}
}
//cbList = [
$.ajax({
type: "post",
url: "/AnularPicadas.aspx/ModificarPicadas",
data: '{"cbList":"' + cbList+ '"}',
async: true,
contentType: "application/json; charset=utf-8",
success: function (result) {
if (result.d != "") {
if (result.d.Result == "Picadas actualizadas con exito") {
$("#mensajeResultado").css("color", "green")
$("#mensajeResultado").text(result.d.Result)
}
else {
$("#mensajeResultado").css("color", "red")
$("#mensajeResultado").text(result.d.Result)
}
$("#divLoading").css("display", "none")
}
},
error: function (result) {
$("#divLoading").css("display", "none")
alert('error occured');
},
});
}
</script>
</asp:Content>

View File

@@ -0,0 +1,96 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class AnularPicadas
'''<summary>
'''Control intPicadaPersBL.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents intPicadaPersBL As Global.System.Web.UI.HtmlControls.HtmlGenericControl
'''<summary>
'''Control Li1.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents Li1 As Global.System.Web.UI.HtmlControls.HtmlGenericControl
'''<summary>
'''Control VAAPBCBLpers.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents VAAPBCBLpers As Global.System.Web.UI.HtmlControls.HtmlGenericControl
'''<summary>
'''Control estIncPicBL.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents estIncPicBL As Global.System.Web.UI.HtmlControls.HtmlGenericControl
'''<summary>
'''Control cbPersonas.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents cbPersonas As Global.DevExpress.Web.ASPxComboBox
'''<summary>
'''Control fechaInicioListInc.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents fechaInicioListInc As Global.System.Web.UI.HtmlControls.HtmlInputGenericControl
'''<summary>
'''Control fechaFinListInc.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents fechaFinListInc As Global.System.Web.UI.HtmlControls.HtmlInputGenericControl
'''<summary>
'''Control btnAnuPic.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents btnAnuPic As Global.System.Web.UI.HtmlControls.HtmlInputButton
'''<summary>
'''Control tablaPicadasAnular.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents tablaPicadasAnular As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,105 @@
Imports System.Net.Http
Imports Newtonsoft.Json
Public Class AnularPicadas
Inherits System.Web.UI.Page
Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
If Session("usuario") = "" Then
Response.Redirect("default.aspx")
End If
estIncPicBL.Visible = False
If Session("modo") = "PERSONAL" Then
If Session("persona").Personas(0).Dni = "44286377S" Then
estIncPicBL.Visible = True
End If
Dim persons As List(Of Models.Personal) = Session("persona").Personas
Dim listaPersonas As New List(Of Models.Personal)
Dim listDni = Session("usuariosSeleccionados")
For Each pers As String In listDni
Dim per = persons.FirstOrDefault(Function(x) x.Dni = pers)
listaPersonas.Add(per)
Next
cbPersonas.DataSource = listaPersonas.OrderBy(Function(x) x.Nombre)
cbPersonas.DataBind()
'Dim DivSelect = "<select class='selectIn' style='width:100%'>"
'For Each pers As Models.Personal In listaPersonas
' DivSelect += "<option value='" + pers.Dni + "'>" + pers.Nombre + "</option>"
'Next
'DivSelect += "</select>"
'selPersonas.InnerHtml = DivSelect
Else
Response.Redirect("default.aspx")
End If
End Sub
Protected Async Sub cargarPicadas(sender As Object, e As EventArgs)
Dim persona As New List(Of String)
persona.Add(cbPersonas.Value)
Dim Fei = CDate(fechaInicioListInc.Value)
Dim Fef = CDate(fechaFinListInc.Value)
Dim consulta As New Models.Consulta
consulta.listaNif = persona
consulta.fechaInicio = Fei
consulta.fechaFin = Fef
Dim jsonConsulta As String = JsonConvert.SerializeObject(consulta)
Dim url As String = ConfigurationManager.AppSettings("RutaRes").ToString + "/api/ListPicadasAnular"
Dim clienteHTTP As New HttpClient
Dim contenidoConsultaHTTP As New StringContent(jsonConsulta, Encoding.UTF8, "application/json")
Debug.WriteLine("CargarListadodePicadasAsync:1===" + Now.ToLongTimeString)
Dim respuestaHTTP As HttpResponseMessage = Await clienteHTTP.PostAsync(url, contenidoConsultaHTTP).ConfigureAwait(False)
Debug.WriteLine("CargarListadodePicadasAsync:2===" + Now.ToLongTimeString)
Dim sRespuesta As String = Await respuestaHTTP.Content.ReadAsStringAsync().ConfigureAwait(False)
Debug.WriteLine("CargarListadodePicadasAsync:3===" + Now.ToLongTimeString)
Dim settings As New Newtonsoft.Json.JsonSerializerSettings()
settings.CheckAdditionalContent = True
Dim objetoDatos As List(Of Models.listPicadasAnular) =
Newtonsoft.Json.JsonConvert.DeserializeObject(Of List(Of Models.listPicadasAnular))(sRespuesta, settings)
Dim html = ""
html += "<table>" +
"<tr><th style='width:100px'>Inactiva</th><th>Fecha / Hora</th><th>Incidencia</th></tr>"
For Each picada As Models.listPicadasAnular In objetoDatos
Dim check = If(picada.activo = True, "checked", "")
html += "<tr><td style='text-align:center'><input type='checkbox' value='" + picada.id.ToString + "' class='cbPic' " + check + "></td><td>" + picada.fecha.ToString("dd/MM/yyyy HH:mm") + "</td><td>" + picada.incidencia + "</td></tr>"
Next
html += "</table>"
tablaPicadasAnular.InnerHtml = html
tablaPicadasAnular.Style.Add("display", "flex !important")
End Sub
<System.Web.Services.WebMethod()>
Public Shared Async Function ModificarPicadas(cbList As String) As Threading.Tasks.Task(Of String)
Dim objetoConsulta As New List(Of Models.EditarPicadasAnuladas)
Dim cbList1 = cbList.Split("/")
For Each str As String In cbList1
Dim s = str.Split("-")
Dim nEdPi As New Models.EditarPicadasAnuladas
nEdPi.idPicada = CInt(s(0))
nEdPi.estado = CBool(s(1))
objetoConsulta.Add(nEdPi)
Next
Dim jsonConsulta As String = JsonConvert.SerializeObject(objetoConsulta)
Dim url As String = ConfigurationManager.AppSettings("RutaRes").ToString + "/api/EditarPicadasAnular"
Dim clienteHTTP As New HttpClient
Dim contenidoConsultaHTTP As New StringContent(jsonConsulta, Encoding.UTF8, "application/json")
Debug.WriteLine("CargarListadodePicadasAsync:1===" + Now.ToLongTimeString)
Dim respuestaHTTP As HttpResponseMessage = Await clienteHTTP.PostAsync(url, contenidoConsultaHTTP).ConfigureAwait(False)
Debug.WriteLine("CargarListadodePicadasAsync:2===" + Now.ToLongTimeString)
Dim sRespuesta As String = Await respuestaHTTP.Content.ReadAsStringAsync().ConfigureAwait(False)
Debug.WriteLine("CargarListadodePicadasAsync:3===" + Now.ToLongTimeString)
Dim settings As New Newtonsoft.Json.JsonSerializerSettings()
settings.CheckAdditionalContent = True
Dim objetoDatos As Models.resultadoEditarPicadasAnuladas =
Newtonsoft.Json.JsonConvert.DeserializeObject(Of Models.resultadoEditarPicadasAnuladas)(sRespuesta, settings)
Return objetoDatos.mensaje
End Function
End Class

View File

@@ -0,0 +1,568 @@

Namespace Models
Public Class TramoTeletrabajoExcepcion
Public Property fechaInicio As Date
Public Property fechaFin As Date
Public Property idExcepTel As Integer
Public Property idPersona As Integer
Public Property motivo As String
End Class
Public Class ResultadoListadoExcepciones
Public Property resultado As Integer
Public Property mensaje As String
Public Property listado As List(Of TramoTeletrabajoExcepcion)
End Class
Public Class ResultadoListTeletrabajoEntreFechas
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property ListadoEF As List(Of TramosTeletrabajo)
End Class
Public Class TramosTeletrabajo
Public Property id As Integer
Public Property nuDias As Integer
Public Property excepcion As Boolean
Public Property lunes As Boolean
Public Property martes As Boolean
Public Property miercoles As Boolean
Public Property jueves As Boolean
Public Property viernes As Boolean
Public Property motivo As String
Public Property Fei As Date
Public Property Fef As Date
End Class
Public Class resultadoEditarPicadasAnuladas
Public Property resultado As Integer
Public Property mensaje As String
End Class
Public Class EditarPicadasAnuladas
Public Property idPicada As Integer
Public Property estado As Boolean
End Class
Public Class ResultadoObtenerHAD
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property HAD As String
End Class
Public Class EnumDepartamento
Public Property idDep As Integer
Public Property Descripcion As String
End Class
Public Class listPicadasAnular
Public Property id As Integer
Public Property idUsu As Integer
Public Property fecha As Date
Public Property incidencia As String
Public Property activo As Boolean
End Class
Public Class FechaIniFin
Property fechaInicio As String
Property fechaFin As String
End Class
Public Class ResultadoIdentificacion
Public Property resultado As Integer
Public Property Personas As List(Of Personal)
Public Property FeIniInciPorAceptar As Date
Public Property FeFinInciPorAceptar As Date
Public Property FeIniInciBorrador As Date
Public Property FeFinInciBorrador As Date
Public Property errores As String
End Class
Public Class Identificacion
Public Property Nif As String
Public Property clave As String
Public Property origen As String
Public Property resultado As String
End Class
Public Class SituacionPersonalOficina
Public Property PerenlaOficina As List(Of PersonaSituacion)
Public Property PerconIncidencia As List(Of PersonaSituacion)
End Class
Public Class PersonaSituacion
Public Property Nif As String
Public Property ApeNom As String
Public Property Situacion As String
End Class
Public Class GenerarForaTer
Public Property nif As String
Public Property Swift As String
Public Property Bic As String
Public Property Entidad As String
Public Property IBAN As String
End Class
Public Class ResultadoGenerarForaTer
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroForaTer As Byte()
End Class
Public Class compAcceso
Public Property idAcceso As String
Public Property clave As String
End Class
Public Class ResultadoListPicaEntreFechas
Public Property resultado As Integer
Public Property Mensaje As String
Public Property ListadoEF As ListadoPicadasEntreFechas
End Class
Public Class ListadoPicadasEntreFechas
Property ListaDepartamento As List(Of Departamento)
Property FechaInicio As String
Property FechaFin As String
Property HorasTraPeriodo As Double
End Class
Public Class Departamento
Property NombreDepartamento As String
Property LisPersonas As List(Of PersonaCH)
End Class
Public Class Anos_Meses_Dias
Property Anos As Integer
Property Meses As Integer
Property Dias As Integer
End Class
Public Class PersonaCH
Property ApellidosNombre As String
Property LisFechasTurnos As List(Of FechaTurno)
Property TotalesPeriodo As TotalPeriodo
End Class
Public Class FechaTurno
Property DesFechaTurno As String
Property LisPicadasAsistencias As List(Of PicadaAsistencia)
Property TotalesPeriodo As TotalPeriodo
End Class
Public Class PicadaAsistencia
Property Fecha As String
Property Hora As String
Property HoraReal As String
Property Incidencia As String
Property HorasATrabajar As String
Property HorasTrabajadas As String
Property HorasExtraACompensar As String
Property HorasExtraAguardar As String
Property Saldo As String
Property HorasRecuperables As String
Property HorasIncumplimiento As String
Property HorasTrabajadasTarde As String
Property NumeroPicada As String
End Class
Public Class TotalPeriodo
Property TotalHorasATrabajar As String
Property TotalHorasTrabajadas As String
Property TotalHorasExtraACompensar As String
Property TotalHorasExtraAguardar As String
Property TotalSaldo As String
Property TotalHorasRecuperables As String
Property TotalHorasIncumplimiento As String
Property TotalHorasTrabajadasTarde As String
End Class
Public Class Persona
Public Property Nombre As String
Public Property Apellidos As String
Public Property DNI As String
Public Property email() As String
Public Property FechaNacimiento As Date?
Public Property Telefono As String
Public Property Direccion As String
Public Property CodigoPostal As String
Public Property Provincia As String
Public Property Poblacion As String
Public Property FechaAlta As Date?
End Class
Public Class NominaTrabajador
Public Property idNominaTrabajador As String
Public Property Descripcion As String
Public Property MesNomina As Integer
End Class
Public Class Incidencias
Public Property idIncidencias As String
Public Property Descripcion As String
Public Property EsInciReloj As Boolean
End Class
Public Class ResultadoHorasExtrasEntreFechas
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property HorasEF As HorasExtEntreFech
End Class
Public Class HorasExtEntreFech
Property FechaInicio As Date()
Property FechaFin As Date()
Property Nombre As String
Property SaldoPeriodo As String
Property SalcoAcumulado As String
Property ListadoHorasExtras As List(Of HoraExtra)
End Class
Public Class HoraExtra
Property Fecha As Date
Property Horas As String
Property Descripcion As String
End Class
Public Class ClaVaApBc
Property Anno As Integer
Property Nombre As String
Property TotPerVa As String
Property TotDisVa As String
Property TotDifVa As String
Property TotPerAp As String
Property TotDisAp As String
Property TotDifAp As String
Property TotPerBc As String
Property TotDisBc As String
Property TotDifBc As String
Property TotPerDr As String
Property TotDisDr As String
Property TotDifDr As String
Property TotPerHr As String
Property TotDisHr As String
Property TotDifHr As String
Property ListadoVaApBc As List(Of VaApBc)
End Class
Public Class VaApBc
Property Fecha As Date
Property FechaFin As Date
Property Descripcion As String
Property HorasManana As String
Property HorasTarde As String
Property NumDias As Integer
End Class
Public Class ResultadoSituacionVAAPBC
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property DiasVAB As List(Of ClaVaApBc)
End Class
'Public Class ResultadoIdentificacion
' Public Property resultado As Integer
' Public Property Personas As List(Of Personal)
' Public Property FeIniInciPorAceptar As Date
' Public Property FeFinInciPorAceptar As Date
' Public Property errores As String
'End Class
Public Class Personal
Public Property Nombre As String
Public Property Dni As String
Public Property idPersona As Integer
Public Property Departamento As String
Public Property Roll As String
Public Property Grupo As String
Public Property NumeroInciPorAceptar As Integer
Public Property FeIniInciPorAceptar As Date
Public Property FeFinInciPorAceptar As Date
End Class
Public Class ListaPersonasDelegadas
Public Property nifIdent As String
Public Property listaPersonasDel As List(Of PersonaDelegada)
End Class
Public Class PersonaDelegada
Public Property Nif As String
Public Property Delegado As Boolean
End Class
Public Class Consulta
Public Property fechaInicio As Nullable(Of Date)
Public Property fechaFin As Nullable(Of Date)
Public Property listaNif As List(Of String)
End Class
Public Class ListAsisEntreFechas
Property ListaPersonas As List(Of PersonaAsi)
Property FechaInicio As String
Property FechaFin As String
End Class
Public Class PersonaAsi
Property ApellidosNombre As String
Property Nif As String
Property LisAsistencias As List(Of Asistencia)
End Class
Public Class Asistencia
Property idAsistencia As Integer
Property DesAsistencia As String
Public Property FechaInicio As Date
Public Property FechaFin As Date
Public Property HorasTraManana As String
Public Property HorasTraTarde As String
Public Property Observaciones As String
Public Property ExpedienteECO As String
Public Property Estado As String
Public Property DesWeb As String
Public Property Tipo As String
Public Property Ndias As Integer
End Class
Public Class ResultadoListAsisEntreFechas
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property ListadoEF As ListAsisEntreFechas
Public Property ListadoEFNoAceptada As ListAsisEntreFechas
End Class
Public Class ResultadoObtenAsistencia
''' <summary>
''' Devuelve 0 si es correcto en caso que no sea 0 devuelve error
''' </summary>
''' <returns></returns>
'''
Public Property Nif As String
Public Property ApellidosNombre As String
Public Property idAsistencia As Integer
Public Property DesAsistencia As String
Public Property idIncidenciaControlHorario As Integer
Public Property FechaInicio As Date
Public Property FechaFin As Date
Public Property HoraInicioManana As String
Public Property HoraFinManana As String
Public Property HorasTraManana As String
Public Property HoraInicioTarde As String
Public Property HoraFinTarde As String
Public Property HorasTraTarde As String
Public Property Observaciones As String
Public Property PosiblesEstados As List(Of Estados)
Public Property PuedeCambiarEstado As Boolean
Public Property EstadosAsistencia As List(Of EstadosdelaAsistencia)
Public Property IdEstadoActual As Integer
Public Property DesEstadoActual As String
Public Property Expediente As String
Public Property ExisteArchivo As Boolean = False
Public Property Resultado As Integer
Public Property Mensaje As String
End Class
Public Class EstadosdelaAsistencia
Public Property FechaHora As Date
Public Property IdTipoEstado As Integer
Public Property Usuario As String
Public Property InformacionAnexa As String
Public Property Observaciones As String
End Class
Public Class Estados
Public Property idEstado As String
Public Property Descripcion As String
End Class
Public Class EstadosAsistencia
Private Property listaEstados As List(Of Estados)
End Class
Public Class Incidencia
Public Property idIncidencias As String
Public Property Descripcion As String
Public Property EsInciReloj As Boolean
Public Property RequiereAprobacion As Boolean
Public Property AdmiteDiasCompletos As Boolean
Public Property AdmiteIntervaloDias As Boolean
Public Property AdmiteIntervaloHoras As Boolean
Public Property AdmiteInstanteTemporal As Boolean
Public Property AdmiteRangosFechas As Boolean
Public Property Adjunto As String
Public Property idGrupo As String
Public Property idSubgrupo As String
Public Property visibleWeb As Boolean
Public Property descripcionWeb As String
Public Property ayudaWeb As String
Public Property orden As Integer
ReadOnly Property Nombre As String
Get
If descripcionWeb IsNot Nothing Then
Nombre = descripcionWeb
Else
Nombre = Descripcion
End If
End Get
End Property
End Class
Public Class FicheroAtrasnmitir
Public Property idRegistro As Integer
Public Property tabla As String
Public Property Fichero As String
End Class
Public Class ResultadoAlmacenaFicheroAtransmitir
Public Property Resultado As Integer
Public Property Mensaje As String
End Class
Public Class grupos
Public Property idGrupo As String
Public Property Descripcion As String
Public Property NumIncidencias As Integer
Public Property NumSolicitudes As Integer
Public Property orden As Integer
Public Property ayudaWeb As String
End Class
Public Class subGrupos
Public Property idSubGrupo As Integer
Public Property ayudaWeb As String
Public Property descripcion As String
Public Property orden As Integer
Public Property numCom As Integer
Public Property numSol As Integer
End Class
Public Class ResultadoSubGruposIncidenciasControlHorario
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property listaSubgrupos As List(Of subGrupos)
End Class
Public Class ResultadoModificaPersonasDelegadas
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property Personas As List(Of Personal)
Public Property FeIniInciPorAceptar As Date
Public Property FeFinInciPorAceptar As Date
End Class
Public Class ConsultaAnnoMes
Public Property Anno As Integer
Public Property Mes As Integer
Public Property listaNif As List(Of String)
End Class
Public Class ResultadoExcelResumenAsistencia
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroExcel As Byte()
End Class
Public Class AlmacenaFicheroIncidencia
Public Property idAsistencia As Integer
Public Property Fichero As String
End Class
Public Class ResultadoGenAsisEntreFechas
''' <summary>
''' Devuelve 0 si es correcto en caso que no sea 0 devuelve error
''' </summary>
''' <returns></returns>
Public Property Resultado As Integer
Public Property idAsistencia As Integer
Public Property Mensaje As String
End Class
Public Class ResultadoGenTeletrabajoEntreFechas
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property Errores As List(Of String)
Public Property ListadoEF As ListTeleTrabajoEntreFechas
End Class
Public Class GenTeletrabajoEntreFechas
Public Property ListNif As List(Of String)
Public Property FechaInicio As Date
Public Property FechaFin As Date
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property ListadoEF As ListTeleTrabajoEntreFechas
End Class
Public Class ListTeleTrabajoEntreFechas
Property ListaPersonas As List(Of PersonaAsi)
Property FechaInicio As String
Property FechaFin As String
End Class
Public Class ListAsisMasivas
Public Property Nif As String
Public Property ListAsis As List(Of AsisEstado)
End Class
Public Class AsisEstado
Public Property idAsistencia As Integer
Public Property idEstado As Integer
End Class
Public Class NifPersona
Property Nif As String
End Class
Public Class ResultadoObtenerDatosPersonales
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property DatosPersonales As DatosPersonas
End Class
Public Class ObtenerDatosPersonales
Public Property Nif As String
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property DatosPersonales As DatosPersonas
End Class
Public Class DatosPersonas
Public Property Nif As String
Public Property Direccion As String
Public Property CodigoPostal As String
Public Property Poblacion As String
Public Property Provincia As String
Public Property Telefono As String
Public Property Movil As String
Public Property IBAN As String
End Class
Public Class ResultadoExcelHojaAcreditacionDatos
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroExcel As Byte()
End Class
Public Class ExcelHojaAcreditacionDatos
Public Property ListNif As List(Of String)
Public Property FechaInicio As Date
Public Property FechaFin As Date
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroExcel As Byte()
End Class
Public Class ResultadoSolicitudConsolidacionGrado
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroExcel As Byte()
End Class
Public Class SolicitudConsolidacionGrado
Public Property ListNif As List(Of String)
Public Property FechaInicio As Date
Public Property FechaFin As Date
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroExcel As Byte()
End Class
Public Class ResultadoExcelRPT
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroExcel As Byte()
End Class
Public Class ExcelRPT
Public Property ListNif As List(Of String)
Public Property FechaInicio As Date
Public Property FechaFin As Date
Public Property Resultado As Integer
Public Property Mensaje As String
Public Property FicheroExcel As Byte()
End Class
End Namespace

View File

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 335.08 121.82" style="enable-background:new 0 0 335.08 121.82;" xml:space="preserve">
<style type="text/css">
.st0{fill:#343334;}
.st1{fill:#2291D0;}
</style>
<g>
<path class="st0" d="M12.44,121.77c-4.17,0-7-3.16-7-7.6c0-4.41,2.85-7.62,7-7.62s7,3.2,7,7.62S16.59,121.77,12.44,121.77z
M12.44,108.02c-3.26,0-5.46,2.5-5.46,6.16s2.2,6.16,5.46,6.16c3.24,0,5.48-2.5,5.48-6.16S15.69,108.02,12.44,108.02z"/>
<path class="st0" d="M23.66,115.06v6.47h-1.48v-14.7h8.66v1.4h-7.18v5.5h6.03v1.33H23.66z"/>
<path class="st0" d="M34.82,121.53h-1.48v-14.7h1.48V121.53z"/>
<path class="st0" d="M37.45,114.18c0-4.58,2.89-7.62,6.98-7.62c3.12,0,5.58,1.93,6.2,4.82h-1.6c-0.64-2.13-2.46-3.37-4.66-3.37
c-3.22,0-5.38,2.46-5.38,6.16c0,3.74,2.2,6.14,5.38,6.14c2.32,0,4.17-1.31,4.8-3.2h1.58c-0.68,2.83-3.3,4.64-6.41,4.64
C40.3,121.75,37.45,118.76,37.45,114.18z"/>
<path class="st0" d="M54.8,121.53h-1.48v-14.7h1.48V121.53z"/>
<path class="st0" d="M58.33,121.53v-14.7h1.5l8.09,12.28v-12.28h1.46v14.7h-1.46l-8.09-12.23v12.23H58.33z"/>
<path class="st0" d="M71.46,121.53l5.4-14.7h1.81l5.44,14.7h-1.54l-1.4-3.9h-6.79l-1.44,3.9H71.46z M74.83,116.38h5.89l-2.73-7.47
c-0.04-0.16-0.14-0.45-0.18-0.6c-0.02,0.14-0.12,0.43-0.16,0.6L74.83,116.38z"/>
<path class="st0" d="M90.27,121.53l5.42-15.19h3.24l5.4,15.19h-3.53l-1.07-3.2h-4.91l-1.09,3.2H90.27z M95.79,115.53h3l-1.09-3.24
c-0.18-0.51-0.35-1.11-0.41-1.48c-0.04,0.37-0.21,0.97-0.39,1.48L95.79,115.53z"/>
<path class="st0" d="M106.11,121.53v-15.19h3.28l6.4,9.94v-9.94h3.28v15.19h-3.28l-6.4-9.92v9.92H106.11z"/>
<path class="st0" d="M122.23,121.53v-15.19h5.95c4.27,0,7.35,3.14,7.35,7.64c0,4.43-3.02,7.55-7.35,7.55H122.23z M125.56,109.44
v9.03h2.3c2.59,0,4.17-1.85,4.17-4.5c0-2.67-1.62-4.54-4.17-4.54H125.56z"/>
<path class="st0" d="M135.6,121.53l5.42-15.19h3.24l5.4,15.19h-3.53l-1.07-3.2h-4.91l-1.09,3.2H135.6z M141.13,115.53h3l-1.09-3.24
c-0.18-0.51-0.35-1.11-0.41-1.48c-0.04,0.37-0.21,0.97-0.39,1.48L141.13,115.53z"/>
<path class="st0" d="M154.81,118.55h5.95v2.98h-9.32v-15.19h3.37V118.55z"/>
<path class="st0" d="M162.73,106.34h3.33v9.38c0,1.81,1.25,2.89,3.02,2.89c1.75,0,3.06-1.23,3.06-2.89v-9.38h3.32v9.48
c0,3.8-2.94,5.95-6.38,5.95c-3.45,0-6.34-2.22-6.34-5.95V106.34z"/>
<path class="st0" d="M177.65,121.53v-3.12l6.83-8.87l-6.83,0.02v-3.22h10.84v2.98l-6.88,9.03h6.77v3.18H177.65z"/>
<path class="st0" d="M189.6,121.53l5.42-15.19h3.24l5.4,15.19h-3.53l-1.07-3.2h-4.91l-1.09,3.2H189.6z M195.12,115.53h3l-1.09-3.24
c-0.18-0.51-0.35-1.11-0.41-1.48c-0.04,0.37-0.21,0.97-0.39,1.48L195.12,115.53z"/>
<path class="st0" d="M209.58,121.53l5.4-14.7h1.81l5.44,14.7h-1.54l-1.4-3.9h-6.79l-1.44,3.9H209.58z M212.95,116.38h5.89
l-2.73-7.47c-0.04-0.16-0.14-0.45-0.18-0.6c-0.02,0.14-0.12,0.43-0.16,0.6L212.95,116.38z"/>
<path class="st0" d="M224.31,121.53v-14.7h1.5l8.09,12.28v-12.28h1.46v14.7h-1.46l-8.09-12.23v12.23H224.31z"/>
<path class="st0" d="M237.39,106.83h10.72v1.38h-4.6v13.32h-1.48V108.2h-4.64V106.83z"/>
<path class="st0" d="M251.63,121.53h-1.48v-14.7h1.48V121.53z"/>
<path class="st0" d="M256.68,115.06v6.47h-1.48v-14.7h8.66v1.4h-7.19v5.5h6.04v1.33H256.68z"/>
<path class="st0" d="M266.35,121.53v-14.7h5.63c3,0,4.8,1.62,4.8,4.25c0,2.13-1.15,3.65-3.04,4.13l3.02,6.32h-1.66l-2.85-6.1h-4.41
v6.1H266.35z M267.83,114.06H272c2.09,0,3.22-1.13,3.22-2.94c0-1.87-1.21-2.94-3.24-2.94h-4.15V114.06z"/>
<path class="st0" d="M278,121.53l5.4-14.7h1.81l5.44,14.7h-1.54l-1.4-3.9h-6.79l-1.44,3.9H278z M281.37,116.38h5.89l-2.73-7.47
c-0.04-0.16-0.14-0.45-0.18-0.6c-0.02,0.14-0.12,0.43-0.16,0.6L281.37,116.38z"/>
<path class="st0" d="M291.86,106.83h1.5v9.67c0.02,3.02,2.16,3.88,4.05,3.88c2.05,0,4.04-1.09,4.04-3.88v-9.67h1.48v9.71
c0,3.65-2.69,5.28-5.52,5.28c-2.67,0-5.54-1.44-5.54-5.28V106.83z"/>
<path class="st0" d="M306.32,121.53v-14.7h4.48c4.39,0,7.35,2.96,7.35,7.35c0,4.39-2.94,7.35-7.35,7.35H306.32z M307.8,108.22
v11.91h2.94c3.53,0,5.85-2.38,5.85-5.95c0-3.55-2.34-5.95-5.85-5.95H307.8z"/>
<path class="st0" d="M320.82,121.53v-14.7h8.79v1.42h-7.33v5.26h6.65v1.31h-6.65v5.32h7.35v1.4H320.82z"/>
</g>
<g>
<path class="st1" d="M89.79,34.6C83.73,10.17,59.02-4.71,34.59,1.35s-39.3,30.77-33.24,55.2c6.06,24.42,30.77,39.31,55.2,33.24
C80.97,83.73,95.85,59.02,89.79,34.6z M30.43,63.19c-9.08,2.25-18.28-3.28-20.53-12.37c-2.26-9.08,3.28-18.28,12.37-20.53
c9.08-2.26,18.28,3.28,20.53,12.37C45.05,51.74,39.51,60.93,30.43,63.19z"/>
<g>
<polygon class="st0" points="91.79,91.15 113.27,91.15 122.14,65.01 148.28,65.01 157,91.15 178.86,91.15 162.85,46.07
107.88,46.04 "/>
<polygon class="st0" points="124.31,0 112.04,34.38 157.19,30.15 146.47,0 "/>
</g>
<g>
<polygon class="st0" points="182.32,91.15 203.8,91.15 212.67,65.01 238.81,65.01 247.53,91.15 269.4,91.15 253.4,46.12
198.4,46.09 "/>
<polygon class="st0" points="214.84,0 205.71,25.59 244.8,21.93 237,0 "/>
</g>
<g>
<polygon class="st0" points="274.36,91.15 295.27,91.15 295.27,65.01 328.51,65.01 328.51,46.17 274.36,46.17 "/>
<polygon class="st0" points="274.36,0 274.36,19.15 335.08,13.45 335.08,0 "/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.2 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 221.5 246.54"><defs><style>.b{fill:#546777;}</style></defs><path class="b" d="M166.91,204.05c-19.03-18.56-37.38-36.45-57.28-55.85h111.87v-51.18H111.06l-1.99-3.28c18.54-17.89,37.08-35.79,55.06-53.13-14.78-14.47-28.81-28.2-41.49-40.6C81.58,40.97,39.81,82.65,0,122.37c40.87,40.96,82.5,82.69,123.88,124.17,12.62-12.47,26.3-25.98,43.03-42.49Z"/></svg>

After

Width:  |  Height:  |  Size: 444 B

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 221.5 246.54"><defs><style>.b{fill:#1d3344;}</style></defs><path class="b" d="M166.91,204.05c-19.03-18.56-37.38-36.45-57.28-55.85h111.87v-51.18H111.06l-1.99-3.28c18.54-17.89,37.08-35.79,55.06-53.13-14.78-14.47-28.81-28.2-41.49-40.6C81.58,40.97,39.81,82.65,0,122.37c40.87,40.96,82.5,82.69,123.88,124.17,12.62-12.47,26.3-25.98,43.03-42.49Z"/></svg>

After

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 990 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1014 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 614 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 744 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 918 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 360"><defs><style>.b{fill:#fff;}.c{fill:#1d3344;}</style></defs><circle class="c" cx="180" cy="180" r="180"/><g><path class="b" d="M137.5,170.16c-32.66,0-59.22-26.57-59.22-59.22s26.57-59.23,59.22-59.23,59.23,26.57,59.23,59.23-26.57,59.22-59.23,59.22Z"/><path class="b" d="M201.32,183.38c-17.05,15.04-39.35,24.25-63.82,24.25s-46.77-9.21-63.82-24.25c-19.37,17.47-31.63,42.68-31.63,70.83v-.09H232.94v.09c0-28.14-12.25-53.36-31.63-70.83Z"/></g><g><path class="b" d="M256.53,148.12c-20.46,0-37.11-16.64-37.11-37.11s16.64-37.11,37.11-37.11,37.11,16.65,37.11,37.11-16.65,37.11-37.11,37.11Z"/><path class="b" d="M296.51,156.4c-10.68,9.42-24.66,15.19-39.98,15.19s-29.3-5.77-39.98-15.19c-12.14,10.94-19.81,26.74-19.81,44.37v-.05h119.6v.05c0-17.63-7.68-33.43-19.81-44.37Z"/></g><g><g><path class="b" d="M292.38,305.66c-.34,0-.69-.04-1.02-.11-2.48-.54-4.96-1.09-7.44-1.64-5.6-1.24-11.19-2.47-16.8-3.67-6.21-1.33-12.43-2.61-18.78-3.93l-8.55-1.78c-2.56-.53-4.21-3.02-3.71-5.59l10.35-52.83c.37-1.9,1.85-3.39,3.75-3.76,.31-.06,.62-.09,.93-.09,1.58,0,3.08,.78,3.98,2.13l8.3,12.49c18.8-8.55,28.89-21.98,30.82-40.93,.2-1.98,1.61-3.63,3.53-4.13l.91-.24c.41-.11,.82-.16,1.23-.16,1.93,0,3.73,1.18,4.45,3.05,.61,1.59,1.26,3.17,1.91,4.75,1.54,3.77,3.14,7.66,4.32,11.74,1.02,3.53,1.51,7.09,1.98,10.54,.2,1.43,.39,2.86,.63,4.28,.04,.26,.06,.52,.06,.78v2.98c0,.29-.03,.58-.08,.86-.06,.32-.13,.64-.2,.96-.1,.44-.19,.86-.2,1.13-.94,12.79-5.93,24.36-14.83,34.39-2.55,2.88-5.35,5.51-8.05,8.06-.27,.26-.55,.52-.83,.78l7.96,12.61c.93,1.47,.98,3.33,.14,4.85-.84,1.52-2.44,2.47-4.18,2.47h-.6Z"/><path class="c" d="M299.88,206.2c2.07,5.35,4.5,10.6,6.09,16.1,1.34,4.61,1.69,9.5,2.48,14.27v2.98c-.16,.87-.4,1.73-.47,2.61-.89,12.11-5.66,22.58-13.64,31.57-3.52,3.96-7.55,7.47-11.45,11.28,.62,.97,1.32,2.04,2,3.12,2.69,4.26,5.38,8.51,8.06,12.77h-.6c-8.09-1.77-16.17-3.59-24.27-5.31-8.97-1.92-17.96-3.75-27.34-5.71,3.43-17.5,6.82-34.79,10.35-52.83,3.76,5.66,7.07,10.65,10.49,15.8,21.26-8.52,34.95-22.86,37.34-46.39,.31-.08,.62-.16,.93-.25m0-9.55c-.81,0-1.63,.1-2.45,.32l-.92,.24c-3.84,1.02-6.65,4.31-7.05,8.26-1.63,16.09-9.44,27.45-24.4,35.29l-.96-1.44-5.03-7.57c-1.79-2.7-4.79-4.27-7.95-4.27-.62,0-1.24,.06-1.86,.18-3.8,.76-6.76,3.73-7.5,7.53l-6.7,34.2-3.65,18.63c-1,5.13,2.3,10.11,7.42,11.18,2.88,.6,5.72,1.19,8.53,1.77,6.46,1.34,12.57,2.61,18.77,3.93,5.58,1.19,11.27,2.45,16.77,3.66,2.48,.55,4.96,1.1,7.45,1.64,.67,.15,1.36,.22,2.05,.22h.6c3.48,0,6.68-1.89,8.36-4.94s1.57-6.76-.29-9.7l-2.19-3.47c-1.23-1.94-2.45-3.88-3.68-5.82,2.13-2.03,4.27-4.14,6.32-6.44,9.59-10.81,14.97-23.29,16.01-37.11,.02-.13,.08-.38,.12-.57,.08-.37,.16-.74,.22-1.1,.1-.57,.16-1.15,.16-1.72v-2.98c0-.52-.04-1.05-.13-1.56-.22-1.33-.41-2.7-.61-4.14-.49-3.62-1.01-7.36-2.13-11.22-1.25-4.32-2.9-8.34-4.49-12.22-.66-1.61-1.28-3.13-1.87-4.66-1.45-3.75-5.04-6.11-8.9-6.11h0Z"/></g><g><path class="b" d="M195.77,254.16c-1.63,0-3.19-.84-4.07-2.28-3.86-6.29-6.54-12.89-8.2-20.16-.6-2.62-.98-5.24-1.35-7.78-.16-1.1-.32-2.19-.5-3.29-.04-.25-.06-.51-.06-.77v-4.76c0-.32,.03-.64,.1-.96,.06-.29,.13-.59,.2-.88,.07-.3,.16-.67,.17-.82,1-12.61,5.91-24.01,14.59-33.87,2.6-2.95,5.45-5.64,8.21-8.24,.29-.27,.58-.55,.87-.82-.12-.19-.24-.38-.36-.57-1.83-2.9-3.65-5.81-5.47-8.72l-2.09-3.33c-.92-1.47-.97-3.33-.13-4.85,.84-1.52,2.44-2.46,4.18-2.46h.6c.34,0,.69,.04,1.02,.11,2.48,.54,4.96,1.09,7.44,1.64,5.59,1.24,11.19,2.47,16.79,3.67,6.24,1.33,12.48,2.62,18.86,3.94l8.46,1.75c2.56,.53,4.21,3.03,3.71,5.59l-10.35,52.84c-.37,1.9-1.85,3.39-3.75,3.76-.31,.06-.62,.09-.93,.09-1.58,0-3.08-.79-3.98-2.13l-8.3-12.52c-19.13,8.67-28.98,21.94-30.89,41.5-.2,2.04-1.68,3.73-3.68,4.19-.36,.08-.72,.12-1.07,.12Z"/><path class="c" d="M202.45,154.37c8.09,1.77,16.17,3.59,24.26,5.31,8.97,1.91,17.96,3.75,27.33,5.7-3.43,17.51-6.82,34.8-10.35,52.84-3.77-5.68-7.08-10.68-10.5-15.82-21.27,8.53-35.06,22.78-37.42,46.98-3.79-6.19-6.15-12.29-7.61-18.72-.81-3.55-1.21-7.18-1.8-10.78v-4.76c.16-.76,.4-1.52,.46-2.29,.94-11.89,5.61-22.22,13.41-31.09,3.57-4.05,7.69-7.62,11.66-11.51-.77-1.18-1.65-2.49-2.49-3.82-2.53-4.01-5.04-8.03-7.55-12.04h.6m0-9.55h-.6c-3.47,0-6.67,1.89-8.35,4.92-1.68,3.04-1.58,6.75,.26,9.69l2.13,3.39c1.24,1.97,2.47,3.95,3.71,5.92-2.2,2.1-4.43,4.29-6.53,6.68-9.33,10.59-14.62,22.85-15.74,36.42-.02,.1-.05,.2-.07,.31-.08,.35-.17,.69-.24,1.04-.13,.63-.2,1.27-.2,1.92v4.76c0,.51,.04,1.03,.12,1.54,.17,1.07,.33,2.14,.49,3.21,.39,2.63,.78,5.34,1.42,8.15,1.77,7.78,4.64,14.85,8.78,21.59,1.76,2.87,4.87,4.55,8.14,4.55,.71,0,1.43-.08,2.14-.24,4-.92,6.96-4.29,7.36-8.37,1.62-16.63,9.25-27.93,24.47-35.85l4.13,6.23,1.87,2.81c1.79,2.7,4.8,4.27,7.95,4.27,.62,0,1.24-.06,1.86-.18,3.8-.75,6.76-3.73,7.51-7.53l2.16-11,8.2-41.84c1-5.13-2.3-10.11-7.42-11.18-2.87-.6-5.71-1.19-8.52-1.77-6.46-1.34-12.57-2.6-18.77-3.93-5.58-1.19-11.27-2.45-16.77-3.66-2.48-.55-4.96-1.1-7.44-1.64-.67-.15-1.36-.22-2.05-.22h0Z"/></g></g></svg>

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 360"><defs><style>.b{fill:#fff;}.c{fill:#546777;}</style></defs><circle class="c" cx="180" cy="180" r="180"/><g><path class="b" d="M137.5,170.16c-32.66,0-59.22-26.57-59.22-59.22s26.57-59.23,59.22-59.23,59.23,26.57,59.23,59.23-26.57,59.22-59.23,59.22Z"/><path class="b" d="M201.32,183.38c-17.05,15.04-39.35,24.25-63.82,24.25s-46.77-9.21-63.82-24.25c-19.37,17.47-31.63,42.68-31.63,70.83v-.09H232.94v.09c0-28.14-12.25-53.36-31.63-70.83Z"/></g><g><path class="b" d="M256.53,148.12c-20.46,0-37.11-16.64-37.11-37.11s16.64-37.11,37.11-37.11,37.11,16.65,37.11,37.11-16.65,37.11-37.11,37.11Z"/><path class="b" d="M296.51,156.4c-10.68,9.42-24.66,15.19-39.98,15.19s-29.3-5.77-39.98-15.19c-12.14,10.94-19.81,26.74-19.81,44.37v-.05h119.6v.05c0-17.63-7.68-33.43-19.81-44.37Z"/></g><g><g><path class="b" d="M292.38,305.66c-.34,0-.69-.04-1.02-.11-2.5-.55-5-1.1-7.5-1.65-5.58-1.23-11.15-2.46-16.74-3.66-6.26-1.34-12.53-2.63-18.94-3.96l-8.39-1.74c-2.56-.53-4.21-3.02-3.71-5.59l10.35-52.83c.37-1.9,1.85-3.39,3.75-3.76,.31-.06,.62-.09,.93-.09,1.58,0,3.08,.78,3.98,2.13l8.3,12.49c18.8-8.55,28.89-21.98,30.82-40.93,.2-1.97,1.6-3.62,3.52-4.13l.93-.25c.41-.11,.82-.16,1.23-.16,1.93,0,3.73,1.18,4.45,3.05,.61,1.59,1.26,3.17,1.91,4.75,1.54,3.77,3.14,7.66,4.32,11.74,1.02,3.53,1.51,7.09,1.98,10.54,.2,1.43,.39,2.86,.63,4.28,.04,.26,.06,.52,.06,.78v2.98c0,.29-.03,.58-.08,.86-.06,.32-.13,.64-.2,.96-.1,.44-.19,.86-.2,1.13-.94,12.79-5.93,24.36-14.83,34.39-2.56,2.88-5.35,5.51-8.05,8.06-.28,.26-.55,.52-.83,.78l7.96,12.61c.93,1.47,.98,3.33,.14,4.85-.84,1.52-2.44,2.47-4.18,2.47h-.6Z"/><path class="c" d="M299.88,206.2c2.07,5.35,4.5,10.6,6.09,16.1,1.34,4.61,1.69,9.5,2.48,14.27v2.98c-.16,.87-.4,1.73-.47,2.61-.89,12.11-5.66,22.58-13.64,31.57-3.52,3.96-7.55,7.47-11.45,11.28,.62,.97,1.32,2.04,2,3.12,2.69,4.26,5.38,8.51,8.06,12.77h-.6c-8.09-1.77-16.17-3.59-24.27-5.31-8.97-1.91-17.96-3.75-27.34-5.71,3.43-17.5,6.82-34.79,10.35-52.83,3.76,5.66,7.07,10.65,10.49,15.8,21.26-8.52,34.95-22.86,37.34-46.39,.31-.08,.62-.16,.93-.25m0-9.55c-.81,0-1.63,.1-2.45,.32l-.77,.2-.16,.04c-3.84,1.02-6.65,4.31-7.05,8.26-1.63,16.09-9.44,27.45-24.4,35.29l-5.99-9.02c-1.79-2.7-4.79-4.27-7.95-4.27-.62,0-1.24,.06-1.86,.18-3.8,.76-6.76,3.73-7.5,7.53l-2.59,13.2-7.76,39.63c-1,5.13,2.3,10.11,7.42,11.18,2.87,.6,5.71,1.19,8.52,1.77,6.47,1.34,12.58,2.61,18.78,3.93,5.59,1.19,11.28,2.45,16.78,3.66,2.48,.55,4.96,1.09,7.43,1.64,.67,.15,1.36,.22,2.05,.22h.6c3.48,0,6.68-1.89,8.36-4.94,1.68-3.05,1.57-6.76-.29-9.7l-2.17-3.44c-1.23-1.95-2.46-3.91-3.7-5.86,2.13-2.03,4.27-4.14,6.32-6.44,9.59-10.81,14.97-23.29,16.01-37.11,.02-.13,.08-.38,.12-.57,.08-.37,.16-.73,.22-1.1,.1-.57,.16-1.15,.16-1.73v-2.98c0-.52-.04-1.05-.13-1.56-.22-1.33-.41-2.7-.61-4.14-.49-3.62-1.01-7.35-2.13-11.22-1.25-4.32-2.9-8.33-4.49-12.22-.66-1.61-1.28-3.13-1.87-4.66-1.45-3.75-5.04-6.11-8.9-6.11h0Z"/></g><g><path class="b" d="M195.77,254.16c-1.63,0-3.19-.84-4.07-2.28-3.86-6.3-6.54-12.89-8.2-20.16-.6-2.62-.98-5.24-1.35-7.78-.16-1.1-.32-2.19-.5-3.29-.04-.25-.06-.51-.06-.77v-4.77c0-.32,.03-.65,.1-.96,.06-.29,.13-.58,.2-.88,.07-.3,.16-.67,.17-.82,1-12.61,5.91-24.01,14.59-33.87,2.6-2.95,5.45-5.64,8.21-8.24,.29-.27,.58-.55,.87-.82-.12-.19-.24-.38-.36-.57-1.83-2.9-3.65-5.81-5.47-8.72l-2.09-3.33c-.92-1.47-.97-3.33-.13-4.85,.84-1.52,2.44-2.46,4.18-2.46h.6c.34,0,.69,.04,1.02,.11,2.48,.54,4.96,1.09,7.44,1.64,5.59,1.24,11.19,2.47,16.79,3.67,6.24,1.33,12.48,2.62,18.86,3.94l8.46,1.75c2.56,.53,4.21,3.03,3.71,5.59l-10.35,52.84c-.37,1.9-1.85,3.39-3.75,3.76-.31,.06-.62,.09-.93,.09-1.58,0-3.08-.79-3.98-2.13l-8.3-12.52c-19.13,8.67-28.98,21.94-30.89,41.5-.2,2.04-1.68,3.73-3.68,4.19-.36,.08-.72,.12-1.07,.12Z"/><path class="c" d="M202.45,154.37c8.09,1.77,16.17,3.59,24.26,5.31,8.97,1.91,17.96,3.75,27.33,5.7-3.43,17.51-6.82,34.8-10.35,52.84-3.77-5.68-7.08-10.68-10.5-15.82-21.27,8.53-35.06,22.78-37.42,46.98-3.79-6.19-6.15-12.29-7.61-18.72-.81-3.55-1.21-7.18-1.8-10.78v-4.76c.16-.76,.4-1.52,.46-2.29,.94-11.89,5.61-22.22,13.41-31.09,3.57-4.05,7.69-7.62,11.66-11.51-.77-1.18-1.65-2.49-2.49-3.82-2.53-4.01-5.04-8.03-7.55-12.04h.6m0-9.55h-.6c-3.47,0-6.67,1.89-8.35,4.92-1.68,3.04-1.58,6.75,.26,9.69l2.11,3.37c1.24,1.98,2.48,3.96,3.73,5.94-2.2,2.1-4.43,4.29-6.53,6.68-9.33,10.59-14.62,22.85-15.74,36.42-.02,.1-.05,.21-.07,.31-.08,.35-.16,.69-.24,1.04-.13,.63-.2,1.28-.2,1.92v4.76c0,.51,.04,1.03,.12,1.53,.17,1.07,.33,2.14,.49,3.21,.39,2.63,.78,5.34,1.42,8.15,1.77,7.78,4.64,14.85,8.78,21.59,1.76,2.87,4.87,4.55,8.14,4.55,.71,0,1.43-.08,2.14-.24,4-.92,6.96-4.29,7.36-8.37,1.62-16.63,9.25-27.93,24.47-35.85l6,9.04c1.79,2.7,4.8,4.27,7.95,4.27,.62,0,1.24-.06,1.86-.18,3.8-.75,6.76-3.73,7.51-7.53l1.68-8.57,8.67-44.27c1-5.13-2.3-10.11-7.42-11.18-2.87-.6-5.7-1.18-8.51-1.77-6.47-1.34-12.58-2.6-18.78-3.93-5.59-1.19-11.28-2.45-16.78-3.66-2.48-.55-4.95-1.09-7.43-1.64-.67-.15-1.36-.22-2.05-.22h0Z"/></g></g></svg>

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.66 16.25"><defs><style>.b{fill:#1d1d1b;}</style></defs><g><polygon class="b" points="1.38 .57 18.28 .57 9.83 9.02 1.38 .57"/><path class="b" d="M16.9,1.14l-7.07,7.07L2.76,1.14h14.14M19.66,0H0L9.83,9.83,19.66,0h0Z"/></g><g><rect class="b" x="8.43" y="6.15" width="2.79" height="9.31"/><path class="b" d="M10.43,6.94v7.74h-1.21V6.94h1.21m1.57-1.57H7.65v10.89h4.36V5.37h0Z"/></g></svg>

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 548 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

View File

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

View File

@@ -0,0 +1,33 @@
<svg xmlns="http://www.w3.org/2000/svg" width="152.104" height="40.848" viewBox="0 0 152.104 40.848">
<g id="Grupo_311" data-name="Grupo 311" transform="translate(-34.577 42.54)">
<g id="Grupo_307" data-name="Grupo 307" transform="translate(34.577 -42.54)">
<path id="Trazado_427" data-name="Trazado 427" d="M18.806-33.319V-27.9a5.064,5.064,0,0,0,.156,1.448,1,1,0,0,0,.6.642,3.936,3.936,0,0,0,1.346.174v.431H14.577v-.431a3.7,3.7,0,0,0,1.3-.164.943.943,0,0,0,.578-.628,5.074,5.074,0,0,0,.153-1.472V-39.588A4.4,4.4,0,0,0,16.433-41a1.072,1.072,0,0,0-.6-.656,3.405,3.405,0,0,0-1.261-.177v-.419h6.27A6.8,6.8,0,0,1,23-41.924a4.884,4.884,0,0,1,1.7.978,4.311,4.311,0,0,1,1.1,1.51,4.794,4.794,0,0,1,.384,1.9,4.948,4.948,0,0,1-.618,2.455,4.428,4.428,0,0,1-1.707,1.69,4.97,4.97,0,0,1-2.438.608,6.94,6.94,0,0,1-2.614-.533m0-7.79v6.93a4.315,4.315,0,0,0,1.656.427,2.939,2.939,0,0,0,1.618-.445,2.881,2.881,0,0,0,1.1-1.251,4.269,4.269,0,0,0,.373-1.856,5.211,5.211,0,0,0-.775-2.789,2.8,2.8,0,0,0-2.59-1.289,3.643,3.643,0,0,0-1.384.272" transform="translate(-14.577 42.619)" fill="#fff"/>
<path id="Trazado_428" data-name="Trazado 428" d="M26.388-30.561l-.907,3.284-.116.752a.833.833,0,0,0,.344.734,2.211,2.211,0,0,0,1.19.232v.431H22.57v-.431a1.663,1.663,0,0,0,1.285-.476,4.907,4.907,0,0,0,.8-1.86l4.1-14.645h.368l4.4,14.645a8.927,8.927,0,0,0,.606,1.614,1.22,1.22,0,0,0,.567.606,2.88,2.88,0,0,0,.945.116v.431H30.175v-.431a1.983,1.983,0,0,0,1.047-.215.844.844,0,0,0,.3-.751,4.733,4.733,0,0,0-.221-1.13l-.887-2.906Zm3.743-.959L28.34-37.6h-.055L26.64-31.52Z" transform="translate(-12.401 42.54)" fill="#fff"/>
<path id="Trazado_429" data-name="Trazado 429" d="M37.771-33.319V-27.9a5.846,5.846,0,0,0,.146,1.448,1,1,0,0,0,.571.642,3.759,3.759,0,0,0,1.34.174v.431H33.487v-.431a3.886,3.886,0,0,0,1.342-.174.95.95,0,0,0,.585-.649,4.81,4.81,0,0,0,.15-1.441V-39.555A4.68,4.68,0,0,0,35.4-41a.993.993,0,0,0-.592-.656,3.785,3.785,0,0,0-1.326-.174v-.421h6.548a5.389,5.389,0,0,1,2.553.578,4,4,0,0,1,1.649,1.567,4.066,4.066,0,0,1,.575,2.122,4.129,4.129,0,0,1-1.037,2.808A4.956,4.956,0,0,1,40.956-33.6L44.741-27a3.966,3.966,0,0,0,.822,1.085,1.518,1.518,0,0,0,.98.279v.431h-3.06l-4.627-8.112Zm0-.789h.857a3.432,3.432,0,0,0,2.608-1,3.639,3.639,0,0,0,.954-2.611,5.327,5.327,0,0,0-.2-1.513,3.813,3.813,0,0,0-.588-1.14,2.629,2.629,0,0,0-.915-.734,2.724,2.724,0,0,0-1.211-.272,3.237,3.237,0,0,0-1.5.354Z" transform="translate(-9.429 42.619)" fill="#fff"/>
<path id="Trazado_430" data-name="Trazado 430" d="M44.511-42.251h6.368v.421a3.746,3.746,0,0,0-1.322.174.991.991,0,0,0-.6.659,4.942,4.942,0,0,0-.16,1.441v12.061a1.787,1.787,0,0,0,.214,1.078,1.267,1.267,0,0,0,.949.262h1.665a7.226,7.226,0,0,0,1.616-.15,2.376,2.376,0,0,0,1.051-.537,3.382,3.382,0,0,0,.775-1.109,12.639,12.639,0,0,0,.669-1.879l.378.118-1.139,4.5H44.511v-.431a4.594,4.594,0,0,0,1.1-.106,1.137,1.137,0,0,0,.63-.35l.275-.654a7.743,7.743,0,0,0,.069-1.135V-39.555a4.687,4.687,0,0,0-.167-1.438,1.1,1.1,0,0,0-.6-.663,3.706,3.706,0,0,0-1.312-.174Z" transform="translate(-6.428 42.619)" fill="#fff"/>
<path id="Trazado_431" data-name="Trazado 431" d="M58.231-30.561l-.926,3.284-.115.752a.815.815,0,0,0,.354.734,2.229,2.229,0,0,0,1.2.232v.431H54.412v-.431a1.625,1.625,0,0,0,1.266-.476,4.933,4.933,0,0,0,.805-1.86l4.1-14.645h.378L65.351-27.9a9.864,9.864,0,0,0,.6,1.614,1.194,1.194,0,0,0,.571.606,2.906,2.906,0,0,0,.938.116v.431H62v-.431a1.986,1.986,0,0,0,1.051-.215.847.847,0,0,0,.309-.751,5.167,5.167,0,0,0-.221-1.13l-.9-2.906Zm3.729-.959L60.169-37.6h-.051L58.472-31.52Z" transform="translate(-3.732 42.54)" fill="#fff"/>
<path id="Trazado_432" data-name="Trazado 432" d="M65.375-42.251h4.07L73.7-29.688h.059l4.257-12.563h3.889v.421a2.62,2.62,0,0,0-1.053.181,1.056,1.056,0,0,0-.5.663,5.068,5.068,0,0,0-.146,1.4V-27.9a5.777,5.777,0,0,0,.146,1.417,1.033,1.033,0,0,0,.52.67,2.446,2.446,0,0,0,1.033.177v.431H76.02v-.431a3.514,3.514,0,0,0,1.248-.167.98.98,0,0,0,.581-.65,4.587,4.587,0,0,0,.167-1.448V-39.381h-.045L73.2-25.207h-.3L68.189-39.079h-.051V-27.9a4.91,4.91,0,0,0,.16,1.478.9.9,0,0,0,.557.634,3.481,3.481,0,0,0,1.224.153v.431h-4.7v-.431a3.132,3.132,0,0,0,1.173-.167.985.985,0,0,0,.553-.65,5.441,5.441,0,0,0,.146-1.448V-39.586a5.068,5.068,0,0,0-.146-1.4,1,1,0,0,0-.553-.663,3.2,3.2,0,0,0-1.173-.181Z" transform="translate(-0.748 42.619)" fill="#fff"/>
<path id="Trazado_433" data-name="Trazado 433" d="M89.363-42.251l.232,3.7h-.422a5.357,5.357,0,0,0-.435-1.791,1.507,1.507,0,0,0-.854-.768,4.558,4.558,0,0,0-1.523-.191h-3.23v6.678H85.67a2.256,2.256,0,0,0,1.776-.548,3.167,3.167,0,0,0,.455-2h.4v5.948h-.4a3.282,3.282,0,0,0-.394-1.921,1.717,1.717,0,0,0-1.429-.52H83.131v6.083a2.111,2.111,0,0,0,.207,1.165,1.16,1.16,0,0,0,.922.27h2.284a3.266,3.266,0,0,0,2.285-.766,6.125,6.125,0,0,0,1.419-2.649l.4.113-1.216,4.249H78.908v-.431a3.819,3.819,0,0,0,1.3-.167,1.02,1.02,0,0,0,.575-.63,4.949,4.949,0,0,0,.16-1.468V-39.586a5.491,5.491,0,0,0-.136-1.387,1.046,1.046,0,0,0-.581-.66,3.488,3.488,0,0,0-1.313-.2v-.421Z" transform="translate(2.936 42.619)" fill="#fff"/>
<path id="Trazado_434" data-name="Trazado 434" d="M88.8-42.251h3.467l8.089,12.3h.045v-9.632a4.47,4.47,0,0,0-.167-1.4,1.03,1.03,0,0,0-.606-.669,3.763,3.763,0,0,0-1.309-.174v-.421h4.614v.421a1.683,1.683,0,0,0-1.268.4,1.988,1.988,0,0,0-.38,1.38v15.127h-.323L91.892-38.752h-.051V-27.9a6.8,6.8,0,0,0,.084,1.167l.31.665.584.344a4.272,4.272,0,0,0,.943.089h.323v.431H89.142v-.431a1.946,1.946,0,0,0,1.438-.425,2.209,2.209,0,0,0,.371-1.462V-40.133l-.654-.941a1.643,1.643,0,0,0-.614-.6,2.051,2.051,0,0,0-.88-.156Z" transform="translate(5.63 42.619)" fill="#fff"/>
<path id="Trazado_435" data-name="Trazado 435" d="M107.81-41.306v13.4a4.307,4.307,0,0,0,.177,1.478.9.9,0,0,0,.574.634,4.243,4.243,0,0,0,1.34.153v.431h-6.375v-.431a3.81,3.81,0,0,0,1.327-.164.972.972,0,0,0,.6-.639,5.161,5.161,0,0,0,.163-1.462v-13.4H103.95a3.756,3.756,0,0,0-1.55.279,1.687,1.687,0,0,0-.851.935,4.486,4.486,0,0,0-.281,1.718h-.384v-3.877h11.657v3.877h-.38a3.419,3.419,0,0,0-.628-2.279,2.689,2.689,0,0,0-2.033-.653Z" transform="translate(8.919 42.619)" fill="#fff"/>
<path id="Trazado_436" data-name="Trazado 436" d="M110.943-33.648a13.222,13.222,0,0,1,.714-4.336,7.539,7.539,0,0,1,2.153-3.3,5.058,5.058,0,0,1,3.46-1.252,5.037,5.037,0,0,1,3.448,1.252,7.646,7.646,0,0,1,2.156,3.3,13.354,13.354,0,0,1,.71,4.336,13.328,13.328,0,0,1-.4,3.305,10.368,10.368,0,0,1-1.179,2.838,6.187,6.187,0,0,1-1.992,2.013,5.133,5.133,0,0,1-2.744.742,5.1,5.1,0,0,1-3.4-1.224,7.63,7.63,0,0,1-2.186-3.258,12.961,12.961,0,0,1-.738-4.416m2.625,0a22.372,22.372,0,0,0,.388,4.56,5.314,5.314,0,0,0,1.2,2.628,2.834,2.834,0,0,0,2.114.826,2.733,2.733,0,0,0,2.218-.955,5.583,5.583,0,0,0,1.149-2.683,23.633,23.633,0,0,0,.337-4.375,21.647,21.647,0,0,0-.394-4.572,5.309,5.309,0,0,0-1.191-2.622,2.839,2.839,0,0,0-2.118-.836,2.914,2.914,0,0,0-1.716.509,3.5,3.5,0,0,0-1.14,1.514,9.6,9.6,0,0,0-.645,2.488,26.925,26.925,0,0,0-.2,3.519" transform="translate(11.657 42.54)" fill="#fff"/>
</g>
<g id="Grupo_310" data-name="Grupo 310" transform="translate(34.577 -24.983)">
<g id="Grupo_308" data-name="Grupo 308" transform="translate(0 6.247)">
<path id="Trazado_437" data-name="Trazado 437" d="M14.577-23.83h6.107a8.255,8.255,0,0,1,3.518.684,6.554,6.554,0,0,1,2.462,1.893A8.2,8.2,0,0,1,28.115-18.5a11.24,11.24,0,0,1,.466,3.262,10.216,10.216,0,0,1-.588,3.511,7.953,7.953,0,0,1-1.686,2.669,7.115,7.115,0,0,1-2.49,1.683,7.7,7.7,0,0,1-3.015.584H14.577v-.431a3.813,3.813,0,0,0,1.305-.163.925.925,0,0,0,.575-.628,5.084,5.084,0,0,0,.153-1.473V-21.163a3,3,0,0,0-.37-1.823,2.315,2.315,0,0,0-1.663-.421Zm4.243,1.207V-7.986a4.331,4.331,0,0,0,2.016.429A4.417,4.417,0,0,0,23.6-8.445a5.529,5.529,0,0,0,1.754-2.617,12.455,12.455,0,0,0,.594-4.1,14.445,14.445,0,0,0-.336-3.247,7.806,7.806,0,0,0-1.057-2.468,4.733,4.733,0,0,0-1.693-1.551,4.583,4.583,0,0,0-2.224-.531,5.475,5.475,0,0,0-.935.071,5.976,5.976,0,0,0-.88.262" transform="translate(-14.577 23.83)" fill="#fff"/>
<path id="Trazado_438" data-name="Trazado 438" d="M36.854-23.83l.234,3.7h-.425a5.424,5.424,0,0,0-.439-1.791,1.516,1.516,0,0,0-.842-.768,4.637,4.637,0,0,0-1.527-.191h-3.23v6.678h2.537a2.221,2.221,0,0,0,1.767-.547,3.159,3.159,0,0,0,.469-2h.4v5.946h-.4a3.179,3.179,0,0,0-.415-1.921,1.666,1.666,0,0,0-1.415-.52H30.626v6.083A2.246,2.246,0,0,0,30.823-8a1.189,1.189,0,0,0,.931.268h2.279A3.275,3.275,0,0,0,36.316-8.5a6,6,0,0,0,1.419-2.649l.4.112-1.22,4.249H26.389v-.431a3.772,3.772,0,0,0,1.3-.167.966.966,0,0,0,.571-.628,4.736,4.736,0,0,0,.163-1.469V-21.163a5.159,5.159,0,0,0-.136-1.388,1.022,1.022,0,0,0-.585-.659,3.414,3.414,0,0,0-1.312-.2v-.422Z" transform="translate(-11.361 23.83)" fill="#fff"/>
</g>
<g id="Grupo_309" data-name="Grupo 309" transform="translate(33.55)">
<path id="Trazado_439" data-name="Trazado 439" d="M44.851-12.479,43.92-9.125l-.115.767a.844.844,0,0,0,.351.751,2.268,2.268,0,0,0,1.219.235v.441H40.948v-.441a1.676,1.676,0,0,0,1.313-.486,5.239,5.239,0,0,0,.816-1.9L47.263-24.71h.375l4.5,14.953a8.906,8.906,0,0,0,.608,1.65,1.208,1.208,0,0,0,.583.617,2.9,2.9,0,0,0,.958.118v.441H48.715v-.441a2,2,0,0,0,1.066-.219.856.856,0,0,0,.316-.767,5.243,5.243,0,0,0-.226-1.153l-.906-2.968Zm3.826-.978-1.837-6.2h-.052l-1.677,6.2Z" transform="translate(-40.948 29.837)" fill="#fff"/>
<path id="Trazado_440" data-name="Trazado 440" d="M51.981-24.415h3.544l8.256,12.557h.06v-9.836a4.5,4.5,0,0,0-.181-1.43,1.036,1.036,0,0,0-.611-.683,3.884,3.884,0,0,0-1.345-.178v-.43h4.719v.43a1.769,1.769,0,0,0-1.305.41,2.069,2.069,0,0,0-.378,1.41V-6.719H64.4L55.144-20.843h-.052V-9.764a7.305,7.305,0,0,0,.087,1.191l.323.681.59.35a4.349,4.349,0,0,0,.962.09h.323v.441H52.332v-.441A1.981,1.981,0,0,0,53.8-7.886a2.233,2.233,0,0,0,.389-1.492V-22.252l-.67-.962a1.643,1.643,0,0,0-.639-.611,2.036,2.036,0,0,0-.9-.16Z" transform="translate(-37.944 29.917)" fill="#fff"/>
<path id="Trazado_441" data-name="Trazado 441" d="M64.266-24.415h6.229a8.4,8.4,0,0,1,3.6.7,6.775,6.775,0,0,1,2.52,1.933,8.2,8.2,0,0,1,1.473,2.817,11.516,11.516,0,0,1,.475,3.329,9.8,9.8,0,0,1-.611,3.586A7.708,7.708,0,0,1,76.24-9.326a7.289,7.289,0,0,1-2.532,1.718,7.892,7.892,0,0,1-3.083.6h-6.36v-.441A3.807,3.807,0,0,0,65.6-7.619a.938.938,0,0,0,.59-.642,4.981,4.981,0,0,0,.163-1.5v-11.93a3.008,3.008,0,0,0-.392-1.86,2.331,2.331,0,0,0-1.691-.431ZM68.6-23.182V-8.237a4.479,4.479,0,0,0,2.055.438,4.489,4.489,0,0,0,2.823-.906,5.7,5.7,0,0,0,1.794-2.673,12.755,12.755,0,0,0,.612-4.184,13.97,13.97,0,0,0-.358-3.314A7.654,7.654,0,0,0,74.449-21.4a4.865,4.865,0,0,0-1.715-1.583,4.722,4.722,0,0,0-2.277-.542,5.3,5.3,0,0,0-.955.074,5.757,5.757,0,0,0-.9.267" transform="translate(-34.6 29.917)" fill="#fff"/>
<path id="Trazado_442" data-name="Trazado 442" d="M79.245-12.479l-.934,3.354-.115.767a.85.85,0,0,0,.347.751,2.274,2.274,0,0,0,1.223.235v.441H75.351v-.441a1.666,1.666,0,0,0,1.3-.486,5.185,5.185,0,0,0,.819-1.9L81.665-24.71h.371L86.523-9.757a10.06,10.06,0,0,0,.621,1.65,1.236,1.236,0,0,0,.576.617,2.975,2.975,0,0,0,.972.118v.441H83.109v-.441a1.991,1.991,0,0,0,1.07-.219.858.858,0,0,0,.319-.767,5.375,5.375,0,0,0-.229-1.153l-.917-2.968Zm3.815-.978-1.829-6.2h-.045l-1.691,6.2Z" transform="translate(-31.582 29.837)" fill="#fff"/>
<path id="Trazado_443" data-name="Trazado 443" d="M86.585-24.415h6.5v.43a3.817,3.817,0,0,0-1.347.178,1.044,1.044,0,0,0-.612.673,5.368,5.368,0,0,0-.163,1.472V-9.348a1.8,1.8,0,0,0,.226,1.1,1.281,1.281,0,0,0,.964.267h1.7a7.519,7.519,0,0,0,1.656-.153,2.39,2.39,0,0,0,1.066-.548,3.506,3.506,0,0,0,.791-1.132,14.318,14.318,0,0,0,.695-1.92l.378.122-1.155,4.6h-10.7v-.441A4.78,4.78,0,0,0,87.72-7.56l.646-.357.274-.667A8.627,8.627,0,0,0,88.7-9.744V-21.662a4.422,4.422,0,0,0-.174-1.468,1.069,1.069,0,0,0-.611-.677,3.772,3.772,0,0,0-1.333-.178Z" transform="translate(-28.524 29.917)" fill="#fff"/>
<path id="Trazado_444" data-name="Trazado 444" d="M95.885-24.415h5.95v.43a3.057,3.057,0,0,0-1.149.184,1.074,1.074,0,0,0-.536.67A4.779,4.779,0,0,0,100-21.694v9.783a4.507,4.507,0,0,0,1.058,3.337,3.52,3.52,0,0,0,2.6,1.045,3.662,3.662,0,0,0,2.938-1.291,5.323,5.323,0,0,0,1.111-3.572v-9.3a5.038,5.038,0,0,0-.156-1.44.978.978,0,0,0-.559-.673,3.054,3.054,0,0,0-1.187-.178v-.43h4.593v.43a2.763,2.763,0,0,0-1.09.184,1.12,1.12,0,0,0-.542.691,4.819,4.819,0,0,0-.163,1.416v9.4a6.6,6.6,0,0,1-.667,3.121,4.252,4.252,0,0,1-1.857,1.912,5.89,5.89,0,0,1-2.822.639A5.982,5.982,0,0,1,99.4-7.932c-1.093-.878-1.649-2.392-1.649-4.537v-9.225a4.707,4.707,0,0,0-.156-1.43,1.022,1.022,0,0,0-.541-.683,2.9,2.9,0,0,0-1.167-.178Z" transform="translate(-25.992 29.917)" fill="#fff"/>
<path id="Trazado_445" data-name="Trazado 445" d="M119.411-24.71l.271,5.739h-.413a7.162,7.162,0,0,0-.653-2.579,4.105,4.105,0,0,0-1.43-1.715,3.5,3.5,0,0,0-2.02-.612,3.484,3.484,0,0,0-3.287,2.226,15.243,15.243,0,0,0-1.094,6.565,14.286,14.286,0,0,0,.552,4.34,5.052,5.052,0,0,0,1.614,2.51,4.083,4.083,0,0,0,2.51.788,3.913,3.913,0,0,0,1.7-.347,4.145,4.145,0,0,0,1.364-1.125,9.035,9.035,0,0,0,1.156-1.916l.389.209c-1.136,2.725-2.885,4.081-5.284,4.081a5.867,5.867,0,0,1-3.253-1,7.008,7.008,0,0,1-2.5-2.964,10.73,10.73,0,0,1-.948-4.639,13.159,13.159,0,0,1,.9-4.888,8.294,8.294,0,0,1,2.464-3.44,5.529,5.529,0,0,1,3.506-1.237,4.522,4.522,0,0,1,1.466.209,9.157,9.157,0,0,1,1.209.532,2.1,2.1,0,0,0,.818.333l.347-.247a2.7,2.7,0,0,0,.2-.827Z" transform="translate(-22.669 29.837)" fill="#fff"/>
<path id="Trazado_446" data-name="Trazado 446" d="M118.1-23.238h6.259v.43a3.361,3.361,0,0,0-1.249.178,1.087,1.087,0,0,0-.587.677,4.526,4.526,0,0,0-.173,1.436v11.93a4.583,4.583,0,0,0,.183,1.527,1,1,0,0,0,.594.642,4.008,4.008,0,0,0,1.232.142v.441H118.1v-.441a3.137,3.137,0,0,0,1.275-.195,1.067,1.067,0,0,0,.576-.669,4.956,4.956,0,0,0,.159-1.448v-11.93a5.034,5.034,0,0,0-.163-1.471.967.967,0,0,0-.58-.65,3.506,3.506,0,0,0-1.267-.17Zm2.4-1.2.885-4.3h2.312l-2.815,4.3Z" transform="translate(-19.943 28.74)" fill="#fff"/>
<path id="Trazado_447" data-name="Trazado 447" d="M127.542-12.479l-.936,3.354-.114.767a.836.836,0,0,0,.356.751,2.3,2.3,0,0,0,1.223.235v.441h-4.42v-.441a1.653,1.653,0,0,0,1.3-.486,5.057,5.057,0,0,0,.819-1.9l4.189-14.953h.379l4.486,14.953a9.457,9.457,0,0,0,.617,1.65,1.236,1.236,0,0,0,.58.617,2.964,2.964,0,0,0,.968.118v.441h-5.571v-.441a2.016,2.016,0,0,0,1.062-.219.875.875,0,0,0,.316-.767,5.112,5.112,0,0,0-.239-1.153l-.9-2.968Zm3.819-.978-1.833-6.2h-.042l-1.677,6.2Z" transform="translate(-18.434 29.837)" fill="#fff"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 232 215"><defs><style>.b{fill:#fff;}</style></defs><path class="b" d="M0,78c2.81-7.78,7.01-14.18,15.65-16.48,3.13-.83,6.27-.68,9.41-.68,60.22-.02,120.45-.02,180.67-.02,15.84,0,20.88,3.49,26.27,18.18v73c-5.41,14.56-10.51,18.04-26.44,18.04-4.66,0-9.35,.27-13.98-.08-4.36-.33-6.11,.76-5.85,5.58,.44,8.3,.17,16.65,.11,24.97-.07,10.14-4.54,14.59-14.65,14.59-36.81,.01-73.61,.01-110.42,0-10.09,0-14.5-4.42-14.57-14.66-.06-8.83-.13-17.66,.05-26.48,.06-3.06-.91-4.07-3.97-3.94-5.15,.23-10.35-.25-15.48,.12-13.31,.97-22.45-4.25-26.79-17.15V78Zm116.05-4.91c-30.98,0-61.96-.01-92.94,.01-6.49,0-10.4,3.03-10.44,8.82-.17,22.32-.15,44.64-.01,66.96,.03,5.26,3.67,8.69,8.92,8.81,6.99,.16,13.99-.09,20.98,.09,2.94,.07,3.75-1.06,3.64-3.8-.17-4.16-.14-8.33-.02-12.49,.25-8.79,5.05-13.52,13.79-13.52,37.31-.03,74.62-.03,111.93,0,8.98,0,13.78,4.81,13.95,13.87,.08,4.16,.13,8.33-.02,12.49-.1,2.62,.9,3.48,3.48,3.43,6.33-.13,12.66,0,18.99-.05,7.98-.06,11.15-3.22,11.17-11.24,.03-20.65,.03-41.31,0-61.96-.01-8.34-3.13-11.42-11.46-11.42-30.65-.01-61.3,0-91.94,0Zm.45,67.23c-17.83,0-35.66,.07-53.49-.06-3.26-.02-4.25,.93-4.23,4.23,.15,17.99,.16,35.99,0,53.99-.03,3.5,.98,4.47,4.47,4.46,35.16-.12,70.32-.12,105.48,0,3.48,.01,4.51-.94,4.48-4.45-.17-17.83-.18-35.66,.01-53.49,.04-3.74-.97-4.81-4.73-4.76-17.33,.2-34.66,.09-51.99,.09Z"/><path class="b" d="M100.5-.11c16.66,0,33.33,.07,49.99-.05,4.08-.03,7.31,1.09,10.22,4.08,6.86,7.04,13.91,13.9,21.01,20.7,2.08,1.99,3.08,4.05,3,6.99-.19,6.66-.29,13.34,.03,19.99,.18,3.92-1.3,4.78-4.89,4.65-9.27-.34-7.61,.92-7.77-7.63-.13-7.23,.82-6.36-6.38-6.41-6.17-.04-12.34-.16-18.5,.05-3.17,.11-4.4-.73-4.28-4.14,.25-7.32-.04-14.66,.13-21.99,.07-2.9-.55-4.08-3.8-4.06-26.33,.13-52.66,.14-78.99,0-3.52-.02-4.1,1.37-4.07,4.42,.13,11.66-.09,23.33,.14,34.99,.07,3.71-.94,5.25-4.73,4.7-1.47-.22-3-.14-4.49-.02-2.32,.19-3.22-.65-3.21-3.09,.08-16.66,.12-33.33-.02-49.99-.03-3.4,1.86-3.2,4.13-3.19,17.5,.03,34.99,.01,52.49,.01Zm66.77,29.95c-3.73-3.93-7.46-7.87-11.57-12.22,0,3.46,0,6.69,0,9.92,0,1.66,.85,2.33,2.46,2.31,3.22-.04,6.44-.01,9.11-.01Z"/></svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

View File

@@ -0,0 +1,32 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="CarHor.aspx.vb" Async="true" Inherits="WebIntranet.CarHor" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<li id='PuestosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Puestos.aspx">Puestos</a></li>
<li id='VidaAdminBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/vidaAdministrativa.aspx">Vida administrativa</a></li>
<li id='GradoPersBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/gradoPersonal.aspx">Grado personal</a></li>
<li id='FormacionBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/formacion.aspx">Formación</a></li>
<li id='docenciaBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/docencia.aspx">Docencia</a></li>
<li id='IdiomasBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Idioma.aspx">Idiomas</a></li>
<li id='TrieniosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/trienios.aspx">Trienios</a></li>
<li id='CarreraHoriBL' class='obtListLat listActivo'><a onclick="redirigir()" href="/DatosAdministrativos/carHor.aspx">Carrera horizontal</a></li>
<li id='TitulacionAcaOfiBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/titulaciones.aspx">Titulación académica oficial</a></li>
</ul>
</div>
<div id="Puestos" class="col">
<p class="tituloMobile">Carrera horizontal</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li class="migaActiva">/ Carrera horizontal</li>
</ul>
</div>
<div style="margin-inline: 50px">
</div>
<div id="divTabla" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,24 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class CarHor
'''<summary>
'''Control divTabla.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTabla As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,42 @@
Imports System.Net.Http
Imports System.Net.Http.Headers
Imports WebIntranet.ClasesDatosAdmin
Public Class CarHor
Inherits System.Web.UI.Page
Protected Async Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
'If (Session("persona") Is Nothing) Then
' ("Default.aspx", False)
'Else
Dim token As String = Session("token")
Dim client As New HttpClient()
client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", token)
client.BaseAddress = New Uri(ConfigurationManager.AppSettings("SwaggerVB"))
Dim idPers = Session("persona").Personas(0).idPersona
Dim url As String = "/api/COMPLEMENTOSCARRERA/GruposEnumExtend/" & idPers
Dim puestosItems = Await UtilAntifraude.ObtenerObjeto(Of List(Of COMPLEMENTOSCARRERA))(client, url)
Dim htmlTabla = ""
If (puestosItems.Count > 0) Then
htmlTabla += "<table class='tablaPicadas'>" +
"<tr><th>Fecha inicio</th>" +
"<th>Fecha fin</th>" +
"<th>Grupo</th>" +
"<th>Tramo</th></tr>"
For Each itm As COMPLEMENTOSCARRERA In puestosItems
htmlTabla += "<tr>" +
"<td>" + If(itm.FECHAINICIO IsNot Nothing, itm.FECHAINICIO.ToString.Substring(0, 10), "") + "</td>" +
"<td>" + If(itm.FECHAFIN IsNot Nothing, itm.FECHAFIN.ToString.Substring(0, 10), "") + "</td>" +
"<td>" + itm.IDGRUPONavigation.GRUPO1 + "</td>" +
"<td>" + itm.IDTRAMONavigation.DESCRIPCION + "</td></tr>"
Next
htmlTabla += "</table>"
Else
htmlTabla += "<p style='color:red;font-weight:bold'>No se han encontrado resultados</p>"
End If
divTabla.InnerHtml = htmlTabla
End Sub
End Class

View File

@@ -0,0 +1,32 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="Formacion.aspx.vb" Async="true" Inherits="WebIntranet.Formacion" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<li id='PuestosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Puestos.aspx">Puestos</a></li>
<li id='VidaAdminBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/vidaAdministrativa.aspx">Vida administrativa</a></li>
<li id='GradoPersBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/gradoPersonal.aspx">Grado personal</a></li>
<li id='FormacionBL' class='obtListLat listActivo'><a onclick="redirigir()" href="/DatosAdministrativos/formacion.aspx">Formación</a></li>
<li id='docenciaBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/docencia.aspx">Docencia</a></li>
<li id='IdiomasBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Idioma.aspx">Idiomas</a></li>
<li id='TrieniosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/trienios.aspx">Trienios</a></li>
<li id='CarreraHoriBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/carHor.aspx">Carrera horizontal</a></li>
<li id='TitulacionAcaOfiBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/titulaciones.aspx">Titulación académica oficial</a></li>
</ul>
</div>
<div id="Puestos" class="col">
<p class="tituloMobile">Formación</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li class="migaActiva">/ Formación</li>
</ul>
</div>
<div style="margin-inline: 50px">
</div>
<div id="divTabla" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,24 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class Formacion
'''<summary>
'''Control divTabla.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTabla As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,56 @@
Imports Newtonsoft.Json
Imports System.Net.Http
Imports System.Net.Http.Headers
Imports WebIntranet.ClasesDatosAdmin
Public Class Formacion
Inherits System.Web.UI.Page
Protected Async Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Dim vidaAdministrativaItems As New List(Of WebIntranet.ClasesDatosAdmin.FORMACION)
Dim TiposActos As New List(Of TIPOAPTOSADMINISTRATIVOS)
Dim token As String = Session("token")
Dim client As New HttpClient()
client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", token)
client.BaseAddress = New Uri(ConfigurationManager.AppSettings("SwaggerVB"))
Dim idPers = Session("persona").Personas(0).idPersona
Dim response = Await client.GetAsync("/api/FORMACION/formacionespersona/" + idPers.ToString)
If response.IsSuccessStatusCode Then
Dim resultContent = Await response.Content.ReadAsStringAsync()
vidaAdministrativaItems = If(JsonConvert.DeserializeObject(Of List(Of WebIntranet.ClasesDatosAdmin.FORMACION))(resultContent), New List(Of WebIntranet.ClasesDatosAdmin.FORMACION)())
vidaAdministrativaItems = vidaAdministrativaItems.ToList()
Else
Console.WriteLine($"Error al cargar Vida Administrativa: {response.StatusCode}")
End If
Dim htmlTabla = ""
If vidaAdministrativaItems.Count > 0 Then
htmlTabla += "<table class='tablaPicadas'>" +
"<tr><th>Nombre curso</th>" +
"<th>Nombre</th>" +
"<th>Fecha expedición</th>" +
"<th>Duración</th>" +
"<th>Aprovechamiento</th>" +
"<th>Oficial</th></tr>"
For Each itm As WebIntranet.ClasesDatosAdmin.FORMACION In vidaAdministrativaItems
'/fichero.aspx?id=" + linAd.IDLINEAVIDAADMIN.ToString() + "&cl=" + tsl5.crypt.SHA1("M3Soft." & linAd.IDLINEAVIDAADMIN.ToString) + "&t=LINEAVIDAADMINISTRATIVA
Dim urlFich = "/fichero.aspx?id=" + itm.IDFORMACION.ToString() + "&cl=" + tsl5.crypt.SHA1("M3Soft." & itm.IDFORMACION.ToString) + "&t=FORMACION"
'Dim urlFich = "/Ficheros?tip=VerFrm&id=" + itm.ToString()
htmlTabla += "<tr>"
htmlTabla += "<td>" + If(itm.RUTA IsNot Nothing, "<a href='" + urlFich + "' target='_blank'>" + itm.NOMBRE_CURSO + "</a>", itm.NOMBRE_CURSO) + "</td>"
htmlTabla += "<td>" + itm.CENTRO + "</td>"
htmlTabla += "<td>" + If(itm.FECHA_EXPEDICION IsNot Nothing, itm.FECHA_EXPEDICION.ToString.Substring(0, 10), "") + "</td>"
htmlTabla += "<td style='text-align:center'>" + itm.DURACION.ToString() + "</td>"
htmlTabla += "<td style='text-align:center'>" + If(itm.APROVECHAMIENTO = True, "<i class=""fa fa-check""></i>", "") + "</td>"
htmlTabla += "<td style='text-align:center'>" + If(itm.OFICIAL = True, "<i class=""fa fa-check""></i>", "") + "</td>"
Next
htmlTabla += "</table>"
Else
htmlTabla += "<p style='color:red;font-weight:bold'>No se han encontrado resultados</p>"
End If
divTabla.InnerHtml = htmlTabla
End Sub
End Class

View File

@@ -0,0 +1,33 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="GradoPersonal.aspx.vb" Async="true" Inherits="WebIntranet.GradoPersonal" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<li id='PuestosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Puestos.aspx">Puestos</a></li>
<li id='VidaAdminBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/vidaAdministrativa.aspx">Vida administrativa</a></li>
<li id='GradoPersBL' class='obtListLat listActivo'><a onclick="redirigir()" href="/DatosAdministrativos/gradoPersonal.aspx">Grado personal</a></li>
<li id='FormacionBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/formacion.aspx">Formación</a></li>
<li id='docenciaBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/docencia.aspx">Docencia</a></li>
<li id='IdiomasBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Idioma.aspx">Idiomas</a></li>
<li id='TrieniosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/trienios.aspx">Trienios</a></li>
<li id='CarreraHoriBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/carHor.aspx">Carrera horizontal</a></li>
<li id='TitulacionAcaOfiBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/titulaciones.aspx">Titulación académica oficial</a></li>
</ul>
</div>
<div id="Puestos" class="col">
<p class="tituloMobile">Grado personal</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li class="migaActiva">/ Grado personal</li>
</ul>
</div>
<div style="margin-inline: 50px">
</div>
<div id="divTabla" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,24 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class GradoPersonal
'''<summary>
'''Control divTabla.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTabla As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,32 @@
Imports System.Net.Http
Imports System.Net.Http.Headers
Imports WebIntranet.ClasesDatosAdmin
Public Class GradoPersonal
Inherits System.Web.UI.Page
Protected Async Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Dim token As String = Session("token")
Dim client As New HttpClient()
client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", token)
client.BaseAddress = New Uri(ConfigurationManager.AppSettings("SwaggerVB"))
Dim idPers = Session("persona").Personas(0).idPersona
Dim url As String = "/api/CONSOLIDACION_GRADO/GetWithIncludes/" & idPers
Dim puestosItems = Await UtilAntifraude.ObtenerObjeto(Of List(Of CONSOLIDACION_GRADO))(client, url)
Dim htmlTabla = ""
htmlTabla += "<table class='tablaPicadas'>" +
"<tr><th>Nivel</th>" +
"<th>Fecha efecto</th>" +
"<th>Fecha resolución</th></tr>"
For Each itm As CONSOLIDACION_GRADO In puestosItems
htmlTabla += "<tr>" +
"<td>" + itm.IDNIVELNavigation.DESCRIPCION + "</td>" +
"<td>" + If(itm.FECHA_EFECTO IsNot Nothing, itm.FECHA_EFECTO.ToString.Substring(0, 10), "") + "</td>" +
"<td>" + If(itm.FECHA_RESOLUCION IsNot Nothing, itm.FECHA_RESOLUCION.ToString.Substring(0, 10), "") + "</td></tr>"
Next
htmlTabla += "</table>"
divTabla.InnerHtml = htmlTabla
End Sub
End Class

View File

@@ -0,0 +1,34 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="Idioma.aspx.vb" Async="true" Inherits="WebIntranet.Idioma" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<li id='PuestosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Puestos.aspx">Puestos</a></li>
<li id='VidaAdminBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/vidaAdministrativa.aspx">Vida administrativa</a></li>
<li id='GradoPersBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/gradoPersonal.aspx">Grado personal</a></li>
<li id='FormacionBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/formacion.aspx">Formación</a></li>
<li id='docenciaBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/docencia.aspx">Docencia</a></li>
<li id='IdiomasBL' class='obtListLat listActivo'><a onclick="redirigir()" href="/DatosAdministrativos/Idioma.aspx">Idiomas</a></li>
<li id='TrieniosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/trienios.aspx">Trienios</a></li>
<li id='CarreraHoriBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/carHor.aspx">Carrera horizontal</a></li>
<li id='TitulacionAcaOfiBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/titulaciones.aspx">Titulación académica oficial</a></li>
</ul>
</div>
<div id="Puestos" class="col">
<p class="tituloMobile">Idiomas</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li class="migaActiva">/ Idiomas</li>
</ul>
</div>
<div style="margin-inline: 50px">
</div>
<div id="divTabla" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,24 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class Idioma
'''<summary>
'''Control divTabla.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTabla As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,43 @@
Imports System.Net.Http
Imports System.Net.Http.Headers
Imports WebIntranet.ClasesDatosAdmin
Public Class Idioma
Inherits System.Web.UI.Page
Protected Async Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
'If (Session("persona") Is Nothing) Then
' ("Default.aspx", False)
'Else
Dim token As String = Session("token")
Dim client As New HttpClient()
client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", token)
client.BaseAddress = New Uri(ConfigurationManager.AppSettings("SwaggerVB"))
Dim idPers = Session("persona").Personas(0).idPersona
Dim url As String = "/api/IDIOMAS/GetWithIncludes/" & idPers
Dim puestosItems = Await UtilAntifraude.ObtenerObjeto(Of List(Of IDIOMAS))(client, url)
Dim htmlTabla = ""
If (puestosItems.Count > 0) Then
htmlTabla += "<table class='tablaPicadas'>" +
"<tr><th>Idioma</th>" +
"<th>Nivel</th>" +
"<th>Centro de expedición</th>" +
"<th>Año</th></tr>"
For Each itm As IDIOMAS In puestosItems
htmlTabla += "<tr>" +
"<td>" + itm.IDTIPOIDIOMANavigation?.DESCRIPCION + "</td>" +
"<td>" + itm.IDNIVELNavigation.DESCRIPCION + "</td>" +
"<td>" + itm.CENTROEXPEDICION + "</td>" +
"<td>" + itm.ANNO.ToString + "</td></tr>"
Next
htmlTabla += "</table>"
Else
htmlTabla += "<p style='color:red;font-weight:bold'>No se han encontrado resultados</p>"
End If
divTabla.InnerHtml = htmlTabla
'End If
End Sub
End Class

View File

@@ -0,0 +1,33 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="Puestos.aspx.vb" Async="true" Inherits="WebIntranet.Puestos" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<li id='PuestosBL' class='obtListLat listActivo'><a onclick="redirigir()" href="/DatosAdministrativos/Puestos.aspx">Puestos</a></li>
<li id='VidaAdminBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/vidaAdministrativa.aspx">Vida administrativa</a></li>
<li id='GradoPersBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/gradoPersonal.aspx">Grado personal</a></li>
<li id='FormacionBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/formacion.aspx">Formación</a></li>
<li id='docenciaBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/docencia.aspx">Docencia</a></li>
<li id='IdiomasBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Idioma.aspx">Idiomas</a></li>
<li id='TrieniosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/trienios.aspx">Trienios</a></li>
<li id='CarreraHoriBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/carHor.aspx">Carrera horizontal</a></li>
<li id='TitulacionAcaOfiBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/titulaciones.aspx">Titulación académica oficial</a></li>
</ul>
</div>
<div id="Puestos" class="col">
<p class="tituloMobile">Puestos</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li class="migaActiva">/ Puestos</li>
</ul>
</div>
<div style="margin-inline: 50px">
</div>
<div id="divTablaPuestos" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,24 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class Puestos
'''<summary>
'''Control divTablaPuestos.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTablaPuestos As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,60 @@
Imports System.Net.Http
Imports System.Net.Http.Headers
Imports WebIntranet.ClasesDatosAdmin
Public Class Puestos
Inherits System.Web.UI.Page
Protected Async Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
'If (Session("persona") Is Nothing) Then
' Response.Redirect("~/Default.aspx", False)
'Else
Dim token As String = Session("token")
Dim client As New HttpClient()
client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", token)
client.BaseAddress = New Uri(ConfigurationManager.AppSettings("SwaggerVB"))
Dim idPers = Session("persona").Personas(0).idPersona
Dim url As String = "/api/VIDA_ADMINISTRATIVA/puestospersona/" & idPers
Dim puestosItems = Await UtilAntifraude.ObtenerObjeto(Of List(Of PuestoPersona))(client, url)
Dim htmlTabla = ""
If (puestosItems.Count > 0) Then
htmlTabla += "<table class='tablaPicadas'>" +
"<tr><th>Puesto de trabajo</th>" +
"<th>Nivel</th>" +
"<th>Clase personal</th>" +
"<th>Grupo</th>" +
"<th>Fecha inicio</th>" +
"<th>Fecha fin</th>" +
"<th>Caracter Ocupación</th>" +
"<th>Años</th>" +
"<th>Meses</th>" +
"<th>Días</th></tr>"
For Each itm As PuestoPersona In puestosItems
htmlTabla += "<tr>" +
"<td>" + itm.Puesto + "</td>" +
"<td>" + itm.Nivel + "</td>" +
"<td>" + itm.Adscripcion + "</td>" +
"<td>" + itm.Grupo + "</td>" +
"<td>" + If(Not itm.FechaToPo = Nothing, itm.FechaToPo.ToString("dd/MM/yyyy"), "") + "</td>" +
"<td>" + If(Not itm.FechaCese = Nothing, itm.FechaCese.ToString("dd/MM/yyyy"), "") + "</td>" +
"<td>" + itm.CaracterOcu + "</td>" +
"<td>" + itm.AnosSer.ToString + "</td>" +
"<td>" + itm.MesesSer.ToString + "</td>" +
"<td>" + itm.DiasSer.ToString + "</td></tr>"
Next
htmlTabla += "</table>"
Else
htmlTabla += "<p style='color:red;font-weight:bold'>No se han encontrado resultados</p>"
End If
divTablaPuestos.InnerHtml = htmlTabla
'End If
End Sub
End Class

View File

@@ -0,0 +1,33 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="VidaAdministrativa.aspx.vb" Async="true" Inherits="WebIntranet.VidaAdministrativa" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<li id='PuestosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Puestos.aspx">Puestos</a></li>
<li id='VidaAdminBL' class='obtListLat listActivo'><a onclick="redirigir()" href="/DatosAdministrativos/vidaAdministrativa.aspx">Vida administrativa</a></li>
<li id='GradoPersBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/gradoPersonal.aspx">Grado personal</a></li>
<li id='FormacionBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/formacion.aspx">Formación</a></li>
<li id='docenciaBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/docencia.aspx">Docencia</a></li>
<li id='IdiomasBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Idioma.aspx">Idiomas</a></li>
<li id='TrieniosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/trienios.aspx">Trienios</a></li>
<li id='CarreraHoriBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/carHor.aspx">Carrera horizontal</a></li>
<li id='TitulacionAcaOfiBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/titulaciones.aspx">Titulación académica oficial</a></li>
</ul>
</div>
<div id="Puestos" class="col">
<p class="tituloMobile">Vida administrativa</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li class="migaActiva">/ Vida administrativa</li>
</ul>
</div>
<div style="margin-inline: 50px">
</div>
<div id="divTabla" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,24 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class VidaAdministrativa
'''<summary>
'''Control divTabla.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTabla As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,94 @@
Imports System.Linq.Expressions
Imports System.Net.Http
Imports System.Net.Http.Headers
Imports Newtonsoft.Json
Imports WebIntranet.ClasesDatosAdmin
Imports Serialize.Linq.Serializers
Imports Serialize.Linq.Expressions
Imports Serialize.Linq.Interfaces
Imports Serialize.Linq.Factories
Public Class VidaAdministrativa
Inherits System.Web.UI.Page
Protected Async Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Dim vidaAdministrativaItems As New List(Of VIDA_ADMINISTRATIVA)
Dim TiposActos As New List(Of TIPOAPTOSADMINISTRATIVOS)
Dim token As String = Session("token")
Dim client As New HttpClient()
client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", token)
client.BaseAddress = New Uri(ConfigurationManager.AppSettings("SwaggerVB"))
Dim idPers = Session("persona").Personas(0).idPersona
Dim response = Await client.GetAsync("/api/VIDA_ADMINISTRATIVA/vidaspersona/" + idPers.ToString)
If response.IsSuccessStatusCode Then
Dim resultContent = Await response.Content.ReadAsStringAsync()
vidaAdministrativaItems = If(JsonConvert.DeserializeObject(Of List(Of VIDA_ADMINISTRATIVA))(resultContent), New List(Of VIDA_ADMINISTRATIVA)())
vidaAdministrativaItems = vidaAdministrativaItems.OrderByDescending(Function(x) x.FECHA).ThenBy(Function(x) x.NUM_REG).ThenBy(Function(x) x.IDMOTIVONavigation?.IDTIPOAPTOSNavigation?.DESCRIPCION).ToList()
Else
Console.WriteLine($"Error al cargar Vida Administrativa: {response.StatusCode}")
End If
Dim TiApAd = Await client.GetAsync("/api/TIPOAPTOSADMINISTRATIVOS")
Dim TiApAdContent = Await TiApAd.Content.ReadAsStringAsync()
If TiApAd.IsSuccessStatusCode Then
TiposActos = If(JsonConvert.DeserializeObject(Of List(Of TIPOAPTOSADMINISTRATIVOS))(TiApAdContent), New List(Of TIPOAPTOSADMINISTRATIVOS)())
End If
TiposActos = If(TiposActos?.OrderBy(Function(x) x.DESCRIPCION).ToList(), New List(Of TIPOAPTOSADMINISTRATIVOS)())
Dim htmlTabla = ""
If vidaAdministrativaItems.Count > 0 Then
htmlTabla += "<table class='tablaPicadas'>" +
"<tr><th>Tiene documentos</th>" +
"<th>Actos administrativos</th>" +
"<th>Departamento</th>" +
"<th>Causa</th>" +
"<th>Observaciones</th>" +
"<th>Descripción</th>" +
"<th>Fecha efecto</th>" +
"<th>Fecha resolución</th>" +
"<th>Caracter ocupación</th></tr>"
For Each itm As VIDA_ADMINISTRATIVA In vidaAdministrativaItems
Dim descActo = TiposActos.FirstOrDefault(Function(x) x.IDTIPO = itm.IDMOTIVONavigation.IDTIPOAPTOS).DESCRIPCION
Dim linkVidaAd = "/DatosAdministrativos/desgVidaAdministrativa.aspx?idVi=" + itm.IDVIDA.ToString().Trim() + "&cl=" + tsl5.crypt.SHA1("M3Soft." & itm.IDVIDA)
htmlTabla += "<tr>"
htmlTabla += "<td>" + If(itm.TIENELINEAS = True, "<i class=""fa fa-check""></i>", "") + "</td>"
htmlTabla += "<td>" + "<a href='" + linkVidaAd + "'>" + descActo + "</td>"
htmlTabla += "<td>" + If(itm.IDPUESTONavigation?.IDRPTDESNavigation?.IDDEPARTAMENTONavigation?.DESCRIPCION IsNot Nothing, itm.IDPUESTONavigation?.IDRPTDESNavigation?.IDDEPARTAMENTONavigation?.DESCRIPCION, "") + "</td>"
htmlTabla += "<td></td>"
htmlTabla += "<td>" + If(itm.OBSERVACIONES IsNot Nothing, itm.OBSERVACIONES, "") + "</td>"
htmlTabla += "<td></td>"
htmlTabla += "<td>" + If(itm.FECHA IsNot Nothing, itm.FECHA.ToString.Substring(0, 10), "") + "</td>"
htmlTabla += "<td>" + If(itm.FECHARESOLUCION IsNot Nothing, itm.FECHARESOLUCION.ToString.Substring(0, 10), "") + "</td>"
htmlTabla += "<td>" + If(itm.OCUPACION_OLDNavigation?.DESCRIPCION IsNot Nothing, itm.OCUPACION_OLDNavigation.DESCRIPCION, "") + "</td></tr>"
Next
htmlTabla += "</table>"
Else
htmlTabla += "<p style='color:red;font-weight:bold'>No se han encontrado resultados</p>"
End If
divTabla.InnerHtml = htmlTabla
End Sub
Private Function CustomTypeResolver(typeName As String) As FactorySettings
If typeName <> "Microsoft.VisualBasic.CompilerServices.Operators" Then
Return Nothing
End If
Return Nothing
End Function
'Private Function genrarlink(idvida As Integer, idpersonas As Integer) As String
'End Function
End Class
Public Class CustomTypeResolver
Public Function Resolve(typeName As String) As Type
If typeName = "Microsoft.VisualBasic.CompilerServices.Operators" Then
Return Nothing
End If
Return Type.GetType(typeName)
End Function
End Class

View File

@@ -0,0 +1,50 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="desgVidaAdministrativa.aspx.vb" Async="true" Inherits="WebIntranet.desgVidaAdministrativa" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="infoVidaAdministrativa" class="col">
<p class="tituloMobile">Info vida administrativa</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li><a onclick="redirigir()" href="vidaAdministrativa.aspx">/ Vida administrativa</a></li>
<li class="migaActiva">/ Info vida administrativa</li>
</ul>
</div>
<div style="margin-inline: 50px">
<div class="row">
<div class="col-md-4">
<p class="labelPar">Acto administrativo</p>
<input class="selectInHora" runat="server" type="text" readonly="true" id="actAdmVA" />
</div>
<div class="col-md-4">
<p class="labelPar">Causa</p>
<input class="selectInHora" runat="server" type="text" readonly="true" id="CausaVA" />
</div>
<div class="col-md-2">
<p class="labelPar">Fecha de efecto</p>
<input class="selectInHora" runat="server" type="text" readonly="true" id="fechaEfcVA" />
</div>
<div class="col-md-2">
<p class="labelPar">Fecha de resolución</p>
<input class="selectInHora" runat="server" type="text" readonly="true" id="fechaResVA" />
</div>
<div class="col-md-4">
<p class="labelPar">NRP</p>
<input class="selectInHora" runat="server" type="text" readonly="true" id="NRPVA" />
</div>
<div class="col-md-4">
<p class="labelPar">Puesto</p>
<input class="selectInHora" runat="server" type="text" readonly="true" id="PuestoVA" />
</div>
<div class="col-md-4">
<p class="labelPar">Observaciones</p>
<input class="selectInHora" runat="server" type="text" readonly="true" id="ObservacionesVA" />
</div>
</div>
</div>
<div id="divTablaLiViAd" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,87 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class desgVidaAdministrativa
'''<summary>
'''Control actAdmVA.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents actAdmVA As Global.System.Web.UI.HtmlControls.HtmlInputText
'''<summary>
'''Control CausaVA.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents CausaVA As Global.System.Web.UI.HtmlControls.HtmlInputText
'''<summary>
'''Control fechaEfcVA.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents fechaEfcVA As Global.System.Web.UI.HtmlControls.HtmlInputText
'''<summary>
'''Control fechaResVA.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents fechaResVA As Global.System.Web.UI.HtmlControls.HtmlInputText
'''<summary>
'''Control NRPVA.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents NRPVA As Global.System.Web.UI.HtmlControls.HtmlInputText
'''<summary>
'''Control PuestoVA.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents PuestoVA As Global.System.Web.UI.HtmlControls.HtmlInputText
'''<summary>
'''Control ObservacionesVA.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents ObservacionesVA As Global.System.Web.UI.HtmlControls.HtmlInputText
'''<summary>
'''Control divTablaLiViAd.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTablaLiViAd As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

View File

@@ -0,0 +1,96 @@
Imports System.Linq.Expressions
Imports System.Net.Http
Imports System.Net.Http.Headers
Imports Newtonsoft.Json
Imports Serialize.Linq.Serializers
Imports WebIntranet.ClasesDatosAdmin
Public Class desgVidaAdministrativa
Inherits System.Web.UI.Page
Protected Async Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
If Session("Persona") Is Nothing Then
Response.Redirect("default.aspx")
End If
Dim sessionUsuario As String = Session("usuario")
Dim idVidaAd = Request.QueryString("idVi")
'Session.Add("idVi", idVidaAd)
Dim cl = Request.QueryString("cl")
Dim sCl2 = tsl5.crypt.SHA1("M3Soft." & idVidaAd.ToString)
If sCl2 <> cl Then
Response.Redirect("/default.aspx", False)
Else
Dim client As New HttpClient()
Dim token As String = Session("token")
client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", token)
client.BaseAddress = New Uri(ConfigurationManager.AppSettings("SwaggerVB"))
Dim VidaAdministrativaEnlazada As VIDA_ADMINISTRATIVA
Dim response = Await client.GetAsync("/api/VIDA_ADMINISTRATIVA/" + idVidaAd.ToString())
Dim responseContent = Await response.Content.ReadAsStringAsync()
VidaAdministrativaEnlazada = If(JsonConvert.DeserializeObject(Of VIDA_ADMINISTRATIVA)(responseContent), New VIDA_ADMINISTRATIVA())
' Dim serializer = New ExpressionSerializer(New Serialize.Linq.Serializers.JsonSerializer())
' Dim IDVIDA As Integer = VidaAdministrativaEnlazada.IDVIDA
' Dim filtroPue As Expression(Of Func(Of LINEASVIDAADMINISTRATIVA, Boolean)) = Function(x) x.IDVIDAADMIN = IDVIDA
'Dim PueExpression = serializer.SerializeText(filtroPue)
'Dim PuejsonContent = JsonConvert.SerializeObject(New With {
' .Expression = PueExpression})
'Dim Puecontent = New StringContent(PuejsonContent, Encoding.UTF8, "application/json")
Dim lineasVidaAdministrativaEnlazada As List(Of LINEASVIDAADMINISTRATIVA)
Dim response1 = Await client.GetAsync("/api/LINEASVIDAADMINISTRATIVA/LineasVidaAdminGridbyId/" + idVidaAd)
Dim responseContent1 = Await response1.Content.ReadAsStringAsync()
lineasVidaAdministrativaEnlazada = If(JsonConvert.DeserializeObject(Of List(Of LINEASVIDAADMINISTRATIVA))(responseContent1), New List(Of LINEASVIDAADMINISTRATIVA)())
actAdmVA.Value = VidaAdministrativaEnlazada.IDMOTIVONavigation.DESCRIPCION.Trim()
CausaVA.Value = VidaAdministrativaEnlazada.IDMOTIVONavigation.DESCRIPCION
'If VidaAdministrativaEnlazada.FECHA IsNot Nothing Then
'End If
fechaEfcVA.Value = If(VidaAdministrativaEnlazada.FECHA.HasValue, CDate(VidaAdministrativaEnlazada.FECHA).ToString("dd/MM/yyyy"), "")
fechaResVA.Value = If(VidaAdministrativaEnlazada.FECHARESOLUCION.HasValue, CDate(VidaAdministrativaEnlazada.FECHARESOLUCION).ToString("dd/MM/yyyy"), "")
NRPVA.Value = VidaAdministrativaEnlazada.NRP
PuestoVA.Value = VidaAdministrativaEnlazada.IDPUESTONavigation?.DESPUESCOM
ObservacionesVA.Value = VidaAdministrativaEnlazada.OBSERVACIONES
Dim htmlTabla = ""
htmlTabla += "<table class='tablaPicadas'><tr>" +
"<th>Código</th>" +
"<th>Descripción</th>" +
"<th>Tipo Documento</th>" +
"<th>Fecha</th>" +
"<th>Fichero</th>" +
"</tr>"
For Each linAd As LINEASVIDAADMINISTRATIVA In lineasVidaAdministrativaEnlazada
htmlTabla += "<tr>" +
"<td>" + linAd.IDLINEAVIDAADMIN.ToString + "</td>" +
"<td>" + linAd.DESCRIPCION + "</td>" +
"<td>" + linAd.IDTIPONavigation?.DESCRIPCION + "</td>" +
"<td>" + CDate(linAd.FECHASUBIDA).ToString("dd/MM/yyyy") + "</td>"
Dim ruta = "/fichero.aspx?id=" + linAd.IDLINEAVIDAADMIN.ToString() + "&cl=" + tsl5.crypt.SHA1("M3Soft." & linAd.IDLINEAVIDAADMIN.ToString) + "&t=LINEAVIDAADMINISTRATIVA"
If linAd.RUTA IsNot Nothing Then
htmlTabla += "<td><a href='" + ruta + "' style='color:blue;cursor:pointer' target='_blanck'>Visualizar</a></td>" +
"</tr>"
Else
htmlTabla += "<td></td>" +
"</tr>"
End If
Next
htmlTabla += "</table>"
divTablaLiViAd.InnerHtml = htmlTabla
End If
End Sub
End Class

View File

@@ -0,0 +1,32 @@
<%@ Page Title="" Language="vb" AutoEventWireup="false" MasterPageFile="~/Site.master" CodeBehind="docencia.aspx.vb" Inherits="WebIntranet.docencia" Async="true" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Content" runat="server">
<div class="row pag">
<div id="navLateral" class="col-3">
<ul>
<li id='PuestosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Puestos.aspx">Puestos</a></li>
<li id='VidaAdminBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/vidaAdministrativa.aspx">Vida administrativa</a></li>
<li id='GradoPersBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/gradoPersonal.aspx">Grado personal</a></li>
<li id='FormacionBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/formacion.aspx">Formación</a></li>
<li id='docenciaBL' class='obtListLat listActivo'><a onclick="redirigir()" href="/DatosAdministrativos/docencia.aspx">Docencia</a></li>
<li id='IdiomasBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/Idioma.aspx">Idiomas</a></li>
<li id='TrieniosBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/trienios.aspx">Trienios</a></li>
<li id='CarreraHoriBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/carHor.aspx">Carrera horizontal</a></li>
<li id='TitulacionAcaOfiBL' class='obtListLat'><a onclick="redirigir()" href="/DatosAdministrativos/titulaciones.aspx">Titulación académica oficial</a></li>
</ul>
</div>
<div id="Puestos" class="col">
<p class="tituloMobile">Formación</p>
<div class="migasDePan">
<ul>
<li class="migaActiva">/ Datos administrativos</li>
<li class="migaActiva">/ Docencia</li>
</ul>
</div>
<div style="margin-inline: 50px">
</div>
<div id="divTabla" runat="server" class="mt-4 divTablas"></div>
</div>
</div>
</asp:Content>

View File

@@ -0,0 +1,24 @@
'------------------------------------------------------------------------------
' <generado automáticamente>
' Este código fue generado por una herramienta.
'
' Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
' se vuelve a generar el código.
' </generado automáticamente>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Partial Public Class docencia
'''<summary>
'''Control divTabla.
'''</summary>
'''<remarks>
'''Campo generado automáticamente.
'''Para modificarlo, mueva la declaración del campo del archivo del diseñador al archivo de código subyacente.
'''</remarks>
Protected WithEvents divTabla As Global.System.Web.UI.HtmlControls.HtmlGenericControl
End Class

Some files were not shown because too many files have changed in this diff Show More