diff --git a/app/Resources/views/cea/solicitudes_mostar.html.twig b/app/Resources/views/cea/solicitudes_mostar.html.twig index 733a63b..1a13501 100644 --- a/app/Resources/views/cea/solicitudes_mostar.html.twig +++ b/app/Resources/views/cea/solicitudes_mostar.html.twig @@ -32,11 +32,7 @@
- {% if adscripcion.oposicion is null %} -
-

El Docente al momento de la solicitud informa no haber realizado Concurso de oposición

-
- {% endif %} +
@@ -67,8 +63,18 @@ {%endfor %} + {% if adscripcion.oposicion is null %} +
+
El Docente al momento de la solicitud informa no haber realizado Concurso de oposición
+
+ + {% endif %} + {% if ascenso is not null %} + + + {% endif %} -
+
{% endif %} diff --git a/src/AppBundle/Controller/AdscripcionController.php b/src/AppBundle/Controller/AdscripcionController.php index 8ac1103..715aa2d 100644 --- a/src/AppBundle/Controller/AdscripcionController.php +++ b/src/AppBundle/Controller/AdscripcionController.php @@ -360,13 +360,18 @@ class AdscripcionController extends Controller $adscripcion = $this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findOneByIdRolInstitucion($servicio->getIdRolInstitucion()); $pida = $this->getDoctrine()->getRepository('AppBundle:AdscripcionPida')->findOneByIdRolInstitucion($servicio->getIdRolInstitucion()); + $ascenso = $this->getDoctrine()->getRepository('AppBundle:Ascenso')->findOneBy(array( + 'idRolInstitucion' => $servicio->getIdRolInstitucion(), + + )); return $this->render('cea/solicitudes_mostar.html.twig', array( 'adscripcion' => $adscripcion, 'servicio' => $servicio, 'escalas' => $escala, 'servicio' => $servicio, - 'pida' => $pida + 'pida' => $pida, + 'ascenso' => $ascenso )); } diff --git a/src/AppBundle/Controller/AscensoController.php b/src/AppBundle/Controller/AscensoController.php index 9b44913..570b3bb 100644 --- a/src/AppBundle/Controller/AscensoController.php +++ b/src/AppBundle/Controller/AscensoController.php @@ -229,6 +229,7 @@ class AscensoController extends Controller 'idServicioCe' => 5 )); + $user = $this->getDoctrine()->getRepository('AppBundle:Usuarios')->findOneByIdRolInstitucion($ascenso->getIdRolInstitucion()); if($estatus == "true") { @@ -237,9 +238,12 @@ class AscensoController extends Controller }else{ $serviciosAscenso->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(3)); } + + $ascenso->setIdEstatus($serviciosAscenso->getIdEstatus()); $em = $this->getDoctrine()->getManager(); $em->persist($serviciosAscenso); + $em->persist($ascenso); $em->flush(); $message = \Swift_Message::newInstance()