From e37a945220711864ae55ff618ae3e68044854d42 Mon Sep 17 00:00:00 2001
From: Michael Hall <mhall119@gmail.com>
Date: Tue, 23 Jan 2018 11:12:46 -0500
Subject: [PATCH] Fix and simplify the new team form

---
 events/forms.py                               |  6 +-
 events/models/profiles.py                     | 18 ++++++
 get_together/templates/get_together/base.html |  5 +-
 .../templates/get_together/create_team.html   | 62 ++++++-------------
 get_together/views.py                         |  2 +-
 5 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/events/forms.py b/events/forms.py
index 8327f58..786f895 100644
--- a/events/forms.py
+++ b/events/forms.py
@@ -160,10 +160,10 @@ class TeamForm(ModelForm):
 class NewTeamForm(ModelForm):
     class Meta:
         model = Team
-        fields = ['name', 'country', 'spr', 'city', 'web_url', 'tz']
+        fields = ['name', 'city', 'web_url', 'tz']
         widgets = {
-            'country': Lookup(source='/api/country/', label='name'),
-            'spr': Lookup(source='/api/spr/', label='name'),
+            #'country': Lookup(source='/api/country/', label='name'),
+            #'spr': Lookup(source='/api/spr/', label='name'),
             'city': Lookup(source='/api/cities/', label='name'),
         }
         raw_id_fields = ('country','spr','city')
diff --git a/events/models/profiles.py b/events/models/profiles.py
index 1a75156..80a8dd9 100644
--- a/events/models/profiles.py
+++ b/events/models/profiles.py
@@ -141,9 +141,27 @@ class Team(models.Model):
 
     members = models.ManyToManyField(UserProfile, through='Member', related_name="memberships", blank=True)
 
+    @property
+    def location_name(self):
+        if self.city:
+            return str(self.city)
+        elif self.spr:
+            return str(self.spr)
+        elif self.country:
+            return str(self.country)
+        else:
+            return ''
+
     def __str__(self):
         return u'%s' % (self.name)
 
+    def save(self, *args, **kwargs):
+        if self.city is not None:
+            self.spr = self.city.spr
+            self.country = self.spr.country
+        super().save(*args, **kwargs)  # Call the "real" save() method.
+
+
 class Member(models.Model):
     NORMAL=0
     MODERATOR=1
diff --git a/get_together/templates/get_together/base.html b/get_together/templates/get_together/base.html
index 9f114dc..d347319 100644
--- a/get_together/templates/get_together/base.html
+++ b/get_together/templates/get_together/base.html
@@ -86,9 +86,8 @@ form {
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM=" crossorigin="anonymous"></script>    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
 {% block javascript %}{% endblock %}
 </html>
diff --git a/get_together/templates/get_together/create_team.html b/get_together/templates/get_together/create_team.html
index 5ed77d0..3d5e66a 100644
--- a/get_together/templates/get_together/create_team.html
+++ b/get_together/templates/get_together/create_team.html
@@ -13,53 +13,29 @@
 {% block javascript %}
 <script type="text/javascript">
 $(document).ready(function(){
-    $("#country_search").keyup(function() {
-	var searchText = this.value;
-	$.getJSON("/api/countries/?q="+searchText, function(data) {
-	    var searchField = $("#country_search")[0];
-	    var q = this.url.match(/q=([^&]+)/)[1]
-	    var c = searchField.value
-	    if (c != q) return;
 
-	    var selectField = $("#country_select");
-	    selectField.empty();
-	    $.each(data, function(){
-		selectField.append('<option value="'+ this.id +'">'+ this.name + '</option>')
-	    });
-	});
-    });
-    $("#spr_search").keyup(function() {
-	var searchText = this.value;
-	var country_id = $("#country_select")[0].selectedOptions[0].value;
-	$.getJSON("/api/spr/?q="+searchText+"&country="+country_id, function(data) {
-	    var searchField = $("#spr_search")[0];
-	    var q = this.url.match(/q=([^&]+)/)[1]
-	    var c = searchField.value
-	    if (c != q) return;
-
-	    var selectField = $("#spr_select");
-	    selectField.empty();
-	    $.each(data, function(){
-		selectField.append('<option value="'+ this.id +'">'+ this.name + '</option>')
-	    });
-	});
-    });
     $("#city_search").keyup(function() {
         var searchText = this.value;
-	var spr_id = $("#spr_select")[0].selectedOptions[0].value;
-        $.getJSON("/api/cities/?q="+searchText+"&spr="+spr_id, function(data) {
-	    var searchField = $("#city_search")[0];
-	    var q = this.url.match(/q=([^&]+)/)[1]
-	    var c = searchField.value
-	    if (c != q) return;
+        $.getJSON("/api/cities/?q="+searchText, function(data) {
+            var searchField = $("#city_search")[0];
+            var m = this.url.match(/q=([^&]+)/);
+            var q = "";
+            if (m && m.length > 0) {
+                q = this.url.match(/q=([^&]+)/)[1]
+            }        var c = searchField.value
+            if (c != q) return;
 
-            var selectField = $("#city_select");
-            selectField.empty();
-            $.each(data, function(){
-                selectField.append('<option value="'+ this.id +'">'+ this.name + '</option>')
-	    });
-	});
+                var selectField = $("#city_select");
+                selectField.empty();
+                $.each(data, function(){
+                    selectField.append('<option value="'+ this.id +'">'+ this.display + '</option>')
+            });
+        });
     });
-});</script>
+
+});
+
+
+</script>
 
 {% endblock %}
diff --git a/get_together/views.py b/get_together/views.py
index b4a26e0..8d88e1e 100644
--- a/get_together/views.py
+++ b/get_together/views.py
@@ -25,7 +25,7 @@ def home(request, *args, **kwards):
         return render(request, 'get_together/index.html')
 
 def events_list(request, *args, **kwargs):
-    events = Event.objects.order_by('start_time').all()
+    events = Event.objects.filter(end_time__gt=datetime.datetime.now()).order_by('start_time')
     context = {
         'events_list': events,
     }