+
+
-{% endblock content%}
+
+
+
+
+
+
+
+
+
+ {% if active_filters_list %}
+
+
{% translate "Filtres actifs" %}:
+ {% for filter in active_filters_list %}
+
+ {% if filter.is_status %}
+ {{ filter.label }}
+ {% else %}
+ {{ filter.label }}
+ {% endif %}
+
+
+ {% endfor %}
+
+ {% translate "Tout effacer" %}
+
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+ {% if orders_paginator.count > 0 %}
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+ |
+ {% translate "Numéro" %} |
+ {% translate "Description" %} |
+ {% translate "Thématiques" %} |
+ {% translate "Prestataire" %} |
+ {% translate "Début" %} |
+ {% translate "Fin" %} |
+
+
+
+ {% for contract in contracts_page %}
+
+ |
+
+
+
+ |
+
+
+ {{ contract.contract_number }}
+
+ |
+
+ {{ contract.description|default:"-"|truncatechars:90 }}
+ |
+
+
+ {% for thematic in contract.thematics.all %}
+
+ {% if thematic.icon %}{% endif %}{{ thematic.name }}
+
+ {% empty %}
+ –
+ {% endfor %}
+
+ |
+ {{ contract.company.name }} |
+ {{ contract.start_date|date:"d/m/Y" }} |
+ {{ contract.end_date|date:"d/m/Y" }} |
+
+ {% empty %}
+
+ |
+
+ |
+
+ {% endfor %}
+
+
+
+
+
+ {% if contracts_paginator.count > 0 %}
+
+ {% endif %}
+
+
+
+
+
+
+{% endblock content %}
{% block script %}
-
-
-
+
{% endblock script %}
\ No newline at end of file
diff --git a/loko/contracts/tests.py b/loko/contracts/tests.py
index 03fefea..7859d55 100644
--- a/loko/contracts/tests.py
+++ b/loko/contracts/tests.py
@@ -802,6 +802,121 @@ class GlobalPostsAndPricesPermissionsTests(TestCase):
self.assertEqual(data['posts'][0]['unit_price'], '10.50')
+class ContractsIndexViewTests(TestCase):
+ def setUp(self):
+ from decimal import Decimal
+ from common.models import Thematic, Role, UserConfig
+ from contracts.models import ContractOrder
+ from datetime import date, timedelta
+
+ self.user = User.objects.create_superuser(username="admin_contracts", password="password123")
+ self.config = UserConfig.objects.create(user=self.user)
+ role_admin = Role.objects.create(name="admin")
+ self.config.roles.add(role_admin)
+
+ self.company = Company.objects.create(name="Acme Infra")
+ self.thematic_green = Thematic.objects.create(code="green_test", name_fr="Espaces Verts", name_nl="Groene Ruimten")
+ self.thematic_roads = Thematic.objects.create(code="roads_test", name_fr="Voiries", name_nl="Wegen")
+
+ today = date(2026, 1, 15)
+ self.contract_green = Contract.objects.create(
+ company=self.company,
+ contract_number="CTR-VERT-001",
+ start_date=today,
+ end_date=today + timedelta(days=365),
+ description="Entretien des espaces verts"
+ )
+ self.contract_green.thematics.add(self.thematic_green)
+
+ self.contract_roads = Contract.objects.create(
+ company=self.company,
+ contract_number="CTR-VOIRIE-002",
+ start_date=today,
+ end_date=today + timedelta(days=365),
+ description="Réparation voiries"
+ )
+ self.contract_roads.thematics.add(self.thematic_roads)
+
+ # Créer 60 commandes pour tester la pagination et les filtres
+ orders_to_create = []
+ for i in range(1, 61):
+ target_contract = self.contract_green if i <= 40 else self.contract_roads
+ st = 'cancelled' if i == 1 else ('completed' if i % 2 == 0 else 'pending')
+ orders_to_create.append(ContractOrder(
+ contract=target_contract,
+ order_code=f"CMD-{i:03d}",
+ description=f"Commande spéciale numéro {i}" if i == 5 else f"Travaux réguliers {i}",
+ order_date=today + timedelta(days=i),
+ delivery_date=today + timedelta(days=i + 10),
+ order_status=st,
+ total_amount=Decimal(f"{100 + i}.00")
+ ))
+ ContractOrder.objects.bulk_create(orders_to_create)
+
+ self.client = Client()
+ self.client.force_login(self.user)
+
+ def test_contracts_index_renders_and_paginates(self):
+ url = reverse('contracts:contracts_index')
+ resp = self.client.get(url)
+ self.assertEqual(resp.status_code, 200)
+ self.assertTemplateUsed(resp, 'contracts/contracts_index.html')
+
+ # Par défaut, page 1 avec 50 commandes sur les 59 éligibles (1 annulée exclue par défaut)
+ orders_page = resp.context['orders_page']
+ self.assertEqual(len(orders_page), 50)
+ self.assertTrue(orders_page.has_next())
+ self.assertEqual(resp.context['orders_paginator'].count, 59)
+
+ # Page 2
+ resp_p2 = self.client.get(url, {'page': 2})
+ self.assertEqual(resp_p2.status_code, 200)
+ orders_page_2 = resp_p2.context['orders_page']
+ self.assertEqual(len(orders_page_2), 9)
+
+ def test_contracts_index_filter_status(self):
+ url = reverse('contracts:contracts_index')
+ resp = self.client.get(url, {'status': ['cancelled']})
+ self.assertEqual(resp.status_code, 200)
+ orders_page = resp.context['orders_page']
+ self.assertEqual(len(orders_page), 1)
+ self.assertEqual(orders_page[0].order_code, "CMD-001")
+
+ def test_contracts_index_filter_thematics(self):
+ url = reverse('contracts:contracts_index')
+ resp = self.client.get(url, {'thematic': [str(self.thematic_roads.id)]})
+ self.assertEqual(resp.status_code, 200)
+ # Il y a 20 commandes roads (41 à 60), toutes non annulées
+ self.assertEqual(resp.context['orders_paginator'].count, 20)
+
+ def test_contracts_index_filter_contract(self):
+ url = reverse('contracts:contracts_index')
+ resp = self.client.get(url, {'contract': [str(self.contract_roads.id)]})
+ self.assertEqual(resp.status_code, 200)
+ self.assertEqual(resp.context['orders_paginator'].count, 20)
+
+ def test_contracts_index_search(self):
+ url = reverse('contracts:contracts_index')
+ resp = self.client.get(url, {'search': 'spéciale'})
+ self.assertEqual(resp.status_code, 200)
+ self.assertEqual(resp.context['orders_paginator'].count, 1)
+ self.assertEqual(resp.context['orders_page'][0].order_code, 'CMD-005')
+
+ def test_contracts_index_custom_page_size(self):
+ url = reverse('contracts:contracts_index')
+ resp = self.client.get(url, {'page_size': 25})
+ self.assertEqual(resp.status_code, 200)
+ self.assertEqual(len(resp.context['orders_page']), 25)
+
+ def test_contracts_index_sorting(self):
+ url = reverse('contracts:contracts_index')
+ resp = self.client.get(url, {'sort': 'code', 'dir': 'asc'})
+ self.assertEqual(resp.status_code, 200)
+ # Premier élément doit être CMD-002 car CMD-001 est cancelled
+ self.assertEqual(resp.context['orders_page'][0].order_code, 'CMD-002')
+
+
+
diff --git a/loko/contracts/views.py b/loko/contracts/views.py
index 5f8a287..39dc3cf 100644
--- a/loko/contracts/views.py
+++ b/loko/contracts/views.py
@@ -3,6 +3,7 @@ from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.views.decorators.http import require_GET, require_POST
from django.http import JsonResponse, FileResponse, Http404
+from django.core.paginator import Paginator
from django.core.exceptions import PermissionDenied
from django.urls import reverse
from django.utils.encoding import smart_str
@@ -27,6 +28,7 @@ from contracts.models import (
ContractOrderAttachment,
DirectOrderPost,
DIRECT_ORDER_POST_STATUS_CHOICES,
+ CONTRACT_ORDER_STATUS_CHOICES,
)
from contracts.forms import ContractOrderForm, ContractOrderQuoteQuantityForm, ClaimDeclarationAttachmentForm, ContractOrderAttachmentForm
from contracts.permissions import get_allowed_contracts_for_user, contract_view_required, order_view_required, user_can_generate_order_documents
@@ -39,39 +41,251 @@ from contracts.views_pdf_reports import (
generate_documents_for_order,
)
-from common.models import UserConfig, UserThematics
+from common.models import UserConfig, UserThematics, Thematic
from common.private_files.helpers import build_private_url
from interventions.permissions import can_add_intervention
+@login_required
def contracts_index(request):
contracts = get_allowed_contracts_for_user(request.user)
-
+ contracts = contracts.select_related('company').prefetch_related('thematics').defer('geom')
+
+ active_tab = request.GET.get('tab', 'orders')
+ if active_tab not in ('orders', 'contracts'):
+ active_tab = 'orders'
+
+ # Choix disponibles pour les filtres
+ available_thematics = Thematic.objects.filter(contracts__in=contracts).distinct().order_by('name_fr')
+ available_contracts = contracts.order_by('contract_number')
+
+ # Recherche textuelle
+ search_query = request.GET.get('search', '').strip()
+
# Filtrage par statut(s)
+ has_status_param = 'status' in request.GET
status_filters = request.GET.getlist('status')
- if status_filters == []:
- # Par défaut, afficher les commandes en 'pending' et 'sent'
+ if not has_status_param:
+ # Par défaut, afficher les commandes en 'pending', 'sent', 'completed' et 'invoiced'
status_filters = ['pending', 'sent', 'completed', 'invoiced']
- orders = orders = ContractOrder.objects.filter(contract__in=contracts, order_status__in=status_filters)
-
+ # Filtrage par thématique(s)
+ selected_thematics = request.GET.getlist('thematic')
+
+ # Filtrage par marché(s)
+ selected_contracts = request.GET.getlist('contract')
+
# Filtrage par date
- date_from = request.GET.get('date_from', '')
+ date_from = request.GET.get('date_from', '').strip()
+ date_to = request.GET.get('date_to', '').strip()
+
+ # Taille de page
+ try:
+ page_size = int(request.GET.get('page_size', 50))
+ if page_size not in (25, 50, 100):
+ page_size = 50
+ except (ValueError, TypeError):
+ page_size = 50
+
+ # Tri des commandes
+ sort_field = request.GET.get('sort', 'date')
+ sort_dir = request.GET.get('dir', 'desc')
+ if sort_dir not in ('asc', 'desc'):
+ sort_dir = 'desc'
+
+ sort_mapping = {
+ 'code': 'order_code',
+ 'description': 'description',
+ 'date': 'order_date',
+ 'status': 'order_status',
+ 'contract': 'contract__contract_number',
+ 'company': 'contract__company__name',
+ 'amount': 'total_amount',
+ }
+ db_sort_col = sort_mapping.get(sort_field, 'order_date')
+ order_by_arg = db_sort_col if sort_dir == 'asc' else f"-{db_sort_col}"
+
+ # Construction de la requête commandes optimisée
+ orders = ContractOrder.objects.filter(contract__in=contracts)
+
+ if status_filters:
+ orders = orders.filter(order_status__in=status_filters)
+
+ if selected_thematics:
+ orders = orders.filter(
+ Q(contract__thematics__id__in=selected_thematics) |
+ Q(contract__thematics__code__in=selected_thematics)
+ )
+
+ if selected_contracts:
+ orders = orders.filter(contract_id__in=selected_contracts)
+
if date_from:
orders = orders.filter(order_date__gte=date_from)
-
- date_to = request.GET.get('date_to', '')
if date_to:
orders = orders.filter(order_date__lte=date_to)
-
- # Tri par date décroissante
- orders = orders.order_by('-order_date')
-
+
+ if search_query:
+ orders = orders.filter(
+ Q(order_code__icontains=search_query) |
+ Q(description__icontains=search_query) |
+ Q(contract__contract_number__icontains=search_query) |
+ Q(contract__description__icontains=search_query) |
+ Q(contract__company__name__icontains=search_query)
+ )
+
+ orders = orders.distinct().select_related(
+ 'contract',
+ 'contract__company',
+ 'ordered_by'
+ ).defer('contract__geom').order_by(order_by_arg, '-id')
+
+ # Pagination des commandes
+ orders_paginator = Paginator(orders, page_size)
+ orders_page_num = request.GET.get('page', 1)
+ orders_page = orders_paginator.get_page(orders_page_num)
+ orders_elided_range = orders_paginator.get_elided_page_range(orders_page.number, on_each_side=2, on_ends=1)
+
+ # Construction de la requête marchés/contrats
+ contracts_qs = contracts
+ if search_query:
+ contracts_qs = contracts_qs.filter(
+ Q(contract_number__icontains=search_query) |
+ Q(description__icontains=search_query) |
+ Q(company__name__icontains=search_query)
+ )
+ if selected_thematics:
+ contracts_qs = contracts_qs.filter(
+ Q(thematics__id__in=selected_thematics) |
+ Q(thematics__code__in=selected_thematics)
+ )
+ contracts_qs = contracts_qs.distinct().order_by('-start_date')
+
+ contracts_paginator = Paginator(contracts_qs, 25)
+ contracts_page_num = request.GET.get('contracts_page', 1)
+ contracts_page = contracts_paginator.get_page(contracts_page_num)
+ contracts_elided_range = contracts_paginator.get_elided_page_range(contracts_page.number, on_each_side=2, on_ends=1)
+
+ # Liste des filtres actifs pour affichage sous forme de badges
+ active_filters_list = []
+ if search_query:
+ active_filters_list.append({
+ 'type': 'search',
+ 'label': f'"{search_query}"',
+ 'param': 'search',
+ 'val': search_query,
+ })
+ if has_status_param:
+ status_dict = dict(CONTRACT_ORDER_STATUS_CHOICES)
+ for s in status_filters:
+ active_filters_list.append({
+ 'type': 'status',
+ 'label': str(status_dict.get(s, s)),
+ 'param': 'status',
+ 'val': s,
+ 'status_class': s,
+ 'is_status': True,
+ })
+ if selected_thematics:
+ thematic_names = {str(t.id): t.name for t in available_thematics}
+ thematic_names.update({t.code: t.name for t in available_thematics})
+ for th in selected_thematics:
+ active_filters_list.append({
+ 'type': 'thematic',
+ 'label': thematic_names.get(str(th), str(th)),
+ 'param': 'thematic',
+ 'val': th,
+ })
+ if selected_contracts:
+ contract_names = {str(c.id): f"{c.contract_number} ({c.company.name})" for c in available_contracts}
+ for cid in selected_contracts:
+ active_filters_list.append({
+ 'type': 'contract',
+ 'label': contract_names.get(str(cid), str(cid)),
+ 'param': 'contract',
+ 'val': cid,
+ })
+ if date_from:
+ active_filters_list.append({
+ 'type': 'date_from',
+ 'label': f"≥ {date_from}",
+ 'param': 'date_from',
+ 'val': date_from,
+ })
+ if date_to:
+ active_filters_list.append({
+ 'type': 'date_to',
+ 'label': f"≤ {date_to}",
+ 'param': 'date_to',
+ 'val': date_to,
+ })
+
+ active_filters_count = len(active_filters_list)
+
+ # Query strings pour les liens de pagination (en préservant les autres paramètres)
+ p_orders = request.GET.copy()
+ if 'page' in p_orders:
+ del p_orders['page']
+ orders_querystring = p_orders.urlencode()
+
+ p_contracts = request.GET.copy()
+ if 'contracts_page' in p_contracts:
+ del p_contracts['contracts_page']
+ contracts_querystring = p_contracts.urlencode()
+
+ # Générateur d'URLs de tri
+ def build_sort_url(col):
+ next_dir = 'asc' if (sort_field == col and sort_dir == 'desc') else 'desc'
+ p = request.GET.copy()
+ p['sort'] = col
+ p['dir'] = next_dir
+ if 'page' in p:
+ del p['page']
+ return f"?{p.urlencode()}"
+
+ sort_urls = {col: build_sort_url(col) for col in ('code', 'description', 'date', 'status', 'contract', 'amount')}
+
+ # Vérification des droits pour voir les prix
+ can_view_prices = False
+ if request.user.is_superuser:
+ can_view_prices = True
+ else:
+ try:
+ cfg = request.user.config
+ can_view_prices = getattr(cfg, 'can_view_all_prices', False) or bool(
+ set(cfg.roles.values_list('name', flat=True)).intersection({'admin', 'top_manager'})
+ )
+ except Exception:
+ pass
+
context = {
'contracts': contracts,
- 'orders': orders,
+ 'orders_page': orders_page,
+ 'orders_elided_range': orders_elided_range,
+ 'orders_paginator': orders_paginator,
+ 'contracts_page': contracts_page,
+ 'contracts_elided_range': contracts_elided_range,
+ 'contracts_paginator': contracts_paginator,
+ 'available_thematics': available_thematics,
+ 'available_contracts': available_contracts,
+ 'status_choices': CONTRACT_ORDER_STATUS_CHOICES,
+ 'selected_statuses': status_filters,
+ 'selected_thematics': selected_thematics,
+ 'selected_contracts': selected_contracts,
+ 'search_query': search_query,
+ 'date_from': date_from,
+ 'date_to': date_to,
+ 'page_size': page_size,
+ 'sort_field': sort_field,
+ 'sort_dir': sort_dir,
+ 'sort_urls': sort_urls,
+ 'active_tab': active_tab,
+ 'active_filters_list': active_filters_list,
+ 'active_filters_count': active_filters_count,
+ 'orders_querystring': orders_querystring,
+ 'contracts_querystring': contracts_querystring,
'is_add_order_allowed': user_can_add_order(request.user),
- 'selected_statuses': status_filters, # Passer les statuts sélectionnés au template
+ 'can_view_prices': can_view_prices,
}
return render(request, "contracts/contracts_index.html", context)