diff --git a/loko/interventions/templates/interventions/detail/right_column.html b/loko/interventions/templates/interventions/detail/right_column.html index 5f2c598..f3c2637 100644 --- a/loko/interventions/templates/interventions/detail/right_column.html +++ b/loko/interventions/templates/interventions/detail/right_column.html @@ -575,8 +575,16 @@
-
    • +
    • @@ -602,8 +610,8 @@ {% for msg in discussion_messages %} {% if msg.is_system %}
    - - {{ msg.content }} + + {{ msg.content|safe }}
    {% else %} diff --git a/loko/interventions/templates/interventions/detail/scripts.html b/loko/interventions/templates/interventions/detail/scripts.html index dea2fb7..fa93bc9 100644 --- a/loko/interventions/templates/interventions/detail/scripts.html +++ b/loko/interventions/templates/interventions/detail/scripts.html @@ -1059,10 +1059,10 @@ document.addEventListener('DOMContentLoaded', function () { } if (headerIcon) { - if (data.flag === 'red') headerIcon.textContent = '🚩'; - else if (data.flag === 'orange') headerIcon.textContent = '🟧'; - else if (data.flag === 'green') headerIcon.textContent = '🟩'; - else headerIcon.textContent = '🏳️'; + if (data.flag === 'red') headerIcon.innerHTML = ''; + else if (data.flag === 'orange') headerIcon.innerHTML = ''; + else if (data.flag === 'green') headerIcon.innerHTML = ''; + else headerIcon.innerHTML = ''; } if (headerLabel) { headerLabel.textContent = data.flag_info.label || '{% translate "Statut" %}'; diff --git a/loko/interventions/templates/interventions/intervention_detail_mobile.html b/loko/interventions/templates/interventions/intervention_detail_mobile.html index c6d8c66..17f15a0 100644 --- a/loko/interventions/templates/interventions/intervention_detail_mobile.html +++ b/loko/interventions/templates/interventions/intervention_detail_mobile.html @@ -2575,8 +2575,16 @@
    -
    • +
    • @@ -2602,8 +2610,8 @@ {% for msg in discussion_messages %} {% if msg.is_system %}
    - - {{ msg.content }} + + {{ msg.content|safe }}
    {% else %} @@ -6731,10 +6739,10 @@ document.addEventListener('DOMContentLoaded', function () { } if (headerIcon) { - if (data.flag === 'red') headerIcon.textContent = '🚩'; - else if (data.flag === 'orange') headerIcon.textContent = '🟧'; - else if (data.flag === 'green') headerIcon.textContent = '🟩'; - else headerIcon.textContent = '🏳️'; + if (data.flag === 'red') headerIcon.innerHTML = ''; + else if (data.flag === 'orange') headerIcon.innerHTML = ''; + else if (data.flag === 'green') headerIcon.innerHTML = ''; + else headerIcon.innerHTML = ''; } if (headerLabel) { headerLabel.textContent = data.flag_info.label || '{% translate "Statut" %}'; diff --git a/loko/notifications/services.py b/loko/notifications/services.py index 958d80a..89fc4e3 100644 --- a/loko/notifications/services.py +++ b/loko/notifications/services.py @@ -488,20 +488,20 @@ def set_discussion_flag(discussion, flag, user=None): if new_flag: flag_label = dict(discussion.FLAG_CHOICES).get(new_flag, new_flag) if new_flag == 'red': - flag_icon = '🚩' + flag_icon = '' elif new_flag == 'orange': - flag_icon = '🟧' + flag_icon = '' elif new_flag == 'green': - flag_icon = '🟩' + flag_icon = '' else: - flag_icon = '🏷️' + flag_icon = '' content = _("{icon} {user} a défini le statut : {label}").format( icon=flag_icon, user=user_name, label=flag_label, ) else: - content = _("🏳️ {user} a retiré le drapeau de suivi.").format(user=user_name) + content = _(" {user} a retiré le drapeau de suivi.").format(user=user_name) sys_message = Message.objects.create( discussion=discussion, diff --git a/loko/notifications/templates/notifications/_new_discussion_modal.html b/loko/notifications/templates/notifications/_new_discussion_modal.html index 842f793..7b65128 100644 --- a/loko/notifications/templates/notifications/_new_discussion_modal.html +++ b/loko/notifications/templates/notifications/_new_discussion_modal.html @@ -13,23 +13,38 @@ {% csrf_token %}
    -
    +
    -
    -
    diff --git a/loko/notifications/templates/notifications/discussion_detail.html b/loko/notifications/templates/notifications/discussion_detail.html index bb3292d..5e9a372 100644 --- a/loko/notifications/templates/notifications/discussion_detail.html +++ b/loko/notifications/templates/notifications/discussion_detail.html @@ -183,9 +183,9 @@ {% for msg in thread_messages %} {% if msg.is_system %}
    - - {{ msg.content }} - ({{ msg.created_at|date:"d/m H:i" }}) + + {{ msg.content|safe }} + ({{ msg.created_at|date:"d/m H:i" }})
    {% else %} @@ -235,6 +235,7 @@
    {% endif %}
    + {% endif %} {% endfor %}
    {% endif %} diff --git a/loko/notifications/tests.py b/loko/notifications/tests.py index 241d012..ba720b7 100644 --- a/loko/notifications/tests.py +++ b/loko/notifications/tests.py @@ -537,13 +537,13 @@ class DiscussionFlagTests(TestCase): self.assertIsNotNone(msg) self.assertTrue(msg.is_system) self.assertIn("Alice Smith", msg.content) - self.assertIn("🚩", msg.content) + self.assertIn("bi-flag-fill text-danger", msg.content) # 2. Change to green flag msg2 = set_discussion_flag(self.discussion, 'green', user=self.user) self.discussion.refresh_from_db() self.assertEqual(self.discussion.flag, 'green') - self.assertIn("🟩", msg2.content) + self.assertIn("bi-flag-fill text-success", msg2.content) # 3. Setting same flag returns None and doesn't create new message msg_noop = set_discussion_flag(self.discussion, 'green', user=self.user) @@ -618,6 +618,13 @@ class DiscussionFlagTests(TestCase): self.assertEqual(disc.flag, 'red') self.assertEqual(disc.flag_set_by, self.user) - - - + def test_discussion_detail_view_renders_template(self): + self.client.force_login(self.user) + from notifications.models import Message + Message.objects.create(discussion=self.discussion, author=self.user, content="Hello message") + Message.objects.create(discussion=self.discussion, author=self.user, content="🚩 System flag", is_system=True) + url = reverse('notifications:discussion_detail', args=[self.discussion.pk]) + res = self.client.get(url) + self.assertEqual(res.status_code, 200) + self.assertContains(res, "Hello message") + self.assertContains(res, "System flag") diff --git a/loko/observations/templates/observations/observation_detail.html b/loko/observations/templates/observations/observation_detail.html index a3a3841..a1d5e20 100644 --- a/loko/observations/templates/observations/observation_detail.html +++ b/loko/observations/templates/observations/observation_detail.html @@ -855,8 +855,16 @@
    -
    • +
    • @@ -882,8 +890,8 @@ {% for msg in discussion_messages %} {% if msg.is_system %}
    - - {{ msg.content }} + + {{ msg.content|safe }}
    {% else %} @@ -1899,10 +1907,10 @@ document.addEventListener('DOMContentLoaded', function() { const headerLabel = document.getElementById('obs-flag-label-display'); if (headerIcon) { - if (data.flag === 'red') headerIcon.textContent = '🚩'; - else if (data.flag === 'orange') headerIcon.textContent = '🟧'; - else if (data.flag === 'green') headerIcon.textContent = '🟩'; - else headerIcon.textContent = '🏳️'; + if (data.flag === 'red') headerIcon.innerHTML = ''; + else if (data.flag === 'orange') headerIcon.innerHTML = ''; + else if (data.flag === 'green') headerIcon.innerHTML = ''; + else headerIcon.innerHTML = ''; } if (headerLabel) { headerLabel.textContent = data.flag_info.label || '{% translate "Statut" %}'; diff --git a/loko/stock/templates/stock/preparation_order_detail.html b/loko/stock/templates/stock/preparation_order_detail.html index ee4906a..8b69228 100644 --- a/loko/stock/templates/stock/preparation_order_detail.html +++ b/loko/stock/templates/stock/preparation_order_detail.html @@ -1735,8 +1735,16 @@ document.addEventListener('DOMContentLoaded', function() {
    -
    • +
    • @@ -1762,8 +1770,8 @@ document.addEventListener('DOMContentLoaded', function() { {% for msg in discussion_messages %} {% if msg.is_system %}
    - - {{ msg.content }} + + {{ msg.content|safe }}
    {% else %} @@ -2164,10 +2172,10 @@ document.addEventListener('DOMContentLoaded', function () { } if (headerIcon) { - if (data.flag === 'red') headerIcon.textContent = '🚩'; - else if (data.flag === 'orange') headerIcon.textContent = '🟧'; - else if (data.flag === 'green') headerIcon.textContent = '🟩'; - else headerIcon.textContent = '🏳️'; + if (data.flag === 'red') headerIcon.innerHTML = ''; + else if (data.flag === 'orange') headerIcon.innerHTML = ''; + else if (data.flag === 'green') headerIcon.innerHTML = ''; + else headerIcon.innerHTML = ''; } if (headerLabel) { headerLabel.textContent = data.flag_info.label || '{% translate "Statut" %}';