Commit 326a15ecfb32f5efe2754a9df7b044017e3ff0d3
1 parent
5ae328a10c
Exists in
master
creado la visualizacion de las solicitudes individuales junto con su controlador y plantilla
Showing
7 changed files
with
114 additions
and
2 deletions
Show diff stats
app/Resources/views/cea/solicitudes.html.twig
@@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
38 | </td> | 38 | </td> |
39 | <td>{{adscripcion.idRolInstitucion.idInstitucion.idEjeParroquia.idParroquia.idMunicipio.idEstado}} </td> | 39 | <td>{{adscripcion.idRolInstitucion.idInstitucion.idEjeParroquia.idParroquia.idMunicipio.idEstado}} </td> |
40 | <td> | 40 | <td> |
41 | - <a href="javascript:;" class="btn btn-xs btn-info"><i class="fa fa-eye"> </i></a> | 41 | + <a href="{{ path('cea_solicitudes_show', { 'id': adscripcion.id }) }}" class="btn btn-xs btn-info"><i class="fa fa-eye"> </i></a> |
42 | <a href="javascript:;" class="btn btn-xs btn-success"><i class="fa fa-check"> </i></a> | 42 | <a href="javascript:;" class="btn btn-xs btn-success"><i class="fa fa-check"> </i></a> |
43 | <a href="javascript:;" class="btn btn-danger btn-xs"><i class="fa fa-times"> </i></a></td> | 43 | <a href="javascript:;" class="btn btn-danger btn-xs"><i class="fa fa-times"> </i></a></td> |
44 | </td> | 44 | </td> |
app/Resources/views/cea/solicitudes_mostar.html.twig
@@ -0,0 +1,86 @@ | @@ -0,0 +1,86 @@ | ||
1 | +{% extends 'base_app.html.twig' %} | ||
2 | + | ||
3 | +{%block body %} | ||
4 | + | ||
5 | + <div class="content-wrapper"> | ||
6 | + <div class="container"> | ||
7 | + <div class="row"> | ||
8 | + <div class="col-md-12"> | ||
9 | + <h4 class="page-head-line">Solicitud de Adscripción número <code>{{adscripcion.id}}</code>: {{ adscripcion.idRolInstitucion.idRol.idPersona.primerNombre }}, {{ adscripcion.idRolInstitucion.idRol.idPersona.primerApellido }} </h4> | ||
10 | + | ||
11 | + </div> | ||
12 | + | ||
13 | + </div> | ||
14 | + <div class="row"> | ||
15 | + | ||
16 | + <div class="col-md-6"> | ||
17 | + | ||
18 | + <div class="col-md-4"> | ||
19 | + <img src="{{ asset('bundles/framework/images/portal/logo_ubv.png') }}" /> | ||
20 | + </div> | ||
21 | + | ||
22 | + <div class="col-md-8"> | ||
23 | + <form action="{{ path('login') }}" method="post" role="form" > | ||
24 | + | ||
25 | + <div class="form-group"> | ||
26 | + <label for="username">Fecha de Ingreso UBV:</label> | ||
27 | + <input type="date" class="form-control" id="username" name="primerApellido" value="{{ adscripcion.fechaIngreso|date('Y-m-d') }}" /> | ||
28 | + </div> | ||
29 | + | ||
30 | + <div class="form-group"> | ||
31 | + <label for="Escalafones">Escalafones:</label> | ||
32 | + <table class="table table-striped table-bordered"> | ||
33 | + <th>Escalafón</th> | ||
34 | + <th>Fecha</th> | ||
35 | + <th>Tipo</th> | ||
36 | + {% for escala in escalas %} | ||
37 | + | ||
38 | + <tr> | ||
39 | + <td>{{escala.idEscala }}</td> | ||
40 | + <td>{{escala.fechaEscala | date('d-m-Y') }}</td> | ||
41 | + <td>{{escala.idTipoEscala }}</td> | ||
42 | + </tr> | ||
43 | + {%endfor %} | ||
44 | + </table> | ||
45 | + | ||
46 | + </div> | ||
47 | + | ||
48 | + <div class="form-group"> | ||
49 | + <label for="username">Area y Línea de Investigación:</label> | ||
50 | + <ul> | ||
51 | + <li>{{adscripcion.idLineaInvestigacion.idAreaInvestigacion}}</li> | ||
52 | + <li>{{adscripcion.idLineaInvestigacion}}</li> | ||
53 | + </ul> | ||
54 | + </div> | ||
55 | + | ||
56 | + <div class="form-group"> | ||
57 | + <label for="titulo">Título del Trabajo:</label> | ||
58 | + <input type="text" class="form-control" value="{{adscripcion.tituloTrabajo}}" /> | ||
59 | + | ||
60 | + | ||
61 | + </div> | ||
62 | + | ||
63 | + | ||
64 | + | ||
65 | + | ||
66 | + <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-user"></span> Ingresar</button> | ||
67 | + </form> | ||
68 | + <hr /> | ||
69 | + </div> | ||
70 | + </div> | ||
71 | + | ||
72 | + <div class="col-md-5"> | ||
73 | + | ||
74 | + <div class="widget-content"> | ||
75 | + <h3>Documentos Consignados</h3> | ||
76 | + <img src="{{asset('uploads/adscripcion/0341e64b661d9218b8589e9dc80d0f40.pdf')}}" | ||
77 | + | ||
78 | + | ||
79 | + </div> | ||
80 | + </div> | ||
81 | + | ||
82 | + </div> | ||
83 | + </div> | ||
84 | + </div> | ||
85 | + | ||
86 | +{% endblock %} |
File mode changed
File mode changed
File mode changed
src/AppBundle/Controller/DocenteController.php
@@ -12,6 +12,8 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | @@ -12,6 +12,8 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | ||
12 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; | 12 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
13 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; | 13 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; |
14 | 14 | ||
15 | +use AppBundle\Entity\Adscripcion; | ||
16 | + | ||
15 | 17 | ||
16 | /** | 18 | /** |
17 | * Description of DocenteController | 19 | * Description of DocenteController |
@@ -52,7 +54,7 @@ class DocenteController extends Controller { | @@ -52,7 +54,7 @@ class DocenteController extends Controller { | ||
52 | * @Method("GET") | 54 | * @Method("GET") |
53 | * @Security("has_role('ROLE_COORDINADOR_NACIONAL')") | 55 | * @Security("has_role('ROLE_COORDINADOR_NACIONAL')") |
54 | */ | 56 | */ |
55 | - public function SolicitudesAction() | 57 | + public function verSolicitudesAction() |
56 | { | 58 | { |
57 | 59 | ||
58 | $adscripciones = $this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findBy(array('idEstatus' => 2)); | 60 | $adscripciones = $this->getDoctrine()->getRepository('AppBundle:Adscripcion')->findBy(array('idEstatus' => 2)); |
@@ -62,4 +64,24 @@ class DocenteController extends Controller { | @@ -62,4 +64,24 @@ class DocenteController extends Controller { | ||
62 | )); | 64 | )); |
63 | } | 65 | } |
64 | 66 | ||
67 | + /** | ||
68 | + * Encuentra y muestra una entidad de tipo Adscripción. | ||
69 | + * | ||
70 | + * @Route("/solicitudes/{id}", name="cea_solicitudes_show") | ||
71 | + * @Method("GET") | ||
72 | + */ | ||
73 | + public function solicitudesShowAction(Adscripcion $adscripcion) | ||
74 | + { | ||
75 | + //$deleteForm = $this->createDeleteForm($usuario); | ||
76 | + $escala = $this->getDoctrine()->getRepository('AppBundle:DocenteEscala')->findBy(array( | ||
77 | + 'idRolInstitucion' => $adscripcion->getIdRolInstitucion()->getId() | ||
78 | + )); | ||
79 | + | ||
80 | + return $this->render('cea/solicitudes_mostar.html.twig', array( | ||
81 | + 'adscripcion' => $adscripcion, | ||
82 | + 'escalas' => $escala | ||
83 | + )); | ||
84 | + } | ||
85 | + | ||
65 | } | 86 | } |
87 | + | ||
66 | \ No newline at end of file | 88 | \ No newline at end of file |
src/AppBundle/Entity/LineasInvestigacion.php
@@ -105,4 +105,8 @@ class LineasInvestigacion | @@ -105,4 +105,8 @@ class LineasInvestigacion | ||
105 | { | 105 | { |
106 | return $this->idAreaInvestigacion; | 106 | return $this->idAreaInvestigacion; |
107 | } | 107 | } |
108 | + | ||
109 | + public function __toString() { | ||
110 | + return $this->getNombre(); | ||
111 | + } | ||
108 | } | 112 | } |
109 | \ No newline at end of file | 113 | \ No newline at end of file |