feat: remove badge with count in description_list, members and financ…

…ial_annexes
gip-inclusion · Sep 11, 2024 · a2fc314 · a2fc314
1 parent e2abc49
commit a2fc314
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 34 deletions.
diff --git a/itou/templates/companies/job_description_list.html b/itou/templates/companies/job_description_list.html
@@ -19,14 +19,12 @@ <h2>{{ siae.kind }} {{ siae.display_name }}</h2>
     <ul class="s-tabs-01__nav nav nav-tabs" data-it-sliding-tabs="true">
         <li class="nav-item">
             <a class="nav-link active" href="{% url 'companies_views:job_description_list' %}" {% matomo_event "employeurs" "clic" "voir-liste-metiers" %}>
-                <span>Métiers et recrutements</span>
-                <span class="badge badge-sm rounded-pill ms-2">{{ job_pager.paginator.count }}</span>
+                Métiers et recrutements
             </a>
         </li>
         <li class="nav-item">
             <a class="nav-link" href="{% url 'companies_views:members' %}" {% matomo_event "employeurs" "clic" "gerer-collaborateurs" %}>
-                <span>Collaborateurs</span>
-                <span class="badge badge-sm rounded-pill ms-2">{{ members_count }}</span>
+                Collaborateurs
             </a>
         </li>
         {% if can_show_financial_annexes %}

diff --git a/itou/templates/companies/members.html b/itou/templates/companies/members.html
@@ -18,14 +18,12 @@ <h2>{{ siae.kind }} {{ siae.display_name }}</h2>
     <ul class="s-tabs-01__nav nav nav-tabs" data-it-sliding-tabs="true" data-it-sliding-tabs-startindex="1">
         <li class="nav-item">
             <a class="nav-link" href="{% url 'companies_views:job_description_list' %}" {% matomo_event "employeurs" "clic" "voir-liste-metiers" %}>
-                <span>Métiers et recrutements</span>
-                <span class="badge badge-sm rounded-pill ms-2">{{ jobs_count }}</span>
+                Métiers et recrutements
             </a>
         </li>
         <li class="nav-item">
             <a class="nav-link active" href="{% url 'companies_views:members' %}" {% matomo_event "employeurs" "clic" "gerer-collaborateurs" %}>
-                <span>Collaborateurs</span>
-                <span class="badge badge-sm rounded-pill ms-2">{{ siae.active_members.count }}</span>
+                Collaborateurs
             </a>
         </li>
         {% if can_show_financial_annexes %}

diff --git a/itou/templates/companies/show_financial_annexes.html b/itou/templates/companies/show_financial_annexes.html
@@ -40,14 +40,12 @@ <h2>{{ siae.kind }} {{ siae.display_name }}</h2>
     <ul class="s-tabs-01__nav nav nav-tabs" data-it-sliding-tabs="true" data-it-sliding-tabs-startindex="2">
         <li class="nav-item">
             <a class="nav-link" href="{% url 'companies_views:job_description_list' %}" {% matomo_event "employeurs" "clic" "voir-liste-metiers" %}>
-                <span>Métiers et recrutements</span>
-                <span class="badge badge-sm rounded-pill ms-2">{{ jobs_count }}</span>
+                Métiers et recrutements
             </a>
         </li>
         <li class="nav-item">
             <a class="nav-link" href="{% url 'companies_views:members' %}" {% matomo_event "employeurs" "clic" "gerer-collaborateurs" %}>
-                <span>Collaborateurs</span>
-                <span class="badge badge-sm rounded-pill ms-2">{{ members_count }}</span>
+                Collaborateurs
             </a>
         </li>
         <li class="nav-item">

diff --git a/itou/www/companies_views/views.py b/itou/www/companies_views/views.py
@@ -17,7 +17,7 @@
 from itou.cities.models import City
 from itou.common_apps.address.departments import department_from_postcode
 from itou.common_apps.organizations.views import deactivate_org_member, update_org_admin_role
-from itou.companies.models import Company, CompanyMembership, JobDescription, SiaeFinancialAnnex
+from itou.companies.models import Company, JobDescription, SiaeFinancialAnnex
 from itou.jobs.models import Appellation
 from itou.users.models import User
 from itou.utils import constants as global_constants
