Wilmer Ramones / CEAUBV

Download as
Browse Code »

Commit 23e6829c78a005c1257f0f510803bea06ca3513a

Authored by Wilmer
1 parent 0ea063e2ce
Exists in master

añadido el rechazo de la solicitud de reconocimiento de escala junto con su nuev… 

…a subida de documento
Showing 3 changed files with 5 additions and 3 deletions   Show diff stats
app/Resources/views/cea/reconocimiento_escala_mostrar.html.twig
  Diff comments   View file @23e6829
... ... @@ -158,7 +158,7 @@
158 158 </div>
159 159 {% endif %}
160 160  
161   - {% if servicio.idEstatus.id == 2 %}
  161 + {% if servicio.idEstatus.id == 2 or servicio.idEstatus.id == 3 %}
162 162  
163 163 {% if not ascenso %}
164 164  
... ...
app/Resources/views/solicitudes/index.html.twig
  Diff comments   View file @23e6829
... ... @@ -54,7 +54,11 @@
54 54  
55 55 {% if servicio.idServicioCe.id == 5 %}
56 56 <a href="{{ path('adscripcion_show', { 'id': servicio.id }) }}" class="btn btn-xs btn-info"><i class="fa fa-eye"> </i></a>
  57 +
57 58 {%endif%}
  59 + {% if servicio.idServicioCe.id == 6 %}
  60 + <a href="{{ path('adscripcion_show', { 'id': servicio.id }) }}" class="btn btn-xs btn-info"><i class="fa fa-eye"> </i></a>
  61 + {% endif %}
58 62 </td>
59 63 </tr>
60 64 {% endfor %}
... ...
src/AppBundle/Controller/AscensoController.php
  Diff comments   View file @23e6829
... ... @@ -617,8 +617,6 @@ class AscensoController extends Controller
617 617 $servicio->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(3));
618 618  
619 619  
620   - $ServicioAscenso->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(4));
621   - $ascenso->setIdEstatus($this->getDoctrine()->getRepository('AppBundle:Estatus')->findOneById(4));
622 620 }
623 621  
624 622 $em->persist($ServicioAscenso);
... ...