Fix display main territory even if is not in favorites

Author: smdsgn

frontend/scripts/utils/projectUrls.ts

@@ -91,7 +91,7 @@ export function buildHeader(isAuthenticated: boolean) {
             label: "Mon compte",
             shouldDisplay: isAuthenticated,
             subMenu: [
-                { label: "Mes territoires", url: "/diagnostic/mes-territoires" },
+                { label: "Mes territoires favoris", url: "/diagnostic/mes-territoires" },
                 { label: "Profil", url: "/users/profile/" },
                 { label: "Déconnexion", url: "/users/signout/" },
             ],

project/templates/project/pages/list.html

@@ -8,7 +8,7 @@
 
 {% block content %}
 <div class="fr-container">
-    <h1 class="fr-mb-2w">Mes territoires</h1>
+    <h1 class="fr-mb-2w">Mes territoires favoris <span class="bi bi-star-fill fr-ml-1w" style="color: #FFD700;" aria-hidden="true"></span></h1>
 
     {% if main_pref %}
     <div class="fr-mb-4w">
@@ -72,7 +72,6 @@ <h3 class="fr-mb-0">{{ main_pref.land.name }}</h3>
     </div>
     {% endif %}
 
-    <h2 class="fr-h4 fr-mb-1w"><span class="bi bi-star-fill" style="color: #FFD700;" aria-hidden="true"></span> Territoires favoris</h2>
     <div class="fr-grid-row fr-grid-row--gutters">
         {% for pref in preferences %}
         {% if pref.land and not pref.is_favorite %}

project/views/crud.py

@@ -46,6 +46,8 @@ def get_queryset(self):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        from types import SimpleNamespace
+
         from public_data.models import LandModel
 
         for pref in context["preferences"]:
@@ -54,8 +56,23 @@ def get_context_data(self, **kwargs):
             except LandModel.DoesNotExist:
                 pref.land = None
 
-        # Find the favorite pref (main_land) among the already-enriched preferences
-        context["main_pref"] = next((p for p in context["preferences"] if p.is_favorite and p.land), None)
+        user = self.request.user
+        main_pref = next((p for p in context["preferences"] if p.is_favorite and p.land), None)
+
+        if not main_pref and user.main_land_type and user.main_land_id:
+            land = LandModel.objects.filter(land_type=user.main_land_type, land_id=user.main_land_id).first()
+            if land:
+                main_pref = SimpleNamespace(
+                    land=land,
+                    target_2031=None,
+                    report_count=ReportDraft.objects.filter(
+                        land_type=user.main_land_type,
+                        land_id=user.main_land_id,
+                        user=user,
+                    ).count(),
+                )
+
+        context["main_pref"] = main_pref
         context["has_other_favorites"] = any(p for p in context["preferences"] if not p.is_favorite and p.land)
 
         return context

templates/header.html

@@ -50,7 +50,7 @@
                                 <div class="fr-collapse fr-menu" id="menu-mon-compte">
                                     <ul class="fr-menu__list">
                                         <li>
-                                            <a class="fr-nav__link" href="{% url 'project:list' %}">Mes territoires</a>
+                                            <a class="fr-nav__link" href="{% url 'project:list' %}">Mes territoires favoris</a>
                                         </li>
                                         <li>
                                             <a class="fr-nav__link" href="{% url 'users:profile' %}" target="_self">Profil</a>