@@ -237,7 +237,6 @@ def job_description_list(request, template_name="companies/job_description_list.
         "form": form,
         "job_pager": job_pager,
         "page": page,
-        "members_count": CompanyMembership.objects.filter(company_id=company.pk).active().count(),
         "can_show_financial_annexes": company.convention_can_be_accessed_by(request.user),
         "back_url": reverse("dashboard:index"),
     }
@@ -397,8 +396,6 @@ def show_financial_annexes(request, template_name="companies/show_financial_anne
         "can_select_af": current_siae.convention_can_be_changed_by(request.user),
         "siae_is_asp": current_siae.source == Company.SOURCE_ASP,
         "siae_is_user_created": current_siae.source == Company.SOURCE_USER_CREATED,
-        "jobs_count": JobDescription.objects.filter(company_id=current_siae.pk).count(),
-        "members_count": CompanyMembership.objects.filter(company_id=current_siae.pk).active().count(),
         "back_url": reverse("dashboard:index"),
     }
     return render(request, template_name, context)
@@ -626,7 +623,6 @@ def members(request, template_name="companies/members.html"):
         "members": active_company_members,
         "members_stats": active_company_members_stats,
         "pending_invitations": pending_invitations,
-        "jobs_count": JobDescription.objects.filter(company_id=company.pk).count(),
         "can_show_financial_annexes": company.convention_can_be_accessed_by(request.user),
         "back_url": reverse("dashboard:index"),
     }

diff --git a/tests/www/dashboard/test_dashboard.py b/tests/www/dashboard/test_dashboard.py
@@ -23,30 +23,30 @@
 from itou.users.enums import Title
 from itou.utils import constants as global_constants
 from itou.utils.models import InclusiveDateRange
-from itou.utils.templatetags.format_filters import (format_approval_number,
-                                                    format_siret)
-from tests.approvals.factories import (ApprovalFactory,
-                                       ProlongationRequestFactory)
-from tests.companies.factories import (CompanyAfterGracePeriodFactory,
-                                       CompanyFactory,
-                                       CompanyMembershipFactory,
-                                       CompanyPendingGracePeriodFactory)
+from itou.utils.templatetags.format_filters import format_approval_number, format_siret
+from tests.approvals.factories import ApprovalFactory, ProlongationRequestFactory
+from tests.companies.factories import (
+    CompanyAfterGracePeriodFactory,
+    CompanyFactory,
+    CompanyMembershipFactory,
+    CompanyPendingGracePeriodFactory,
+)
 from tests.employee_record.factories import EmployeeRecordFactory
 from tests.files.factories import FileFactory
-from tests.geiq.factories import (ImplementationAssessmentCampaignFactory,
-                                  ImplementationAssessmentFactory)
-from tests.institutions.factories import (InstitutionFactory,
-                                          InstitutionMembershipFactory,
-                                          LaborInspectorFactory)
+from tests.geiq.factories import ImplementationAssessmentCampaignFactory, ImplementationAssessmentFactory
+from tests.institutions.factories import InstitutionFactory, InstitutionMembershipFactory, LaborInspectorFactory
 from tests.job_applications.factories import JobApplicationFactory
 from tests.prescribers import factories as prescribers_factories
 from tests.siae_evaluations.factories import (
-    EvaluatedAdministrativeCriteriaFactory, EvaluatedJobApplicationFactory,
-    EvaluatedSiaeFactory, EvaluationCampaignFactory)
-from tests.users.factories import (EmployerFactory, JobSeekerFactory,
-                                   PrescriberFactory)
+    EvaluatedAdministrativeCriteriaFactory,
+    EvaluatedJobApplicationFactory,
+    EvaluatedSiaeFactory,
+    EvaluationCampaignFactory,
+)
+from tests.users.factories import EmployerFactory, JobSeekerFactory, PrescriberFactory
 from tests.utils.test import TestCase, parse_response_to_soup
 
+
 DISABLED_NIR = 'disabled aria-describedby="id_nir_helptext" id="id_nir"'