diff --git a/app/Resources/views/cea/servicios_mostar.html.twig b/app/Resources/views/cea/servicios_mostar.html.twig index 79ed50c..3d07ee4 100644 --- a/app/Resources/views/cea/servicios_mostar.html.twig +++ b/app/Resources/views/cea/servicios_mostar.html.twig @@ -113,13 +113,13 @@
{% if servicio.idEstatus.id == 1 %} -

Estatus {{servicio.idEstatus}} +

Estatus {{servicio.idEstatus}}

{% elseif servicio.idEstatus.id == 3 %} -

Estatus {{servicio.idEstatus}} +

Estatus {{servicio.idEstatus}}

{% else %} -

Estatus {{servicio.idEstatus}} +

Estatus {{servicio.idEstatus}}

{% endif %} - +
@@ -131,9 +131,7 @@ -
- -
+
@@ -166,12 +164,16 @@
- {% endif %} - - + {% endif %} -  Aprobar -  Rechazar + + + {% if servicio.idEstatus.id == 3 %} + + {% elseif servicio.idEstatus.id == 2 %} + +  Rechazar + {% endif %} @@ -208,20 +210,27 @@
{% if servicio.idServicioCe.id == 1 %}
-

Documentos Para confirmar

+

Documentos Para confirmar

{% for documento in docente.documentosVerificados %} {% if documento.idTipoDocumentos.identificador == "trabajo" or documento.idTipoDocumentos.identificador == "oposicion" %} -
+ {% set extension = documento.ubicacion | split('.') | last %} +
- - - + + {% if extension != "pdf" %} + + + + {% else %} + + {% endif %}

{{ documento.idTipoDocumentos.nombre }}

+ {% if documento.idEstatus.id == 2 or documento.idEstatus.id == 3 %}
@@ -238,6 +247,7 @@
+ {% endif %}
@@ -260,4 +270,20 @@ {% block javascripts %} {{ parent() }} + {% endblock %} \ No newline at end of file diff --git a/app/Resources/views/cea/solicitudes_mostar.html.twig b/app/Resources/views/cea/solicitudes_mostar.html.twig index d8e10db..7db73a8 100644 --- a/app/Resources/views/cea/solicitudes_mostar.html.twig +++ b/app/Resources/views/cea/solicitudes_mostar.html.twig @@ -285,10 +285,10 @@
{% endif %} {% if servicio.idEstatus.id == 3 %} - + {% elseif servicio.idEstatus.id == 2 %} - - Rechazar + + Rechazar {% endif %} diff --git a/src/AppBundle/Controller/AppController.php b/src/AppBundle/Controller/AppController.php index 84875b4..7afc6bf 100644 --- a/src/AppBundle/Controller/AppController.php +++ b/src/AppBundle/Controller/AppController.php @@ -272,6 +272,7 @@ class AppController extends Controller { $ea = $this->getDoctrine()->getRepository('AppBundle:EstadoAcademico')->findOneByIdDocenteServicio($servicios); return $this->render('cea/servicios_mostar.html.twig', array( 'servicio' => $servicios, + 'docente' => $servicios->getIdRolInstitucion(), 'oposicion' => $escala, 'adscripcion' => $adscripcion, 'estado_academico' => $ea