Close #16

src/communication/admin.py

@@ -7,7 +7,7 @@ from .models import Message
 
 @admin.register(Message)
 class MessageAdmin(admin.ModelAdmin):
-    list_display = ("sender", "recipient", "date_of_writing", "is_read", "date_of_reading")
-    ordering = ("date_of_writing", "sender")
+    list_display = ("sender", "recipient", "written_at", "is_read", "read_at")
+    ordering = ("written_at", "sender")
     search_fields = ("sender", "recipient", "message_title")
     list_filter = ("sender", "recipient")

src/communication/models.py

@@ -9,8 +9,8 @@ class Message(models.Model):
     Attributes:
         writer (User): Association à l'utilisateur qui a écrit le message.
         reader (User): Association au destinataire du message.
-        date_of_writing (datetime): Date à laquelle le message a été enregistré.
-        date_of_reading (datetime): Date à laquelle le message a été lu par son destinataire.
+        written_at (datetime): Date à laquelle le message a été enregistré.
+        read_at (datetime): Date à laquelle le message a été lu par son destinataire.
         message_title (str): Titre ou sujet du message.
         message_body (text): Contenu du message.
     """
@@ -18,11 +18,11 @@ class Message(models.Model):
     sender = models.ForeignKey(
         User, on_delete=models.CASCADE, related_name="have_write"
     )
-    date_of_writing = models.DateTimeField(
+    written_at = models.DateTimeField(
         auto_now_add=True, verbose_name="Date of writing"
     )
     recipient = models.ForeignKey(User, on_delete=models.CASCADE, related_name="have_read")
-    date_of_reading = models.DateTimeField(
+    read_at = models.DateTimeField(
         auto_now=True, verbose_name="Date of reading"
     )
     title = models.CharField(max_length=255, verbose_name="Title")
@@ -30,7 +30,7 @@ class Message(models.Model):
 
     @property
     def is_read():
-        return date_of_reading is not null or date_of_reading <= datetime.today()
+        return read_at is not null or read_at <= datetime.today()
 
     def __str__(self):
-        return "%s - %s : %s" % (self.sender, self.date_of_writing, self.title)
+        return "%s - %s : %s" % (self.sender, self.written_at, self.title)

src/communication/tests_models.py

@@ -8,5 +8,5 @@ import pytest
 def test_message_tostring():
     timing = datetime.now()
     u = User(username='fred', password='fredpassword')
-    m = Message(sender=u, date_of_writing=timing, title="test")
+    m = Message(sender=u, written_at=timing, title="test")
     assert str(m) == "fred - " + str(timing) + " : test"

src/communication/views.py

@@ -15,7 +15,7 @@ from .models import Message
 def get_number_of_unread_message(request):
     """Récupère le nombre de messages non lus associés à l'utilisateur en session.
     """
-    return Message.objects.filter(reader=request.user).filter(date_of_reading__isnull=True).count()
+    return Message.objects.filter(reader=request.user).filter(read_at__isnull=True).count()
 
 
 @login_required

src/templates/message_list.html

@@ -37,7 +37,7 @@
                             {% endif %}
                         </td>
                         <td><a href="{% url 'message_details' message.id %}" {% if type == 'received' and message.is_read == False %}style="font-weight: bold;"{% endif %}>{{ message.message_title }}</a></td>
-                        <td>{{ message.date_of_writing | date:"d M Y H:i" }}</td>
+                        <td>{{ message.written_at | date:"d M Y H:i" }}</td>
                         <td class="text-center">{{ message.writer }}</td>
                     </tr>
                     {% endfor %}