diff --git a/itou/templates/companies/job_description_list.html b/itou/templates/companies/job_description_list.html
index 7759497f3c..9a9072e8c6 100644
--- a/itou/templates/companies/job_description_list.html
+++ b/itou/templates/companies/job_description_list.html
@@ -19,14 +19,12 @@
{{ siae.kind }} {{ siae.display_name }}
-
- Métiers et recrutements
- {{ job_pager.paginator.count }}
+ Métiers et recrutements
-
- Collaborateurs
- {{ members_count }}
+ Collaborateurs
{% if can_show_financial_annexes %}
diff --git a/itou/templates/companies/members.html b/itou/templates/companies/members.html
index 2a8585e0d7..3f0fc8a365 100644
--- a/itou/templates/companies/members.html
+++ b/itou/templates/companies/members.html
@@ -18,14 +18,12 @@ {{ siae.kind }} {{ siae.display_name }}
-
- Métiers et recrutements
- {{ jobs_count }}
+ Métiers et recrutements
-
- Collaborateurs
- {{ siae.active_members.count }}
+ Collaborateurs
{% if can_show_financial_annexes %}
diff --git a/itou/templates/companies/show_financial_annexes.html b/itou/templates/companies/show_financial_annexes.html
index 4e64cd47b5..233131b3ef 100644
--- a/itou/templates/companies/show_financial_annexes.html
+++ b/itou/templates/companies/show_financial_annexes.html
@@ -40,14 +40,12 @@ {{ siae.kind }} {{ siae.display_name }}
-
- Métiers et recrutements
- {{ jobs_count }}
+ Métiers et recrutements
-
- Collaborateurs
- {{ members_count }}
+ Collaborateurs
-
diff --git a/itou/www/companies_views/views.py b/itou/www/companies_views/views.py
index b6147ed6c6..7a6fcd5104 100644
--- 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
index 520330070e..efeda3adeb 100644
--- 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"'