From 23e6829c78a005c1257f0f510803bea06ca3513a Mon Sep 17 00:00:00 2001
From: Wilmer <wilmer.ramones@gmail.com>
Date: Mon, 13 Mar 2017 09:34:05 -0400
Subject: [PATCH] =?UTF-8?q?a=C3=B1adido=20el=20rechazo=20de=20la=20solicit?=
 =?UTF-8?q?ud=20de=20reconocimiento=20de=20escala=20junto=20con=20su=20nue?=
 =?UTF-8?q?va=20subida=20de=20documento?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Resources/views/cea/reconocimiento_escala_mostrar.html.twig | 2 +-
 app/Resources/views/solicitudes/index.html.twig                 | 4 ++++
 src/AppBundle/Controller/AscensoController.php                  | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Resources/views/cea/reconocimiento_escala_mostrar.html.twig b/app/Resources/views/cea/reconocimiento_escala_mostrar.html.twig
index 812d1f1..893d94e 100644
--- a/app/Resources/views/cea/reconocimiento_escala_mostrar.html.twig
+++ b/app/Resources/views/cea/reconocimiento_escala_mostrar.html.twig
@@ -158,7 +158,7 @@
                         </div>
                         {% endif %}
 
-       {% if servicio.idEstatus.id == 2 %}
+       {% if servicio.idEstatus.id == 2 or servicio.idEstatus.id == 3   %}
 
        {%  if not ascenso %}
             
diff --git a/app/Resources/views/solicitudes/index.html.twig b/app/Resources/views/solicitudes/index.html.twig
index 867faff..378db1a 100644
--- a/app/Resources/views/solicitudes/index.html.twig
+++ b/app/Resources/views/solicitudes/index.html.twig
@@ -54,7 +54,11 @@
 
                           {% if servicio.idServicioCe.id == 5 %}
                               <a href="{{ path('adscripcion_show', { 'id': servicio.id }) }}" class="btn btn-xs btn-info"><i class="fa fa-eye"> </i></a>
+
                           {%endif%}
+                        {% if servicio.idServicioCe.id == 6 %}
+                            <a href="{{ path('adscripcion_show', { 'id': servicio.id }) }}" class="btn btn-xs btn-info"><i class="fa fa-eye"> </i></a>
+                            {% endif %}
                       </td>
                   </tr>
                   {% endfor %}
diff --git a/src/AppBundle/Controller/AscensoController.php b/src/AppBundle/Controller/AscensoController.php
index 9b283db..07a2570 100644
--- a/src/AppBundle/Controller/AscensoController.php
+++ b/src/AppBundle/Controller/AscensoController.php
@@ -617,8 +617,6 @@ class AscensoController extends Controller
                 $servicio->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(3));
 
 
-                $ServicioAscenso->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(4));
-                $ascenso->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(4));
             }
 
             $em->persist($ServicioAscenso);
-- 
2.0.0