Close #51

src/base/models.py

@@ -6,12 +6,12 @@ import markdown
 
 
 class Markdownizable(models.Model):
-    """Classe abstraite ajoutant un champ `information`, convertible de .md -> .html."""
+    """Classe abstraite ajoutant un champ `content`, convertible de .md -> .html."""
 
     class Meta:
         abstract = True
 
-    information = models.TextField(
+    content = models.TextField(
         null=True,
         blank=True,
         verbose_name="Comments",
@@ -19,6 +19,6 @@ class Markdownizable(models.Model):
     )
 
     def to_markdown(self):
-        """Convertit le champ `information` en (Github-flavored) Markdown."""
+        """Convertit le champ `content` en (Github-flavored) Markdown."""
         
-        return markdown.markdown(self.information)
+        return markdown.markdown(self.content)

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(read_at__isnull=True).count()
+    return Message.objects.filter(recipient=request.user).filter(read_at__isnull=True).count()
 
 
 @login_required
@@ -32,9 +32,9 @@ def get_messages(request, message_type="received"):
         Si le paramètre `message_type` est vide, la liste renvoyée est vide également.
     """
     if message_type == "received":
-        message_list = Message.objects.filter(reader=request.user)
+        message_list = Message.objects.filter(recipient=request.user)
     elif message_type == "sent":
-        message_list = Message.objects.filter(writer=request.user)
+        message_list = Message.objects.filter(sender=request.user)
     else:
         message_list = None
 
@@ -64,7 +64,7 @@ def get_message_details(request, messageid):
     """Récupère les détails (l'affichage ?) d'un message.
     """
     message = get_object_or_404(Message, pk=messageid)
-    if not message.is_read and message.reader == request.user.id:
+    if not message.is_read and message.recipient == request.user.id:
         message.is_read = True
         message.save()
 

src/planning/views.py

@@ -1295,19 +1295,19 @@ def planningline_update(request, planninglineid=None):
             planningline.date = form.cleaned_data["date"]
             planningline.order = form.cleaned_data["order"]
             planningline.todo = form.cleaned_data["todo"]
-            planningline.information = form.cleaned_data["information"]
+            planningline.content = form.cleaned_data["content"]
             planningline.save()
             return HttpResponseRedirect("/program/")
 
     else:
         form = PlanningLineForm(
             initial={
-                "gymnast": planningline.gymnast.id,
+                "gymnast": planningline.gymnast.id, 
                 "gymnast_related": planningline.gymnast,
                 "date": planningline.date,
                 "order": planningline.order,
                 "todo": planningline.todo,
-                "information": planningline.information,
+                "content": planningline.content,
             }
         )
 

src/templates/accident_create.html

@@ -36,7 +36,7 @@
                     <div class="form-group row ">
                         <label for="id_information" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Informations</label>
                         <div class="col-8 col-sm-9 col-md-9 col-lg-9 col-xl-9 {% if form.id_information.errors %}has-danger{% endif %}">
-                            {{ form.information }}
+                            {{ form.content }}
                         </div>
                     </div>
                     <div class="form-group text-center">

src/templates/event_create.html

@@ -69,10 +69,10 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="id_information" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Information</label>
-                        <div class="col-8 col-sm-10 col-md-10 col-lg-10 col-xl-10 {% if form.information.errors %}has-danger{% endif %}">
-                            {{ form.information }}
-                            {% if form.information.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.information.errors %}{{error}}{% endfor %}</span>{% endif %}
+                        <label for="id_content" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Information</label>
+                        <div class="col-8 col-sm-10 col-md-10 col-lg-10 col-xl-10 {% if form.content.errors %}has-danger{% endif %}">
+                            {{ form.content }}
+                            {% if form.content.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.content.errors %}{{error}}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
                     <div class="form-group text-center">

src/templates/gymnast_create.html

@@ -119,11 +119,11 @@
                             {% if form.orientation.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.orientation.errors %}{{error}}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
-                    <div class="form-group row {% if form.information.errors %}has-error has-feedback{% endif %}">
-                        <label for="id_information" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Information</label>
+                    <div class="form-group row {% if form.content.errors %}has-error has-feedback{% endif %}">
+                        <label for="id_content" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Information</label>
                         <div class="col-8 col-sm-10 col-md-10 col-lg-10 col-xl-10">
-                            {{ form.information }}
-                            {% if form.information.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.information.errors %}{{error}}{% endfor %}</span>{% endif %}
+                            {{ form.content }}
+                            {% if form.content.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.content.errors %}{{error}}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
                     <div class="form-group text-center">

src/templates/planningline_create.html

@@ -45,11 +45,11 @@
             {% if form.todo.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.todo.errors %}{{error}}{% endfor %}</span>{% endif %}
         </div>
     </div>
-    <div class="form-group {% if form.information.errors %}has-error has-feedback{% endif %}">
-        <label for="id_information" class="col-sm-2 control-label">Information</label>
+    <div class="form-group {% if form.content.errors %}has-error has-feedback{% endif %}">
+        <label for="id_content" class="col-sm-2 control-label">Information</label>
         <div class="col-sm-10">
-            {{ form.information }}
-            {% if form.information.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.information.errors %}{{error}}{% endfor %}</span>{% endif %}
+            {{ form.content }}
+            {% if form.content.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.content.errors %}{{error}}{% endfor %}</span>{% endif %}
         </div>
     </div>
     <div class="form-group">

src/templates/program.html

@@ -52,7 +52,7 @@
         </div>
         <div class="card">
             <div class="card-body">
-                <p>{{ gymnast.information }}</p>
+                <p>{{ gymnast.content }}</p>
             </div>
         </div>
     </div>

src/templates/program_day.html

@@ -69,7 +69,7 @@
         </div>
         <div class="card">
             <div class="card-body">
-                <p>{{ gymnast.information }}</p>
+                <p>{{ gymnast.content }}</p>
             </div>
         </div>
     </div>

src/templates/program_old.html

@@ -52,7 +52,7 @@
         </div>
         <div class="card">
             <div class="card-body">
-                <p>{{ gymnast.information }}</p>
+                <p>{{ gymnast.content }}</p>
             </div>
         </div>
     </div>

src/templates/routine_details.html

@@ -44,7 +44,7 @@
                     <br>
                 </div>
 
-                {% if routine.information %}
+                {% if routine.content %}
                 <div class="col-md-12">
                     <hr class="m-t">
                     <h4>Commentaires</h4>

src/templates/skill_details.html

@@ -59,7 +59,7 @@
                 {% endif %}
             </div>
         </div>
-        {% if skill.information %}
+        {% if skill.content %}
         <hr class="m-t">
         <div class="row">
             <div class="col-md-12">

src/templates/unavailability_create.html

@@ -33,7 +33,7 @@
     <div class="form-group {% if form.id_information.errors %}has-error has-feedback{% endif %}">
         <label for="id_information" class="col-sm-2 control-label">Information</label>
         <div class="col-sm-10">
-            {{ form.information }}
+            {{ form.content }}
         </div>
     </div>
     <div class="form-group">

src/templates/unavailability_list.html

@@ -28,7 +28,7 @@
             </td>
             <td><a href="/unavailability/{{ unavailable.id }}">{{ unavailable.datebegin | date:"d-m-Y" }}</td>
             <td><a href="/unavailability/{{ unavailable.id }}">{{ unavailable.dateend | date:"d-m-Y"  }}</td>
-            <td>{{ unavailable.information }}</td>
+            <td>{{ unavailable.content }}</td>
         </tr>
     {% endfor %}
 </tbody>