omassot il y a 7 ans
Parent
commit
46ea6edfd3
2 fichiers modifiés avec 13 ajouts et 2 suppressions
  1. 3 1
      main/templates/story_index.html
  2. 10 1
      main/views.py

+ 3 - 1
main/templates/story_index.html

@@ -11,8 +11,10 @@
 
 {% block main %}
 
-	<header class="flex-row" style="margin-bottom: 2em;">
+	<header class="flex-row flex-align-center" style="margin-bottom: 2em;">
 		<h2 class="flex-extend">Stories</h2>
+		<b style="margin-right: 20px;">Nombre: {{ count }}</b>
+		<b style="margin-right: 25px;">Poids: {{ total_weight }}</b>
 		<a class="button icon fa-plus tool-btn alt" href="{% url 'story_create' %}" title="Nouvelle Story">Nouvelle Story</a>
 	</header>
 

+ 10 - 1
main/views.py

@@ -5,6 +5,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.models import User
 from django.core.paginator import Paginator
+from django.db.models.aggregates import Sum
 from django.http.response import HttpResponse
 from django.shortcuts import render, get_object_or_404, redirect
 from django.urls.base import reverse
@@ -107,11 +108,19 @@ def story_index(request):
     if 'assignee' in filters and filters['assignee']:
         stories = stories.filter(assignees__id=filters['assignee'])
     
+    count = stories.count()
+    total_weight = stories.aggregate(Sum('weight'))['weight__sum']
+    
     paginator = Paginator(stories.all(), 20)
     page = request.GET.get('page')
     stories = paginator.get_page(page)
     
-    return render(request, 'story_index.html', {'stories': stories, 'sprints': sprints, 'users': users, 'pages': range(1, paginator.num_pages + 1)})
+    return render(request, 'story_index.html', {'stories': stories, 
+                                                'count': count,
+                                                'total_weight': total_weight,
+                                                'sprints': sprints, 
+                                                'users': users, 
+                                                'pages': range(1, paginator.num_pages + 1)})
 
 @login_required
 def story_details(request, story_id):