diff --git a/loko/interventions/models.py b/loko/interventions/models.py
index 47c4c3b..c1e91df 100644
--- a/loko/interventions/models.py
+++ b/loko/interventions/models.py
@@ -1331,7 +1331,7 @@ class InterventionTimeLine(models.Model):
def get_badge_class(self):
return {
'creation': 'bg-success',
- 'status_change': 'bg-primary',
+ 'status_change': 'bg-purple',
'assignment': 'bg-info text-dark',
'transfer': 'bg-warning text-dark',
'modification': 'bg-secondary',
diff --git a/loko/interventions/static/interventions/timeline.css b/loko/interventions/static/interventions/timeline.css
index 742d99a..2afcee2 100644
--- a/loko/interventions/static/interventions/timeline.css
+++ b/loko/interventions/static/interventions/timeline.css
@@ -237,3 +237,28 @@
margin-bottom: 0.25rem;
}
+/* Badges de l'historique : type d'événement & statut */
+.history-event-badge {
+ display: inline-block;
+ min-width: 85px;
+ text-align: center;
+ vertical-align: middle;
+}
+
+.history-status-badge {
+ display: inline-block;
+ width: 115px;
+ text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ vertical-align: middle;
+}
+
+/* Couleur violette/pourpre pour le badge et marqueur 'Statut' (absente des statuts d'intervention) */
+.bg-purple {
+ background-color: #6f42c1 !important;
+ color: #ffffff !important;
+}
+
+
diff --git a/loko/interventions/templates/interventions/detail/card_chronologie.html b/loko/interventions/templates/interventions/detail/card_chronologie.html
index ad3ac8e..9699847 100644
--- a/loko/interventions/templates/interventions/detail/card_chronologie.html
+++ b/loko/interventions/templates/interventions/detail/card_chronologie.html
@@ -55,43 +55,43 @@
{% if event.event_type == 'status_change' %}
- {% translate "Statut" %}
+ {% translate "Statut" %}
{% if event.from_status %}
- {{ event.get_from_status_display }}
+ {{ event.get_from_status_display }}
{% endif %}
- {{ event.get_to_status_display }}
+ {{ event.get_to_status_display }}
{% if event.event_description %}
({{ event.event_description }})
{% endif %}
{% elif event.event_type == 'assignment' %}
- {% translate "Assignation" %}
+ {% translate "Assignation" %}
{{ event.event_description|default:_("Assignation mise à jour") }}
{% elif event.event_type == 'creation' %}
- {% translate "Création" %}
+ {% translate "Création" %}
{% translate "Intervention initialisée" %}
{% if event.to_status %}
- {{ event.get_to_status_display }}
+ {{ event.get_to_status_display }}
{% endif %}
{% elif event.event_type == 'transfer' %}
- {% translate "Transfert" %}
+ {% translate "Transfert" %}
{{ event.event_description|default:_("Intervention transférée") }}
{% elif event.event_type == 'modification' %}
- {% translate "Modification" %}
+ {% translate "Modification" %}
{{ event.event_description|default:_("Attributs modifiés") }}
{% elif event.event_type == 'note' %}
- {% translate "Note" %}
+ {% translate "Note" %}
{{ event.event_description }}
{% elif event.event_type == 'document' %}
- {% translate "Document" %}
+ {% translate "Document" %}
{{ event.event_description }}
{% elif event.event_type == 'link' %}
- {% translate "Lien" %}
+ {% translate "Lien" %}
{{ event.event_description }}
{% else %}
- {{ event.get_event_type_display }}
+ {{ event.get_event_type_display }}
{% if event.to_status %}
- {{ event.get_to_status_display }}
+ {{ event.get_to_status_display }}
{% endif %}
{% endif %}
diff --git a/loko/interventions/templates/interventions/detail/styles.html b/loko/interventions/templates/interventions/detail/styles.html
index fe1cdcc..4b26e8d 100644
--- a/loko/interventions/templates/interventions/detail/styles.html
+++ b/loko/interventions/templates/interventions/detail/styles.html
@@ -582,4 +582,28 @@
padding-bottom: 0.25rem;
margin-bottom: 0.25rem;
}
+
+ /* Badges de l'historique : type d'événement & statut */
+ .history-event-badge {
+ display: inline-block;
+ min-width: 85px;
+ text-align: center;
+ vertical-align: middle;
+ }
+
+ .history-status-badge {
+ display: inline-block;
+ width: 115px;
+ text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ vertical-align: middle;
+ }
+
+ /* Couleur violette/pourpre pour le badge et marqueur 'Statut' (absente des statuts d'intervention) */
+ .bg-purple {
+ background-color: #6f42c1 !important;
+ color: #ffffff !important;
+ }
diff --git a/loko/interventions/tests/test_timeline_history.py b/loko/interventions/tests/test_timeline_history.py
index 54c3f3a..bb34cc4 100644
--- a/loko/interventions/tests/test_timeline_history.py
+++ b/loko/interventions/tests/test_timeline_history.py
@@ -88,7 +88,7 @@ class TimelineHistoryTests(TestCase):
self.assertTrue(event_status.is_default_visible)
self.assertFalse(event_status.is_modification)
self.assertFalse(event_status.is_assignment)
- self.assertEqual(event_status.get_badge_class(), 'bg-primary')
+ self.assertEqual(event_status.get_badge_class(), 'bg-purple')
self.assertEqual(event_status.get_icon(), 'bi-arrow-repeat')
# Assignment event
@@ -466,4 +466,8 @@ class TimelineHistoryTests(TestCase):
self.assertContains(response, 'data-event-type="note"')
self.assertContains(response, 'data-event-type="document"')
self.assertContains(response, 'data-event-type="link"')
+ self.assertContains(response, 'history-event-badge')
+ self.assertContains(response, 'history-status-badge')
+ self.assertContains(response, 'bg-purple')
+