From 6782959253b92a75b45d16de5e91c915cdc521fb Mon Sep 17 00:00:00 2001 From: kdeterme Date: Wed, 30 Sep 2026 18:55:56 +0200 Subject: [PATCH] feat(home): filter controller shortcuts link by assigned controller and remove sub-counters - Remove 'to_be_corrected' and 'validated' sub-counters from controller shortcuts widget - Include assigned_controller parameter in widget URL using the new role-person filter - Update ControllerShortcutsWidgetTests to assert URL parameter and absence of sub-counters --- .../home/widgets/controller_shortcuts.html | 18 ++------- loko/home/tests.py | 6 ++- loko/home/views.py | 37 ++++++++++--------- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/loko/home/templates/home/widgets/controller_shortcuts.html b/loko/home/templates/home/widgets/controller_shortcuts.html index 7f4c537..aa49f67 100644 --- a/loko/home/templates/home/widgets/controller_shortcuts.html +++ b/loko/home/templates/home/widgets/controller_shortcuts.html @@ -3,7 +3,7 @@ {# ========== Widget raccourcis pour les contrôleurs ========== #}
- {% translate "Interventions à contrôler" %} @@ -13,23 +13,13 @@
- {# --- Compteur principal et sous-raccourcis --- #} + {# --- Compteur principal --- #}
- {{ controller_interventions_count }}
{% translate "en attente de contrôle" %}
 -
- - {% translate "À corriger" %} ({{ controller_to_correct_count|default:0 }}) - - - {% translate "Validées" %} ({{ controller_validated_count|default:0 }}) - -
{# --- Liste des 5 premières interventions --- #} @@ -64,7 +54,7 @@
- {% translate "Voir toutes les interventions à contrôler" %} diff --git a/loko/home/tests.py b/loko/home/tests.py index 9e0f532..f9cbcb5 100644 --- a/loko/home/tests.py +++ b/loko/home/tests.py @@ -447,7 +447,11 @@ class ControllerShortcutsWidgetTests(TestCase): self.assertContains(response, 'ITV-CTRL-000') self.assertContains(response, 'ITV-CTRL-001') self.assertContains(response, 'ITV-CTRL-002') - self.assertContains(response, 'status=finished&status=processed&status=corrected') + self.assertContains(response, f'assigned_controller={self.member.id}') + self.assertNotContains(response, 'À corriger') + self.assertNotContains(response, 'Validées') + self.assertNotIn('controller_to_correct_count', response.context) + self.assertNotIn('controller_validated_count', response.context) class StockSummaryWidgetTests(TestCase): diff --git a/loko/home/views.py b/loko/home/views.py index 3891fec..0f85272 100644 --- a/loko/home/views.py +++ b/loko/home/views.py @@ -25,7 +25,7 @@ def _t(label, t0, splits): from interventions.models import Intervention, InterventionTimeLine, STATUS_ORDERS, Symptom from common.models import UserConfig, UserThematics, UserContractAccess -from contracts.models import CompanyMember, Contract +from contracts.models import CompanyMember, CompanyTeam, Contract from contracts.permissions import get_allowed_contracts_for_user from home.models import HomeWidget from observations.models import Observation @@ -674,14 +674,22 @@ def index(request): # ========== Données widget controller_shortcuts ========== user_role_names = set(user_config.roles.values_list('name', flat=True)) if user_config else set() controller_filter = Q(status__in=['finished', 'processed', 'corrected']) + + controller_member = ( + CompanyMember.objects.filter( + user=request.user, + teams__operation_types__contains=[CompanyTeam.OPERATION_CONTROLS] + ).first() + or CompanyMember.objects.filter(user=request.user).first() + ) + controller_member_id = controller_member.id if controller_member else None + if not (user_role_names & {'admin', 'top_manager', 'manager'}): - control_team_ids = list(user_teams.values_list('id', flat=True)) if (user_teams and user_teams.exists()) else [] - controller_q = Q(assigned_controller__user=request.user) - if control_team_ids: - controller_q |= Q(assigned_control_team_id__in=control_team_ids) + if controller_member: + controller_q = Q(assigned_controller=controller_member) + else: + controller_q = Q(assigned_controller__user=request.user) controller_filter &= controller_q - else: - controller_q = None controller_interventions_qs = interventions.filter(controller_filter) controller_interventions_count = controller_interventions_qs.count() @@ -691,15 +699,9 @@ def index(request): .order_by('-code')[:5] ) - controller_to_correct_qs = interventions.filter(status='to_be_corrected') - if controller_q is not None: - controller_to_correct_qs = controller_to_correct_qs.filter(controller_q) - controller_to_correct_count = controller_to_correct_qs.count() - - controller_validated_qs = interventions.filter(status='validated') - if controller_q is not None: - controller_validated_qs = controller_validated_qs.filter(controller_q) - controller_validated_count = controller_validated_qs.count() + controller_shortcuts_url = reverse('interventions:interventions_index') + '?status=finished&status=processed&status=corrected' + if controller_member_id: + controller_shortcuts_url += f'&assigned_controller={controller_member_id}' # ========== Données widget external_interventions ========== user_company_ids = set() @@ -859,8 +861,7 @@ def index(request): 'external_interventions_list': external_interventions_list, 'controller_interventions_count': controller_interventions_count, 'controller_interventions_list': controller_interventions_list, - 'controller_to_correct_count': controller_to_correct_count, - 'controller_validated_count': controller_validated_count, + 'controller_shortcuts_url': controller_shortcuts_url, } # ── Logging de performance (désactivé) ────────────────────────────────