preparation bdd sport et affichage annonces

website/nutriform/migrations/0014_auto_20191211_1752.py

+# Generated by Django 2.2.6 on 2019-12-11 16:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nutriform', '0013_auto_20191206_1522'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sport',
+            name='intensite',
+        ),
+        migrations.RemoveField(
+            model_name='sport',
+            name='nb_seances',
+        ),
+        migrations.RemoveField(
+            model_name='sport',
+            name='type_sport',
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='activite',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='geoPoint',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='lieu',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='sport',
+            name='salle',
+            field=models.CharField(max_length=100, null=True),
+        ),
+    ]

website/nutriform/models.py

@@ -39,9 +39,10 @@ class Menu(models.Model):
         return self.type_menu
 
 class Sport(models.Model):
-    type_sport = models.CharField(max_length=150)
-    nb_seances = models.IntegerField()
-    intensite = models.IntegerField()
+    salle = models.CharField(max_length=100, null=True)
+    activite = models.CharField(max_length=100, null=True)
+    lieu = models.CharField(max_length=100, null=True)
+    geoPoint = models.CharField(max_length=100, null=True)
 
 MALADIES_CHOICES = [
     ('RH', 'Rhume'),

website/nutriform/templates/nutriform/add_annonce.html

@@ -12,7 +12,7 @@
         {% csrf_token %}
 
         {{ form }}
-
+        <br>
         <input type="submit" value="Créer">
     </form>
 </div class="container">

website/nutriform/templates/nutriform/annonces.html

@@ -8,9 +8,22 @@
         <h2>Participez à des activités sportives communautaires</h2>
     </header>
   
+    <div class="row uniform center">
     {% for annonce in annonces_list %}
-    <a href="{% url 'detail_annonce' annonce.id %}">{{ annonce.get_type_annonce_display }} - {{ annonce.sport }} - {{ annonce.orga.username }}</a>
+    <div class="6u 12u$(xsmall)">
+        <ul style="list-style: none;">
+            <li>{{ annonce.get_type_annonce_display }}</li>
+            <li><i>{{ annonce.date }}</i></li>
+            <li>{{ annonce.sport }}</li>
+            <li>{{ annonce.ville }}</li>
+            <li>{{ annonce.description }}</li>
+        </ul>
+        {% if user.is_authenticated and user != annonce.orga %}
+        <a href="mailto:{{annonce.orga.email}}" class="button">Contacter l'organisateur</a>
+        {% endif %}
+    </div>
     {% endfor %}
+    </div>
     <br>
     <a href="{% url 'add_annonce' %}" class="button">Créer mon annonce</a>
 </div class="container">

website/nutriform/templates/nutriform/base.html

@@ -54,6 +54,7 @@
 				<li>&copy; NutriForm</li>
 				<li>Design: <a href="http://templated.co">TEMPLATED</a></li>
 				<li>Images: <a href="http://unsplash.com">Unsplash</a></li>
+				<li><a href="{% url 'cgu' %}">Conditions générales d'utlisation</a></li>
 			</ul>
 		</div>
 	</footer>

website/nutriform/templates/nutriform/cgu.html

+{% extends "../nutriform/base.html" %}
+
+{% block content %}
+
+<div class="container">
+
+    <header class="major">
+        <h2>Conditions générales d'utilisation</h2>
+    </header>
+    
+    
+</div class="container">
+{% endblock %}
\ No newline at end of file

website/nutriform/templates/nutriform/index.html

@@ -221,6 +221,7 @@
 				<li>&copy; NutriForm</li>
 				<li>Design: <a href="http://templated.co">NutriForm_Design</a></li>
 				<li>Images: <a href="http://unsplash.com">Unsplash</a></li>
+				<li><a href="{% url 'cgu' %}">Conditions générales d'utilisation</a></li>
 			</ul>
 		</div>
 	</footer>

website/nutriform/urls.py

@@ -16,5 +16,6 @@ urlpatterns = [
 	path('accounts/profile/modification_infos/', views.modif_infos, name='modif_info'),
 	path('annonces/créer/', views.addAnnnonce, name='add_annonce'),
 	path('annonces/<int:annonce_id>/', views.detail_annonce, name='detail_annonce'),
-	path('annonces/', views.annonces, name='annonces')
+	path('annonces/', views.annonces, name='annonces'),
+	path('cgu/', views.cgu, name='cgu')
 ]

website/nutriform/views.py

@@ -205,7 +205,7 @@ def addAnnnonce(request):
 			annonce = form.save()
 			annonce.orga = request.user
 			annonce.save()
-			return redirect('compte')
+			return redirect('annonces')
 
 	else :
 		form = AnnonceForm()
@@ -213,4 +213,7 @@ def addAnnnonce(request):
 	context = {
 		'form':form,
 	}
-	return render(request, 'nutriform/add_annonce.html', context)
+	return render(request, 'nutriform/add_annonce.html', context)
\ No newline at end of file
+
+def cgu(request):
+	return render(request, 'nutriform/cgu.html')
\ No newline at end of file