Commit a17b1534fe7fdfa8c826159c7035ee650b946e27
1 parent
0832f4de67
Exists in
master
creado el seguimiento de la clase activa en el menu de la aplicacion, añadido lo…
…s roles de administrador y coordinador al docente, crear la pagina de solicitudes creadas
Showing
4 changed files
with
21 additions
and
4 deletions
Show diff stats
app/Resources/views/base_app.html.twig
| @@ -11,7 +11,8 @@ | @@ -11,7 +11,8 @@ | ||
| 11 | {% endblock %} | 11 | {% endblock %} |
| 12 | <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" /> | 12 | <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" /> |
| 13 | </head> | 13 | </head> |
| 14 | - <body data-spy="scroll" data-offset="20" data-target="#navbar"> | 14 | + <body data-offset="20" data-target="#navbar"> |
| 15 | + | ||
| 15 | {% block navegacion %} | 16 | {% block navegacion %} |
| 16 | <nav class="navbar navbar-default"> | 17 | <nav class="navbar navbar-default"> |
| 17 | <div class="container-fluid"> | 18 | <div class="container-fluid"> |
| @@ -45,9 +46,9 @@ | @@ -45,9 +46,9 @@ | ||
| 45 | <div class="subnavbar-inner"> | 46 | <div class="subnavbar-inner"> |
| 46 | <div class="container"> | 47 | <div class="container"> |
| 47 | <ul class="mainnav"> | 48 | <ul class="mainnav"> |
| 48 | - <li class="active"><a href="index.html"><i class="fa fa-list"></i><span>Principal</span> </a> </li> | 49 | + <li {% if (app.request.attributes.get('_route') == 'cea_index') %} class="active" {% endif %}><a href="{{path('cea_index')}}"><i class="fa fa-list"></i><span>Principal</span> </a> </li> |
| 49 | {% if is_granted('ROLE_COORDINADOR_NACIONAL') %} | 50 | {% if is_granted('ROLE_COORDINADOR_NACIONAL') %} |
| 50 | - <li class="active"><a href="index.html"><i class="fa fa-list"></i><span>Principal</span> </a> </li> | 51 | + <li {% if (app.request.attributes.get('_route') == 'cea_solicitudes') %} class="active" {% endif %}><a href="{{ path('cea_solicitudes')}}"><i class="fa fa-institution"></i><span>Ver Solicitudes</span> </a> </li> |
| 51 | {% endif %} | 52 | {% endif %} |
| 52 | {% if is_granted('ROLE_DOCENTE') %} | 53 | {% if is_granted('ROLE_DOCENTE') %} |
| 53 | <li class="dropdown"><a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> <i class="fa fa-dashboard"></i><span>Solicitudes</span> <b class="caret"></b></a> | 54 | <li class="dropdown"><a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> <i class="fa fa-dashboard"></i><span>Solicitudes</span> <b class="caret"></b></a> |
| @@ -69,7 +70,8 @@ | @@ -69,7 +70,8 @@ | ||
| 69 | {% endblock %} | 70 | {% endblock %} |
| 70 | 71 | ||
| 71 | 72 | ||
| 72 | - {% block body %}{% endblock %} | 73 | + {% block body %} |
| 74 | + {% endblock %} | ||
| 73 | 75 | ||
| 74 | {% block javascripts %} | 76 | {% block javascripts %} |
| 75 | <script type="text/javascript" src="{{ asset('assets/vendor/jquery/dist/jquery.min.js') }}"></script> | 77 | <script type="text/javascript" src="{{ asset('assets/vendor/jquery/dist/jquery.min.js') }}"></script> |
app/Resources/views/cea/solicitudes.html.twig
| @@ -0,0 +1 @@ | @@ -0,0 +1 @@ | ||
| 1 | +{% extends 'base_app.html.twig' %} |
app/config/security.yml
| @@ -36,5 +36,6 @@ security: | @@ -36,5 +36,6 @@ security: | ||
| 36 | access_control: | 36 | access_control: |
| 37 | - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 37 | - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
| 38 | - { path: ^/register, roles: ROLE_DOCENTE } | 38 | - { path: ^/register, roles: ROLE_DOCENTE } |
| 39 | + - { path: ^/ceapp, roles: ROLE_DOCENTE } | ||
| 39 | - { path: ^/admin, roles: ROLE_ADMINISTRADOR } | 40 | - { path: ^/admin, roles: ROLE_ADMINISTRADOR } |
| 40 | - { path: ^/, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 41 | - { path: ^/, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
src/AppBundle/Controller/DocenteController.php
| @@ -43,4 +43,17 @@ class DocenteController extends Controller { | @@ -43,4 +43,17 @@ class DocenteController extends Controller { | ||
| 43 | )); | 43 | )); |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | + /** | ||
| 47 | + * Pagina principal de inicio de la session Docente. | ||
| 48 | + * | ||
| 49 | + * @Route("/solicitudes", name="cea_solicitudes") | ||
| 50 | + * @Method("GET") | ||
| 51 | + */ | ||
| 52 | + public function SolicitudesAction() | ||
| 53 | + { | ||
| 54 | + | ||
| 55 | + | ||
| 56 | + return $this->render('cea/solicitudes.html.twig'); | ||
| 57 | + } | ||
| 58 | + | ||
| 46 | } | 59 | } |