From 456fb50a47919f58fb000336865f1d536aa7c04c Mon Sep 17 00:00:00 2001
From: champeno <champeno@clipper.ens.fr>
Date: Tue, 29 Sep 2015 22:56:30 +0200
Subject: [PATCH] =?UTF-8?q?G=C3=A8re=20le=20cas=20de=20l'absence=20de=20li?=
 =?UTF-8?q?eu=20de=20stage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 monstage/templates/monstage/stage.html           |  4 +++-
 monstage/templates/monstage/stage_edit_lieu.html | 13 ++++++++++++-
 monstage/views.py                                |  3 ++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/monstage/templates/monstage/stage.html b/monstage/templates/monstage/stage.html
index 18c5707..c1531b7 100644
--- a/monstage/templates/monstage/stage.html
+++ b/monstage/templates/monstage/stage.html
@@ -41,13 +41,15 @@
   </form>
   {% endif %}
   <div id="stage_present">
+    {% if stage.lieux.all %}
     <div id="stage_map"></div>
+    {% endif %}
     <div id="stage_misc">
       {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_desc' stage.id %}" class="changestage">Modifier la description du stage (sujet, ...)</a></p>{% endif %}
       <p><a href="{% url 'monstage:profil' stage.profil_user.user.username %}">{{ stage.profil_user.user.first_name }} {{ stage.profil_user.user.last_name }}</a> a fait ce stage du {{ stage.start_date }} au {{ stage.end_date }}{% if stage.encadrants %}, supervisé par {{ stage.encadrants }}{% endif %}.</p>
       <p>Matières : {% for matiere in stage.matieres.all %}{% if not forloop.first %}, {% endif %}{{ matiere.name }}{% endfor %}</p>
       <p>Thématiques : {% for tag in stage.thematiques.names %}{% if not forloop.first %}, {% endif %}{{ tag }}{% endfor %}</p>
-      <p>À {% for lieu in stage.lieux.all %}{% if not forloop.first %}{% if forloop.last %} et {% else %}, {% endif %}{% endif %}{{ lieu.name }} ({{ lieu.ville }}){% endfor %}</p>
+      {% if stage.lieux.all %}<p>À {% for lieu in stage.lieux.all %}{% if not forloop.first %}{% if forloop.last %} et {% else %}, {% endif %}{% endif %}{{ lieu.name }} ({{ lieu.ville }}){% endfor %}</p>{% endif %}
       {% if modifiable %}<p><a href="{% url 'monstage:stage_edit_lieu' stage.id %}" class="changestage">Modifier les lieux du stage</a></p>{% endif %}
     </div>
   </div>
diff --git a/monstage/templates/monstage/stage_edit_lieu.html b/monstage/templates/monstage/stage_edit_lieu.html
index 050293a..9f8ba0d 100644
--- a/monstage/templates/monstage/stage_edit_lieu.html
+++ b/monstage/templates/monstage/stage_edit_lieu.html
@@ -30,7 +30,7 @@
   <div id="map_addlieu"></div>
   <div id="candidats"></div>
 
-  <input type="submit" value="Enregistrer" />
+  <input type="submit" value="Enregistrer" onclick="return checkForm();"/>
   </form>
   
   <script>
@@ -137,6 +137,17 @@
         addKnownPlace(this.data);
         clearCandidats();
       }
+      
+      function checkForm () {
+        for(var i=0; i<fieldcount; i++){
+            if (!document.getElementById('id_'+i+'-delete').checked)
+                return true;
+        }
+        if(confirm("Vous n'avez aucun lieu de précisé, vous ne pourrez pas donner d'avis complet sur votre stage !\nÊtes-vous sûr de vouloir continuer ?")) {
+            return true;
+        }else
+            return false;
+      }
     </script>
 {% endblock %}
 
diff --git a/monstage/views.py b/monstage/views.py
index bdabb37..a2f45fb 100644
--- a/monstage/views.py
+++ b/monstage/views.py
@@ -10,6 +10,7 @@ from django.contrib.gis.geos import GEOSGeometry
 from django.contrib.gis import measure
 from django.forms.widgets import HiddenInput
 from django.core.mail import send_mail
+from django.template.defaultfilters import slugify
 
 from monstage.models import *
 
@@ -312,7 +313,7 @@ def search(request):
             if thematiques:                
                 q = Q()
                 for thematique in thematiques:
-                    q |= Q(thematiques__slug__icontains = thematique)
+                    q |= Q(thematiques__slug__contains = slugify(thematique))
                 stages = stages.filter(q).distinct()
             stages = stages.all()
     else: