-
diff --git a/loko/home/templates/home/widgets/user_history.html b/loko/home/templates/home/widgets/user_history.html
new file mode 100644
index 0000000..9251646
--- /dev/null
+++ b/loko/home/templates/home/widgets/user_history.html
@@ -0,0 +1,161 @@
+{% load i18n %}
+{% load static %}
+
+
+
+
+
+ {% if user_recent_history %}
+
+ {% else %}
+
+
+
{% translate "Aucun élément consulté récemment" %}
+
+ {% translate "Vos consultations d'interventions et de contrats apparaîtront ici pour un accès rapide." %}
+
+
+ {% translate "Rechercher une intervention" %}
+
+
+ {% endif %}
+
+
+
+
+
+
diff --git a/loko/home/views.py b/loko/home/views.py
index 5d826c6..219df1f 100644
--- a/loko/home/views.py
+++ b/loko/home/views.py
@@ -10,8 +10,11 @@ from datetime import timedelta
from collections import defaultdict
import json
import logging
+import re
import time
+logger = logging.getLogger(__name__)
+
# logger = logging.getLogger('home.perf')
@@ -84,6 +87,19 @@ def index(request):
if result:
resolved_widgets.append(result)
+ # Fallback pour le rôle viewer : s'assurer que le widget d'historique s'affiche toujours
+ if not any(r['widget'].widget_code == 'user_history' for r in resolved_widgets):
+ user_roles_set = set(user_config.roles.values_list('name', flat=True))
+ if 'viewer' in user_roles_set and not (user_roles_set & {'admin', 'manager', 'controller', 'operator', 'inspector'}):
+ user_history_widget = HomeWidget.objects.filter(widget_code='user_history').first() or HomeWidget(widget_code='user_history')
+ resolved_widgets.append({
+ 'widget': user_history_widget,
+ 'order': 20,
+ 'template_name': 'home/widgets/user_history.html',
+ 'col_width': 12,
+ 'col_order': 0,
+ })
+
resolved_widgets.sort(key=lambda r: (r['order'], r['col_order']))
# Group widgets by order into rows; within each row sort by col_order.
@@ -786,10 +802,12 @@ def index(request):
territory_kpis = _get_territory_kpis(request.user, user_contracts)
recent_activity = _get_recent_activity(request.user, user_contracts)
+ user_recent_history = _get_user_recent_history(request.user)
context = {
'territory_kpis': territory_kpis,
'recent_activity': recent_activity,
+ 'user_recent_history': user_recent_history,
'is_inspector': is_inspector,
'inspection_configs': inspection_configs,
'series_data': json.dumps(series_data),
@@ -1230,6 +1248,118 @@ def _get_recent_activity(user, allowed_contracts):
return recent_items
+def _get_user_recent_history(user, limit=10):
+ """
+ Rassemble l'historique des dernières consultations (interventions et contrats)
+ de l'utilisateur, vérifié selon ses droits d'accès.
+ """
+ try:
+ from analytics.models import PageView
+ views = (
+ PageView.objects.filter(
+ user=user,
+ method='GET',
+ path__regex=r"^/(interventions|contracts)/[0-9]+/?$"
+ )
+ .order_by('-timestamp')[:40]
+ )
+
+ seen_paths = set()
+ items = []
+ for v in views:
+ clean_path = v.path.rstrip('/') + '/'
+ if clean_path in seen_paths:
+ continue
+ seen_paths.add(clean_path)
+
+ m = re.match(r"^/(interventions|contracts)/([0-9]+)/$", clean_path)
+ if not m:
+ continue
+ items.append({
+ 'type': m.group(1),
+ 'id': int(m.group(2)),
+ 'timestamp': v.timestamp,
+ 'path': clean_path,
+ })
+ if len(items) >= limit:
+ break
+
+ interv_ids = [it['id'] for it in items if it['type'] == 'interventions']
+ contract_ids = [it['id'] for it in items if it['type'] == 'contracts']
+
+ interv_map = {}
+ if interv_ids:
+ from interventions.permissions import filter_viewable_interventions_for_user
+ interv_qs = filter_viewable_interventions_for_user(user).filter(
+ id__in=interv_ids
+ ).select_related('thematic')
+ interv_map = {i.id: i for i in interv_qs}
+
+ contract_map = {}
+ if contract_ids:
+ from contracts.permissions import get_allowed_contracts_for_user
+ allowed_contracts = get_allowed_contracts_for_user(user)
+ contract_qs = Contract.objects.filter(
+ id__in=contract_ids
+ ).filter(id__in=allowed_contracts).select_related('company')
+ contract_map = {c.id: c for c in contract_qs}
+
+ now = timezone.now()
+ result = []
+ for it in items:
+ if it['type'] == 'interventions' and it['id'] in interv_map:
+ interv = interv_map[it['id']]
+ diff = now - it['timestamp']
+ if diff.days == 0:
+ hours = int(diff.total_seconds() // 3600)
+ relative_time = "Il y a 1h" if hours <= 1 else f"Il y a {hours}h" if hours > 0 else "À l'instant"
+ elif diff.days == 1:
+ relative_time = "Hier"
+ elif diff.days < 7:
+ relative_time = f"Il y a {diff.days}j"
+ else:
+ relative_time = it['timestamp'].strftime("%d/%m/%Y")
+
+ result.append({
+ 'type': 'intervention',
+ 'id': interv.id,
+ 'title': interv.title or f"Intervention #{interv.code or interv.id}",
+ 'subtitle': interv.thematic.name if interv.thematic else '',
+ 'status': interv.get_status_display(),
+ 'status_code': interv.status,
+ 'url': reverse('interventions:intervention_detail', args=[interv.id]),
+ 'timestamp': it['timestamp'],
+ 'relative_time': relative_time,
+ })
+ elif it['type'] == 'contracts' and it['id'] in contract_map:
+ contract = contract_map[it['id']]
+ diff = now - it['timestamp']
+ if diff.days == 0:
+ hours = int(diff.total_seconds() // 3600)
+ relative_time = "Il y a 1h" if hours <= 1 else f"Il y a {hours}h" if hours > 0 else "À l'instant"
+ elif diff.days == 1:
+ relative_time = "Hier"
+ elif diff.days < 7:
+ relative_time = f"Il y a {diff.days}j"
+ else:
+ relative_time = it['timestamp'].strftime("%d/%m/%Y")
+
+ result.append({
+ 'type': 'contract',
+ 'id': contract.id,
+ 'title': f"Marché {contract.contract_number}",
+ 'subtitle': (contract.description[:60] + '...') if len(contract.description) > 60 else contract.description,
+ 'company': contract.company.name if contract.company else '',
+ 'url': reverse('contracts:contracts_detail', args=[contract.id]),
+ 'timestamp': it['timestamp'],
+ 'relative_time': relative_time,
+ })
+ return result
+ except Exception as e:
+ logger.warning(f"Error fetching user recent history: {e}")
+ return []
+
+
@login_required
def activity_geojson(request):
"""
diff --git a/loko/interventions/templates/interventions/intervention_detail.html b/loko/interventions/templates/interventions/intervention_detail.html
index eee6b9e..127a693 100644
--- a/loko/interventions/templates/interventions/intervention_detail.html
+++ b/loko/interventions/templates/interventions/intervention_detail.html
@@ -53,4 +53,22 @@
{% block script %}
{% include "interventions/detail/scripts.html" %}
+
{% endblock script %}