From 6f6d65b66341e33428f6e857c6efd778900c564e Mon Sep 17 00:00:00 2001
From: Julien Constant <julienconstant190@gmail.com>
Date: Tue, 14 Mar 2023 11:54:30 +0100
Subject: [PATCH] Fix notification (details in description)

- Fix the dot being displayed when the user has 0 notifications.
- Added a message when there is no unread notification to be displayed.
---
 core/static/core/navbar.scss    |  5 +++++
 core/templates/core/base.jinja  | 40 +++++++++++++++++++--------------
 locale/fr/LC_MESSAGES/django.po |  4 ++++
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss
index 6bf6521b..d3c1d4a4 100644
--- a/core/static/core/navbar.scss
+++ b/core/static/core/navbar.scss
@@ -304,6 +304,11 @@
                   font-size: .8em;
                 }
               }
+
+              &.empty-notification {
+                text-align: center;
+                font-style: italic;
+              }
             }
           }
 
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 1d03f01f..3e31d280 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -96,6 +96,7 @@
                                 <div class="notification">
                                     <a href="#" onclick="display_notif()">
                                         <i class="fa fa-bell-o"></i>
+                                        {% if  user.notifications.filter(viewed=False).count() > 0 %}
                                         <span>
                                             {% if  user.notifications.filter(viewed=False).count() < 100 %}
                                                 {{ user.notifications.filter(viewed=False).count() }}
@@ -103,26 +104,31 @@
                                                 &nbsp;
                                             {% endif %}
                                         </span>
+                                        {% endif %}
                                     </a>
                                     <div id="header_notif">
                                         <ul>
-                                            {% for n in user.notifications.filter(viewed=False).order_by('-date') %}
-                                                <li>
-                                                    <a href="{{ url("core:notification", notif_id=n.id) }}">
-                                                        <div class="datetime">
-                                                            <span class="header_notif_date">
-                                                                {{ n.date|localtime|date(DATE_FORMAT) }}
-                                                            </span>
-                                                            <span class="header_notif_time">
-                                                                {{ n.date|localtime|time(DATETIME_FORMAT) }}
-                                                            </span>
-                                                        </div>
-                                                        <div class="reason">
-                                                            {{ n }}
-                                                        </div>
-                                                    </a>
-                                                </li>
-                                            {% endfor %}
+                                            {% if user.notifications.filter(viewed=False).count() > 0 %}
+                                                {% for n in user.notifications.filter(viewed=False).order_by('-date') %}
+                                                    <li>
+                                                        <a href="{{ url("core:notification", notif_id=n.id) }}">
+                                                            <div class="datetime">
+                                                                <span class="header_notif_date">
+                                                                    {{ n.date|localtime|date(DATE_FORMAT) }}
+                                                                </span>
+                                                                <span class="header_notif_time">
+                                                                    {{ n.date|localtime|time(DATETIME_FORMAT) }}
+                                                                </span>
+                                                            </div>
+                                                            <div class="reason">
+                                                                {{ n }}
+                                                            </div>
+                                                        </a>
+                                                    </li>
+                                                {% endfor %}
+                                            {% else %}
+                                                <li class="empty-notification">{% trans %}You do not have any unread notification{% endtrans %}</li>
+                                            {% endif %}
                                         </ul>
                                         <div class="options">
                                             <a href="{{ url('core:notification_list') }}">
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index f4bfb83d..19ea7bd3 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -5723,6 +5723,10 @@ msgstr "Vous avez acheté %s"
 msgid "You have a notification"
 msgstr "Vous avez une notification"
 
+#: core/templates/core/base.jinja
+msgid "You do not have any unread notification"
+msgstr "Vous n'avez aucune notification non lue"
+
 #: sith/settings.py:624
 msgid "Success!"
 msgstr "Succès !"