svn commit: r1693015 - in /comdev/tools/events_list: models.py templates/groups/index.html views.py

[rg...@apache.org]

Author: rgardler
Date: Tue Jul 28 07:56:05 2015
New Revision: 1693015

URL: http://svn.apache.org/r1693015
Log:
Add a manytomany between groups and people (and fix the people query string)

Modified:
    comdev/tools/events_list/models.py
    comdev/tools/events_list/templates/groups/index.html
    comdev/tools/events_list/views.py

Modified: comdev/tools/events_list/models.py
URL: http://svn.apache.org/viewvc/comdev/tools/events_list/models.py?rev=1693015&r1=1693014&r2=1693015&view=diff
==============================================================================
--- comdev/tools/events_list/models.py (original)
+++ comdev/tools/events_list/models.py Tue Jul 28 07:56:05 2015
@@ -30,6 +30,7 @@ class Person(models.Model):
     city = models.CharField(max_length = 30)
     url = models.URLField(default="")
     lastVisit = models.DateTimeField()
+    groups = models.ManyToManyField(Group, related_name="members")
     meetupID =  models.BigIntegerField(verbose_name = "Meetups.com ID", unique=True)
 
     def __str__(self):

Modified: comdev/tools/events_list/templates/groups/index.html
URL: http://svn.apache.org/viewvc/comdev/tools/events_list/templates/groups/index.html?rev=1693015&r1=1693014&r2=1693015&view=diff
==============================================================================
--- comdev/tools/events_list/templates/groups/index.html (original)
+++ comdev/tools/events_list/templates/groups/index.html Tue Jul 28 07:56:05 2015
@@ -20,6 +20,7 @@
       <thead>
 	<tr>
 	  <th>Name</th>
+	  <th>Known Members</th>
 	  <th>City</th>
 	  <th>State</th>
 	  <th>Country</th>
@@ -30,6 +31,7 @@
 	{% for group in groups_list %}
 	<tr>
 	  <td>{{ group.name }}</td>
+	  <td>{{ group.members.all.count }}</td>
 	  <td>{{ group.city }}</td>
 	  <td>{{ group.state }}</td>
 	  <td>{{ group.country }}</td>

Modified: comdev/tools/events_list/views.py
URL: http://svn.apache.org/viewvc/comdev/tools/events_list/views.py?rev=1693015&r1=1693014&r2=1693015&view=diff
==============================================================================
--- comdev/tools/events_list/views.py (original)
+++ comdev/tools/events_list/views.py Tue Jul 28 07:56:05 2015
@@ -91,7 +91,7 @@ def importMembers(request, group_id):
     log.action_type = Log.EVENT_IMPORT
     log.save()
 
-    url = "https://api.meetup.com/2/members?offset=0&format=json&group_id=18712511&photo-host=public&page=100&order=name&sig_id=148657742&key=" + MEETUP_API_KEY
+    url = "https://api.meetup.com/2/members?offset=0&format=json&group_id=" + str(group.meetupID) + "&photo-host=public&page=500&sig_id=148657742&key=" + MEETUP_API_KEY
     response = urllib2.urlopen(url)
     result = response.read()
 
@@ -114,6 +114,9 @@ def importMembers(request, group_id):
             visited = float(str(member['visited'])[0:-3])
             person.lastVisit = datetime.utcfromtimestamp(visited)
             person.save()
+
+            person.groups.add(group)
+            person.save()
         except:
             print('Unable to save Person object: '), sys.exc_info()[0], sys.exc_info()[1]