corrections diverses

main/models.py

@@ -105,11 +105,7 @@ class Epic(BaseModel):
         return len(self.stories.filter(closed=True))
     
     def nb_active_stories(self):
-        res = 0
-        for story in self.stories.filter(closed=False):
-            if story.running():
-                res += 1
-        return res
+        return len([story for story in self.stories.filter(closed=False) if story.running()])
     
     def contributors(self):
         qry = User.objects.raw("""SELECT DISTINCT auth_user.* 
@@ -144,7 +140,7 @@ class Sprint(BaseModel):
         return "Sprint #{} ({:%d/%m/%Y} > {:%d/%m/%Y})".format(self.id, self.date_start, self.date_end)
     
     def running(self):
-        return self.date_start < datetime.date.today() <= self.date_end
+        return self.date_start <= datetime.date.today() <= self.date_end and not self.closed
     
     def nb_stories(self):
         return self.stories.count()
@@ -171,6 +167,7 @@ class Sprint(BaseModel):
 
     @classmethod
     def current(cls):
+        """ the current sprint is the first non-closed sprint """
         try:
             return Sprint.objects.filter(closed = False).order_by('date_start')[0]
         except IndexError:

main/templates/_layout.html

@@ -119,14 +119,14 @@
 	    <!-- Menu -->
 		<nav id="menu">
 			<ul class="links">
-				<li><a href="{% url 'index' %}"><i class="fa fa-home" style=""margin-right: 0.2em;"></i> Accueil</a></li>
-				<li><a href="{% url 'story_index' %}"><i class="fa fa-check-square" style=""margin-right: 0.2em;"></i> Stories</a></li>
-				<li><a href="{% url 'sprint_end' %}"><i class="fa fa-flag" style=""margin-right: 0.2em;"></i> Cloture de sprint</a></li>
-				<li><a href="{% url 'report_projects' %}"><i class="fa fa-line-chart" style=""margin-right: 0.2em;"></i> Suivi de projets</a></li>
-				<li><a href="{% url 'report_activity' %}"><i class="fa fa-line-chart" style=""margin-right: 0.2em;"></i> Rapport d'Activité</a></li>
-				<li><a href="{% url 'report_sprints' %}"><i class="fa fa-line-chart" style=""margin-right: 0.2em;"></i> Suivi des Sprints</a></li>
-				<li><a href="{% url 'backlog_editor' %}"><i class="fa fa-pencil-square" style=""margin-right: 0.2em;"></i> Modifier le Backlog</a></li>
-				<li><a href="{% url 'admin:index' %}"><i class="fa fa-gear" style=""margin-right: 0.2em;"></i> Administration</a></li>
+				<li><a href="{% url 'index' %}"><i class="fa fa-home"></i> Accueil</a></li>
+				<li><a href="{% url 'story_index' %}"><i class="fa fa-check-square"></i> Stories</a></li>
+				<li><a href="{% url 'sprint_end' %}"><i class="fa fa-flag"></i> Cloture de sprint</a></li>
+				<li><a href="{% url 'report_projects' %}"><i class="fa fa-map"></i> Suivi de projets</a></li>
+				<li><a href="{% url 'report_activity' %}"><i class="fa fa-line-chart"></i> Rapport d'Activité</a></li>
+				<li><a href="{% url 'report_sprints' %}"><i class="fa fa-calendar"></i> Suivi des Sprints</a></li>
+				<li><a href="{% url 'backlog_editor' %}"><i class="fa fa-pencil-square"></i> Modifier le Backlog</a></li>
+				<li><a href="{% url 'admin:index' %}"><i class="fa fa-gear"></i> Administration</a></li>
 			</ul>
 		</nav>
 		

main/templates/reports/report_projects.html

@@ -26,13 +26,12 @@
 			<div class="flex-col" style="margin-bottom: 20px;">
 			
 				<div class="flex-row">
-					<h4>{{ epic.name }}</h4>
+					<h4><a href="{% url 'epic_details' epic_id=epic.id %}" target="_blank">{{ epic.name }}</a></h4>
 				</div>
 				
 				<div style="margin-bottom: 20px;">
 					<div>Contributeurs: {% for contrib in epic.contributors %}{{ contrib.first_name }} {{ contrib.last_name }}{% if not forloop.last %}, {% endif %}{% endfor %}</div>
-					<div>Stories (Total / En cours / Terminées): 
-					{{ epic.nb_stories }} / 
+					<div>Stories (En cours / Terminées): 
 					<span class="valid">{{ epic.nb_active_stories }}</span> / 
 					<span class="disabled">{{ epic.nb_closed_stories }}</span></div>
 				</div>

main/urls.py

@@ -40,7 +40,7 @@ urlpatterns = [
     path('comment-edit/<int:comment_id>/', views.comment_edit, name='comment_edit'),
     path('comment-del/<int:comment_id>/', views.comment_del, name='comment_del'),
     path('search/', views.search, name='search'),
-    path('notif/seen/<int:notif_id>/', views.notif_seen, name='search'),
-    path('notif/allseen/', views.notif_all_seen, name='search'),
+    path('notif/seen/<int:notif_id>/', views.notif_seen, name='notif_seen'),
+    path('notif/allseen/', views.notif_all_seen, name='notif_all_seen'),
     
 ]