diff --git a/itou/templates/gps/includes/memberships_results.html b/itou/templates/gps/includes/memberships_results.html index b2ba4ca9a6..a25dec6f47 100644 --- a/itou/templates/gps/includes/memberships_results.html +++ b/itou/templates/gps/includes/memberships_results.html @@ -23,17 +23,11 @@

{{ membership.follow_up_group.beneficiary.get_full_name }}

{% with membership.nb_members|add:"-1" as counter %}
- {% if not membership.created_in_bulk %} -
- {# djlint:off #} - {# Don't let djlint add a newline before the . or it will add a space after référent and . #} - Vous avez ajouté ce bénéficiaire le {{ membership.created_at|date:"d/m/Y" }}{% if membership.is_referent %} et êtes référent{% endif %}.{# djlint:on #} -
- {% elif membership.is_referent %} -
- Vous êtes référent. -
- {% endif %} +
+ {# djlint:off #} + {# Don't let djlint add a newline before the . or it will add a space after référent and . #} + Vous avez ajouté ce bénéficiaire le {{ membership.created_at|date:"d/m/Y" }}{% if membership.is_referent %} et êtes référent{% endif %}.{# djlint:on #} +
{% if counter < 1 %} Aucun autre professionnel que vous n'est intervenu auprès de ce bénéficiaire. {% else %} diff --git a/tests/gps/__snapshots__/test_views.ambr b/tests/gps/__snapshots__/test_views.ambr index 6e96e315ec..d0713b714e 100644 --- a/tests/gps/__snapshots__/test_views.ambr +++ b/tests/gps/__snapshots__/test_views.ambr @@ -209,13 +209,11 @@
- -
- - - Vous avez ajouté ce bénéficiaire le 21/06/2024. -
- +
+ + + Vous avez ajouté ce bénéficiaire le 21/06/2024. +
1 autre professionnel est diff --git a/tests/gps/test_views.py b/tests/gps/test_views.py index 2874553d14..51d9af9931 100644 --- a/tests/gps/test_views.py +++ b/tests/gps/test_views.py @@ -1,8 +1,5 @@ -import datetime - import freezegun import pytest -from django.conf import settings from django.test.utils import override_settings from django.urls import reverse from pytest_django.asserts import assertContains, assertRedirects @@ -195,28 +192,6 @@ def test_my_groups(snapshot, client): user = PrescriberFactory(membership__organization__authorized=True, membership__organization__for_snapshot=True) client.force_login(user) - # Was created in bulk. - group = FollowUpGroupFactory( - memberships=1, - beneficiary__first_name="Paco", - beneficiary__last_name="de Lucia", - created_in_bulk=True, - ) - - FollowUpGroup.objects.follow_beneficiary(beneficiary=group.beneficiary, user=user, is_referent=True) - membership = group.memberships.get(member=user) - membership.created_at = datetime.datetime.combine( - settings.GPS_GROUPS_CREATED_AT_DATE, datetime.time(), tzinfo=datetime.UTC - ) - membership.created_in_bulk = True - membership.save() - - response = client.get(reverse("gps:my_groups")) - assert response.status_code == 200 - groups = parse_response_to_soup(response, selector="#follow-up-groups-section").select(".membership-card") - assert len(groups) == 1 - assert "Vous avez ajouté ce bénéficiaire le" not in str(groups[0]) - # Nominal case # Groups created latelly should come first. group = FollowUpGroupFactory(memberships=1, for_snapshot=True) @@ -230,7 +205,7 @@ def test_my_groups(snapshot, client): ("data-bs-confirm-url", f"/gps/groups/{group.pk}", "/gps/groups/[PK of Group]"), ], ).select(".membership-card") - assert len(groups) == 2 + assert len(groups) == 1 assert str(groups[0]) == snapshot(name="test_my_groups__group_card") # Test `is_referent` display. @@ -238,7 +213,7 @@ def test_my_groups(snapshot, client): FollowUpGroup.objects.follow_beneficiary(beneficiary=group.beneficiary, user=user, is_referent=True) response = client.get(reverse("gps:my_groups")) groups = parse_response_to_soup(response, selector="#follow-up-groups-section").select(".membership-card") - assert len(groups) == 3 + assert len(groups) == 2 assert "Janis" in str(groups[0]) assert "et êtes référent" in str(groups[0])