new

osinaweb/osinacore/templates/details_templates/project-details.html

@@ -429,7 +429,7 @@
                                 </td>
 
                                 <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                    <p class="text-secondosiblue">{{ m.total_time_worked_hours }}hr{{ m.total_time_worked_minutes }}min{{ m.total_time_worked_seconds }}sec</p>
+                                    <p class="text-secondosiblue">{{ m.total_time_worked_hours }}hr {{ m.total_time_worked_minutes }}min </p>
                                 </td>
 
                             </tr>

osinaweb/osinacore/views.py

@@ -613,7 +613,7 @@ def projectdetails(request, project_id):
     stories = UserStory.objects.filter(project=project).order_by('-id')
     credentials = ProjectCredential.objects.filter(project=project).order_by('-id')
     albums = ProjectFileAlbum.objects.filter(project=project).order_by('-id')
-    milestones = Milestone.objects.filter(project=project).order_by('-id')
+    milestones = Milestone.objects.filter(project=project).order_by('-name')
 
     all_tickets = Ticket.objects.filter(project=project)
     all_tickets_with_update_date = all_tickets.annotate(