From db8b92f7ed93ae3312936ccf30d24b0b2c7f3a8c Mon Sep 17 00:00:00 2001
From: Evarin <champrobin@hotmail.com>
Date: Fri, 6 Oct 2017 10:29:00 +0200
Subject: [PATCH] =?UTF-8?q?Pr=C3=A9vention=20des=20doublons=20de=20lieux?=
 =?UTF-8?q?=20de=20stage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/avisstage/formulaires/stage.html      |  8 ++++++++
 avisstage/templatetags/avisstage_tags.py            |  6 ++++--
 avisstage/views.py                                  | 13 ++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/avisstage/templates/avisstage/formulaires/stage.html b/avisstage/templates/avisstage/formulaires/stage.html
index 7daf964..e63735c 100644
--- a/avisstage/templates/avisstage/formulaires/stage.html
+++ b/avisstage/templates/avisstage/formulaires/stage.html
@@ -117,6 +117,14 @@
              console.log(lieu);
              console.log(lieu_focus);
              if(lieu_focus === undefined) {
+                 // Élimination des doublons
+                 var candidates = $("input.lieu-hidden");
+                 for (var i=0; i<candidates.length; i++) {
+                     if($(candidates[i]).val() == lieu.id) {
+                         lieu_select.closeWidget();
+                         return;
+                     }
+                 }
                  // Créer un nouveau lieu
                  var cnt = $("#id_lieux-TOTAL_FORMS");
                  var i_form = cnt.val()*1;
diff --git a/avisstage/templatetags/avisstage_tags.py b/avisstage/templatetags/avisstage_tags.py
index bd67e08..ac697f1 100644
--- a/avisstage/templatetags/avisstage_tags.py
+++ b/avisstage/templatetags/avisstage_tags.py
@@ -29,7 +29,9 @@ def typonazisme(value):
 def avis_len(value):
     if value < 5:
         return "vide"
-    elif value < 50:
+    elif value < 30:
         return "court"
+    elif value < 100:
+        return "moyen"
     else:
-        return "fourni"
+        return "long"
diff --git a/avisstage/views.py b/avisstage/views.py
index 6728c24..4782226 100644
--- a/avisstage/views.py
+++ b/avisstage/views.py
@@ -174,7 +174,7 @@ def save_lieu(request):
 
         # Validation et enregistrement
         if form.is_valid():
-            lieu = form.save()
+            lieu = form.save(commit=False)
             if jitter:
                 cdx, cdy = lieu.coord.get_coords()
                 ang = random.random() * 6.29;
@@ -183,6 +183,17 @@ def save_lieu(request):
                 cdy += math.sin(ang) * rad;
                 lieu.coord.set_coords((cdx, cdy))
                 lieu.save()
+
+            # Élimination des doublons
+            if pk is None or pk == "":
+                olieux = Lieu.objects.filter(nom=lieu.nom, coord__distance_lte=(lieu.coord, 10))
+                for olieu in olieux:
+                    if olieu.type_lieu == lieu.type_lieu and \
+                       olieu.ville == lieu.ville and \
+                       olieu.pays == lieu.pays:
+                        return JsonResponse({"success": True, "id": olieu.id})
+            
+            lieu.save()
             return JsonResponse({"success": True, "id": lieu.id})
         else:
             return JsonResponse({"success": False,