Merge pull request GhostManager#758 from GhostManager/copilot/fix-projects-sorting-issue

Fix execution window sorting for non-English locales and use user's date format preference

Author: chrismaddalena

ghostwriter/rolodex/templates/rolodex/client_detail.html

@@ -258,8 +258,8 @@ <h4>Client Projects</h4>
                     <td class="align-middle text-left"><span class="blurry">REDACTED</span></td>
                   {% endif %}
                   <td class="align-middle text-left">{{ project.project_type }}</td>
-                  <td class="align-middle text-left">{{ project.start_date|date:"d M Y" }}
-                    – {{ project.end_date|date:"d M Y" }}</td>
+                  <td class="align-middle text-left" data-text="{{ project.start_date|date:"Y-m-d" }}">{{ project.start_date|date:"DATE_FORMAT" }}
+                    – {{ project.end_date|date:"DATE_FORMAT" }}</td>
 
                   <td class="align-middle">
                     <div class="d-flex justify-content-center">

ghostwriter/rolodex/templates/rolodex/project_detail.html

@@ -174,8 +174,8 @@ <h4>Project Team Assignments</h4>
                   </a>
                 </td>
                 <td class="align-middle text-left">{{ operator.role }}</td>
-                <td class="align-middle text-left">{{ operator.start_date|date:"d M Y" }} –
-                  <br/> {{ operator.end_date|date:"d M Y" }}</td>
+                <td class="align-middle text-left" data-text="{{ operator.start_date|date:"Y-m-d" }}">{{ operator.start_date|date:"DATE_FORMAT" }} –
+                  <br/> {{ operator.end_date|date:"DATE_FORMAT" }}</td>
                 <td class="text-justify align-middle text-left">{{ operator.note|bleach }}</td>
                 {% if request.user|is_privileged %}
                   <td class="align-middle">
@@ -720,7 +720,7 @@ <h4>Domains</h4>
                                     </span>
                 </td>
                 <td class="align-middle text-left">{{ domain.activity_type }}</td>
-                <td class="align-middle text-left">{{ domain.start_date|date:"d M Y" }} – <br/>{{ domain.end_date|date:"d M Y" }}
+                <td class="align-middle text-left" data-text="{{ domain.start_date|date:"Y-m-d" }}">{{ domain.start_date|date:"DATE_FORMAT" }} – <br/>{{ domain.end_date|date:"DATE_FORMAT" }}
                 </td>
 
                 <td class="align-middle">

ghostwriter/rolodex/templates/rolodex/project_list.html

@@ -49,7 +49,7 @@
           <td class="align-middle text-left"><a class="clickable" href="{{ project.get_absolute_url }}">{{ project.codename }}</a>
           </td>
           <td class="align-middle text-left">{{ project.project_type }}</td>
-          <td class="align-middle text-left">{{ project.start_date|date:"d M Y" }} – {{ project.end_date|date:"d M Y" }}</td>
+          <td class="align-middle text-left" data-text="{{ project.start_date|date:"Y-m-d" }}">{{ project.start_date|date:"DATE_FORMAT" }} – {{ project.end_date|date:"DATE_FORMAT" }}</td>
           <td class="align-middle">
             <div class="d-flex justify-content-center">
               <span

ghostwriter/rolodex/tests/test_views.py

@@ -807,6 +807,21 @@ def test_codename_filtering(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.context["filter"].qs), 1)
 
+    def test_date_sort_attribute_in_template(self):
+        """Test that execution window cells have data-text attribute for locale-independent sorting."""
+        response = self.client_mgr.get(self.uri)
+        self.assertEqual(response.status_code, 200)
+        
+        # Check that the response contains data-text attribute with ISO date format
+        content = response.content.decode('utf-8')
+        self.assertIn('data-text="', content, "data-text attribute should be present in the template")
+        
+        # Verify each project in the queryset has its start_date in the data-text attribute
+        for project in response.context["filter"].qs:
+            expected_sort_value = project.start_date.strftime("%Y-%m-%d")
+            self.assertIn(f'data-text="{expected_sort_value}"', content,
+                         f"Project {project.codename} should have data-text attribute with ISO date {expected_sort_value}")
+
 
 class AssignProjectContactViewTests(TestCase):
     """Collection of tests for :view:`rolodex.AssignProjectContact`."""

ghostwriter/shepherd/templates/shepherd/domain_detail.html

@@ -290,8 +290,8 @@ <h4>Domain History</h4>
                   {% endif %}
                 </td>
                 <td class="align-middle text-left">{{ checkout.activity_type }}</td>
-                <td class="align-middle text-left">{{ checkout.start_date|date:"d M Y" }}
-                  – {{ checkout.end_date|date:"d M Y" }}</td>
+                <td class="align-middle text-left" data-text="{{ checkout.start_date|date:"Y-m-d" }}">{{ checkout.start_date|date:"DATE_FORMAT" }}
+                  – {{ checkout.end_date|date:"DATE_FORMAT" }}</td>
                 <td class="align-middle text-left">
                   {% if checkout.project|has_access:request.user %}
                     <div class="d-flex justify-content-center">

ghostwriter/shepherd/templates/shepherd/server_detail.html

@@ -155,8 +155,8 @@ <h4>Server History</h4>
                 </td>
                 <td class="align-middle text-left">{{ checkout.activity_type }}</td>
                 <td class="align-middle text-left">{{ checkout.server_role }}</td>
-                <td class="align-middle text-left">{{ checkout.start_date|date:"d M Y" }}
-                  - {{ checkout.end_date|date:"d M Y" }}</td>
+                <td class="align-middle text-left" data-text="{{ checkout.start_date|date:"Y-m-d" }}">{{ checkout.start_date|date:"DATE_FORMAT" }}
+                  - {{ checkout.end_date|date:"DATE_FORMAT" }}</td>
                 <td class="align-middle">
                   {% if checkout.project|has_access:request.user %}
                     <div class="d-flex justify-content-center">

ghostwriter/users/templates/users/profile.html

@@ -124,7 +124,7 @@ <h4 class="icon assignment-icon pt-4">Active Project Assignments</h4>
             <tr id="assignment_{{ assignment.id }}">
               <td class="align-middle text-left"><a class="clickable" href="{{ assignment.project.get_absolute_url }}">{{ assignment.project.codename|bleach }}</a>
               <td class="align-middle text-left">{{ assignment.role }}</td>
-              <td class="align-middle text-left">{{ assignment.start_date|date:"d M Y" }} – {{ assignment.end_date|date:"d M Y" }}</td>
+              <td class="align-middle text-left" data-text="{{ assignment.start_date|date:"Y-m-d" }}">{{ assignment.start_date|date:"DATE_FORMAT" }} – {{ assignment.end_date|date:"DATE_FORMAT" }}</td>
             </tr>
           {% endif %}
         {% endfor %}