From 9fa68a280584a79d909aba293842659b0ec96f24 Mon Sep 17 00:00:00 2001
From: omdj17 <omdj17@inf.ufpr.br>
Date: Mon, 6 Aug 2018 18:50:22 -0300
Subject: [PATCH] backend do UsuarioDetail e admin de usuarios
---
src/farol/templates/navbar.html | 5 +-
src/usuario/templates/UsuarioAdmin.html | 12 +++-
src/usuario/templates/UsuarioDetail.html | 85 ++++++++++++++++++++++++
src/usuario/urls.py | 3 +-
4 files changed, 100 insertions(+), 5 deletions(-)
create mode 100644 src/usuario/templates/UsuarioDetail.html
diff --git a/src/farol/templates/navbar.html b/src/farol/templates/navbar.html
index 4acaaa7..2b182f1 100644
--- a/src/farol/templates/navbar.html
+++ b/src/farol/templates/navbar.html
@@ -39,9 +39,12 @@
<li class="nav-item">
<a class="nav-link" href="{% url 'SubmissaoList' %}">Moderação</a>
</li>
+ <li class="nav-item">
+ <a class="nav-link" href="{% url 'Admin' %}">Administração</a>
+ </li>
{% endif %}
<li class="nav-item">
- <a class="nav-link" href="/usuario/detail">Minha conta</a>
+ <a class="nav-link" href="{% url 'UsuarioDetail' user.pk %}">Minha conta</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'logout' %} ">Sair</a>
diff --git a/src/usuario/templates/UsuarioAdmin.html b/src/usuario/templates/UsuarioAdmin.html
index 264d9be..3a0a137 100644
--- a/src/usuario/templates/UsuarioAdmin.html
+++ b/src/usuario/templates/UsuarioAdmin.html
@@ -2,15 +2,21 @@
{% block content %}
<h2>{{user.usuario.curso}}</h2>
<h3>Usuarios</h3>
+
{% for usuario in usuarios %}
- <p>{{ usuario.grr }} {{ usuario.user.username }} </p>
+ <a href="{% url 'UsuarioDetail' usuario.pk %}"><p>{{ usuario.grr }}
+ {{ usuario.user.username }} </p> </a>
{% endfor %}
+
<h3>Moderadores</h3>
{% for mod in moderadores %}
- <p>{{ mod.grr }} {{ mod.user.username }} </p>
+ <a href="{% url 'UsuarioDetail' mod.pk %}"><p>{{ mod.grr }}
+ {{ mod.user.username }} </p></a>
{% endfor %}
+
<h3>Administradores</h3>
{% for adm in administradores %}
- <p>{{ adm.grr }} {{ adm.user.username }} </p>
+ <a href="{% url 'UsuarioDetail' adm.pk %}"> <p>{{ adm.grr }}
+ {{ adm.user.username }} </p> </a>
{% endfor %}
{% endblock %}
diff --git a/src/usuario/templates/UsuarioDetail.html b/src/usuario/templates/UsuarioDetail.html
new file mode 100644
index 0000000..646a9d1
--- /dev/null
+++ b/src/usuario/templates/UsuarioDetail.html
@@ -0,0 +1,85 @@
+{% extends 'base.html' %}
+{% block content %}
+{{a}}
+ <h2>Minha conta</h2>
+ <p>{{UsuarioDetail.user.username }} {{UsuarioDetail.user.email }} </p>
+ <p>{{UsuarioDetail.grr}} {{UsuarioDetail.curso }} </p>
+ <h3>Documentos enviados</h3>
+ <table >
+ <thead>
+ <tr>
+ <th>Curso</th>
+ <th>Tipo de avaliação</th>
+ <th>Disciplina</th>
+ <th>Professor</th>
+ <th>Ano</th>
+ <th>Periodo</th>
+ <th>Tipo documento</th>
+ <th>Ação</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for doc in documentos %}
+ <tr>
+ <td>{{doc.curso}} </td>
+ <td>{{doc.tipo_avaliacao}} </td>
+ <td>{{doc.disciplina}} </td>
+ <td>{{doc.professor}} </td>
+ <td>{{doc.ano}}</td>
+ <td>{{doc.periodo}} </td>
+ <td>{{doc.tipo_documento}} </td>
+ <td>
+ <a href="{% url 'DocumentoDetail' doc.pk %}"><i class="fa fa-eye fa-lg" aria-hidden="true"></i></a>
+ </td>
+ </tr>
+ {% endfor %}
+
+ </tbody>
+ </table>
+ {% if is_paginated %}
+ <hr>
+ <nav aria-label="Page navigation example">
+ <ul class="pagination justify-content-center pagination-sm">
+ {% if page_obj.has_previous %}
+ <!-- If it ain't a search result display, don't append the search query
+ to the URL. -->
+ {% if not search %}
+ <li class="page-item">
+ <a class="page-link" href="{% url 'DocumentoList' %}?page={{ page_obj.previous_page_number }}" tabindex="-1">Previous</a>
+ </li>
+ {% else %}
+ <!-- Append the searched query to the URL, so that on a search results page,
+ the pagination don't revert to listing all the listview items. -->
+ <li class="page-item">
+ <a class="page-link" href="{% url 'DocumentoList' %}?{{search}}&page={{ page_obj.previous_page_number }}" tabindex="-1">Previous</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item disabled">
+ <a class="page-link" href="#" tabindex="-1">Previous</a>
+ </li>
+ {% endif %}
+ {% for object in page_obj.paginator.page_range %}
+ <li class="page-item"><a class="page-link" href="{%
+ url 'DocumentoList' %}?page={{ forloop.counter }}">{{ forloop.counter }}</a></li>
+ {% endfor %}
+ {% if page_obj.has_next %}
+ {% if not search %}
+ <li class="page-item">
+ <a class="page-link" href="{% url 'DocumentoList' %}?page={{ page_obj.next_page_number }}">Next</a>
+ </li>
+ {% else %}
+ <li class="page-item">
+ <a class="page-link" href="{% url 'DocumentoList' %}?{{search}}&page={{ page_obj.next_page_number }}">Next</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item disabled">
+ <a class="page-link" href="#">Next</a>
+ </li>
+ {% endif %}
+ </ul>
+ </nav>
+ {% endif %}
+
+{% endblock %}
diff --git a/src/usuario/urls.py b/src/usuario/urls.py
index 5fbd14b..be28e9d 100644
--- a/src/usuario/urls.py
+++ b/src/usuario/urls.py
@@ -4,7 +4,8 @@ from usuario import views
urlpatterns = [
path('signup/', views.SignUp.as_view(), name='signup'),
- path('admin', views.Admin.as_view(), name='Admin')
+ path('admin', views.Admin.as_view(), name='Admin'),
+ path('detail/<int:pk>', views.UsuarioDetail.as_view(), name='UsuarioDetail')
# path('createCurso/', views.CursoCreateView.as_view(), name='createCurso'),
# path('listCurso/', views.CursoListView.as_view(), name='lisCurso'),
# path('editCurso/', views.CursoEditView.as_view(), name='editCurso'),
--
GitLab