From abecf66df3f1494b04bc463830446d6e97c30625 Mon Sep 17 00:00:00 2001
From: emile <emileelliye@Emiles-iMac.local>
Date: Thu, 29 May 2025 13:57:40 +0300
Subject: [PATCH] new

---
 .../osinacore/templates/details_templates/project-details.html  | 2 +-
 osinaweb/osinacore/views.py                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osinaweb/osinacore/templates/details_templates/project-details.html b/osinaweb/osinacore/templates/details_templates/project-details.html
index 6f2ad6d3..36d14ded 100644
--- a/osinaweb/osinacore/templates/details_templates/project-details.html
+++ b/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>
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index fd4fcb42..e1bca595 100644
--- a/osinaweb/osinacore/views.py
+++ b/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(