Created Dashboard

renzon · renzon · commit 3f5c074876b2 · 2019-06-11T22:11:44.000-03:00
close #1229
diff --git a/pythonpro/core/templates/core/base.html b/pythonpro/core/templates/core/base.html
@@ -98,6 +98,7 @@
                         {{ user.first_name }}
                     </a>
                     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                        <a class="dropdown-item" href="{% url 'dashboard:home' %}">Dashboard</a>
                         <a class="dropdown-item" href="{% url 'core:profile' %}">Perfil</a>
                         <div class="dropdown-divider"></div>
                         <div class="dropdown-item">
@@ -108,7 +109,7 @@
             </ul>
         {% else %}
             <a class="btn btn-light my-2 my-sm-0"
-               href="{% url 'login' %}?next={{ request.get_full_path|urlencode }}">Entrar</a>
+               href="{% url 'login' %}?next={% url 'dashboard:home' %}">Entrar</a>
         {% endif %}
     </div>
 </nav>
diff --git a/pythonpro/dashboard/models.py b/pythonpro/dashboard/models.py
@@ -1,5 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.db import models
+from django.urls import reverse
 
 from pythonpro.modules.facade import get_topic_model
 
@@ -17,3 +18,9 @@ class Meta:
     topic_duration = models.IntegerField('Duração do Tópico')  # seconds
     total_watched_time = models.IntegerField('Tempo assistindo o Tópico')  # seconds
     max_watched_time = models.IntegerField('Tempo até onde assistiu')  # seconds
+
+    def get_topic_url(self):
+        return reverse('topics:detail', kwargs={'slug': self.topic.slug})
+
+    def get_topic_title(self):
+        return self.topic.title
diff --git a/pythonpro/dashboard/templates/dashboard/home.html b/pythonpro/dashboard/templates/dashboard/home.html
@@ -0,0 +1,49 @@
+{% extends 'core/base.html' %}
+{% load static %}
+{% load dashboard_tags %}
+{% block head %}
+    <script type="application/javascript">
+        $(function () {
+            $('[data-toggle="tooltip"]').tooltip()
+        })
+    </script>
+{% endblock head %}
+{% block body %}
+    <div class="container mt-5 mb-5">
+        <div class="row">
+            <div class="col">
+                <h1 class="mb-4">Dashboard</h1>
+                <p>Confira seus últimos acessos</p>
+                <table class="table table-striped text-center">
+                    <thead>
+                    <tr>
+                        <th scope="col">Data</th>
+                        <th scope="col">Tópico</th>
+                        <th scope="col" data-toggle="tooltip" data-placement="top"
+                            title="Tempo onde parou de ver o vídeo">Parada <span
+                                class="badge badge-pill badge-dark">?</span></th>
+                        <th scope="col" data-toggle="tooltip" data-placement="top"
+                            title="Tempo total que passou vendo o vídeo">Tempo <span
+                                class="badge badge-pill badge-dark">?</span></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for interaction in interactions %}
+                        <tr>
+                            <td>{{ interaction.creation|date:"d/m/Y" }} {{ interaction.creation|time:"H:i:s" }}</td>
+                            <td><a href="{{ interaction.get_topic_url }}">{{ interaction.get_topic_title }}</a></td>
+                            <td>{{ interaction.max_watched_time|duration }}</td>
+                            <td>{{ interaction.total_watched_time|duration }}</td>
+                        </tr>
+                    {% empty %}
+                        <tr>
+                            <td colspan="4">Você ainda não assistiu nenhum tópico</td>
+                        </tr>
+                    {% endfor %}
+
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+{% endblock body %}
diff --git a/pythonpro/dashboard/templatetags/__init__.py b/pythonpro/dashboard/templatetags/__init__.py
diff --git a/pythonpro/dashboard/templatetags/dashboard_tags.py b/pythonpro/dashboard/templatetags/dashboard_tags.py
@@ -0,0 +1,16 @@
+from django import template
+
+
+def duration(value):
+    try:
+        duration = int(value)
+    except ValueError:
+        return ''
+    else:
+        minutes, seconds = divmod(duration, 60)
+        hours, minutes = divmod(minutes, 60)
+        return f'{hours:02d}:{minutes:02d}:{seconds:02d}'
+
+
+register = template.Library()
+register.filter('duration', duration)
diff --git a/pythonpro/dashboard/tests/__init__.py b/pythonpro/dashboard/tests/__init__.py
diff --git a/pythonpro/dashboard/tests/test_dashboard.py b/pythonpro/dashboard/tests/test_dashboard.py
@@ -0,0 +1,31 @@
+import pytest
+from django.urls import reverse
+from model_mommy import mommy
+
+from pythonpro.dashboard.models import TopicInteraction
+from pythonpro.django_assertions import dj_assert_contains
+
+
+@pytest.fixture
+def interactions(logged_user, topic):
+    return mommy.make(TopicInteraction, 100, user=logged_user, topic=topic)
+
+
+@pytest.fixture
+def resp(client_with_lead, interactions):
+    return client_with_lead.get(
+        reverse('dashboard:home'),
+        secure=True
+    )
+
+
+def test_topic_interaction_status_code(resp):
+    return resp.status_code == 200
+
+
+def test_topic_url_is_present(resp, topic):
+    dj_assert_contains(resp, reverse('topics:detail', kwargs={'slug': topic.slug}))
+
+
+def test_topic_title_is_present(resp, topic):
+    dj_assert_contains(resp, topic.title)
diff --git a/pythonpro/dashboard/tests/test_interaction_creation.py b/pythonpro/dashboard/tests/test_interaction_creation.py
diff --git a/pythonpro/dashboard/urls.py b/pythonpro/dashboard/urls.py
@@ -3,4 +3,7 @@
 from . import views
 
 app_name = 'dashboard'
-urlpatterns = [path('topic_interaction', views.topic_interation, name='topic_interaction')]
+urlpatterns = [
+    path('topic_interaction', views.topic_interation, name='topic_interaction'),
+    path('', views.home, name='home'),
+]
diff --git a/pythonpro/dashboard/views.py b/pythonpro/dashboard/views.py
@@ -1,9 +1,19 @@
+from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse
+from django.shortcuts import render
 from django.views.decorators.csrf import csrf_exempt
 
 from pythonpro.dashboard.forms import TopicInteractionForm
+from pythonpro.dashboard.models import TopicInteraction
 
 
+@login_required
+def home(request):
+    interactions = TopicInteraction.objects.select_related('topic').filter(user=request.user).order_by('-creation')[:20]
+    return render(request, 'dashboard/home.html', {'interactions': interactions})
+
+
+@login_required
 @csrf_exempt
 def topic_interation(request):
     data = dict(request.POST.items())
