Hooked up views, templates, and models

joshmarcus · Feb 25, 2011 · d81d37a · d81d37a
1 parent 2cf0025
commit d81d37a
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 32 deletions.
diff --git a/__init__.pyc b/__init__.pyc
diff --git a/philly_leg.sqlite3 b/philly_leg.sqlite3
diff --git a/phillyleg/.DS_Store b/phillyleg/.DS_Store
diff --git a/phillyleg/__init__.pyc b/phillyleg/__init__.pyc
diff --git a/phillyleg/admin.pyc b/phillyleg/admin.pyc
diff --git a/phillyleg/editsubscribe.html b/phillyleg/editsubscribe.html
@@ -7,7 +7,7 @@
 <body>
 	<div class="center">
 	<h1>Unsubscribe from City Council Legislation Digest</h1>
-	<form>
+	<form method="POST" action="../delete/">
 		<label for="email">Your email address:</label> <input type="email" name="email" id="email"/>
 		<input type="submit" value="Unsubscribe All" id="unsubscribe"/>
 	</form>

diff --git a/phillyleg/models.py b/phillyleg/models.py
@@ -3,7 +3,7 @@
 
 # Create your models here.
 class Subscription(models.Model):
-    user = models.ForeignKey(User, unique=True)
+    #user = models.ForeignKey(User, unique=True)
     email = models.CharField(max_length=100)
     def __unicode__(self):
         return self.email

diff --git a/phillyleg/models.pyc b/phillyleg/models.pyc
diff --git a/phillyleg/received.html b/phillyleg/received.html
@@ -7,10 +7,14 @@
 <body>
 	<div class="center">
 	<h1>Thank you for subscribing.</h1>
-	<p>We have added {{email address}} to our database for the following keywords and council members:</p>
+	<p>We have added {{ emailvar }} to our database for the following keywords and council members:</p>
 	<ul>
-		<li>{{council member}}</li>
-		<li>{{keyword}}</li>
+		{% for member in members %}
+		<li>{{ member }}</li>
+		{% endfor %}
+		{% for word in keylist %}
+		<li>{{ word }}</li>
+		{% endfor %}
 	</ul>
 	</div>
 </body>

diff --git a/phillyleg/subscribe.html b/phillyleg/subscribe.html
@@ -8,29 +8,29 @@
 	<div class="center">
 	<h1>Subscribe to City Council Legislation Digest</h1>
 	<p>Subscribe to be sent a daily email digest of City Council legislation.<br/>  You can subscribe to legislation by keyword (currently based on the title of the bill), or by council member.</p>
-	<form>
+	<form method="POST" action="create/">
 		<label for="email">Your email address:</label> <input type="email" name="email" id="email"/><br/>
 		<p>Enter a list of words separated by commas. Your daily email will list all bills that contain any of these words.</p>
 		<textarea name="keywords" id="keywords" rows="6" cols="30"></textarea>
 		<p>Select one or more council members whose legislation you want to subscribe to.</p>
-		<select multiple="multiple">
-			<option>Blackwell, Jannie</option>
-			<option>Clarke, Darrell</option>
-			<option>DiCiccio, Frank</option>
-			<option>Goode, Jr., W. Wilson</option>
-			<option>Green, Bill</option>
-			<option>Greenlee, William K.</option>
-			<option>Jones, Jr., Curtis</option>
-			<option>Kelly, Jack</option>
-			<option>Kenney, James</option>
-			<option>Krajewski, Joan</option>
-			<option>Miller, Donna</option>
-			<option>O'Neill, Brian</option>
-			<option>Quiñones-Sánchez, Maria D.</option>
-			<option>Reynolds Brown, Blondell</option>
-			<option>Rizzo, Jr., Frank</option>
-			<option>Tasco, Marian</option>
-			<option>Verna, Anna</option>	
+		<select multiple="multiple" name="council" id="council">
+			<option value="Blackwell">Blackwell, Jannie</option>
+			<option value="Clarke">Clarke, Darrell</option>
+			<option value="DiCiccio">DiCiccio, Frank</option>
+			<option value="Goode">Goode, Jr., W. Wilson</option>
+			<option value="Green">Green, Bill</option>
+			<option value="Greenlee">Greenlee, William K.</option>
+			<option value="Jones">Jones, Jr., Curtis</option>
+			<option value="Kelly">Kelly, Jack</option>
+			<option value="Kenney">Kenney, James</option>
+			<option value="Krajewski">Krajewski, Joan</option>
+			<option value="Miller">Miller, Donna</option>
+			<option value="O'Neill">O'Neill, Brian</option>
+			<option value="Quiñones-Sánchez">Quiñones-Sánchez, Maria D.</option>
+			<option value="Reynolds Brown">Reynolds Brown, Blondell</option>
+			<option value="Rizzo">Rizzo, Jr., Frank</option>
+			<option value="Tasco">Tasco, Marian</option>
+			<option value="Verna">Verna, Anna</option>	
 		</select><br/>
 		<input type="submit" value="Subscribe" id="subscribe"/>
 	</form>

diff --git a/phillyleg/unsubscribed.html b/phillyleg/unsubscribed.html
@@ -7,7 +7,7 @@
 <body>
 	<div class="center">
 	<h1>You have been unsubscribed.</h1>
-	<p>The email address {{email address}} has been removed from our database.</p>
+	<p>The email address {{ email }} has been removed from our database.</p>
 	</div>
 </body>
 </html>
diff --git a/phillyleg/views.py b/phillyleg/views.py
@@ -1,15 +1,47 @@
 # Create your views here.
 from django.http import HttpResponse
+from phillyleg.models import Subscription,Keyword
+from django.template import Context, loader
 
 def index(request):
-    return HttpResponse("this is the index")
+    t = loader.get_template('subscribe.html')
+    c = Context()
+    return HttpResponse(t.render(c))
 
 def create(request):
-    return HttpResponse("this is the create page")
+    emailvar = request.POST['email']
+    s = Subscription(email = emailvar)
+    s.save()
+    keywords = request.POST['keywords']
+    keylist = keywords.split(",") 
+    for word in keylist:
+        k = Keyword(keyword = word, subscription = s)
+        k.save()
+    members = request.POST.getlist('council')
+    for mem in members:
+        k = Keyword(keyword = mem, subscription = s)
+        k.save()
+    t = loader.get_template('received.html')
+    c = Context({
+        'emailvar': emailvar,
+        'keylist': keylist,
+        'members': members
+    })
+    return HttpResponse(t.render(c))
 
-def edit(request, subscription_id):
-    return HttpResponse("this is the update page for %s" % subscription_idi )
+def unsubscribe(request):
+    t = loader.get_template('editsubscribe.html')
+    c = Context()
+    return HttpResponse(t.render(c))
 
 def delete(request):
-    return HttpResponse("this is the delete page")
+    t = loader.get_template('unsubscribed.html')
+    emailvar = request.POST['email']
+    s = Subscription.objects.filter(email = emailvar)
+    for item in s:
+        item.delete()
+    c = Context({
+        'email': emailvar
+    })
+    return HttpResponse(t.render(c))
 
diff --git a/phillyleg/views.pyc b/phillyleg/views.pyc
diff --git a/settings.py b/settings.py
@@ -69,6 +69,7 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+	'/Users/bri/Desktop/phillyles/philly_legislative/phillyleg'
 )
 
 INSTALLED_APPS = (
@@ -80,4 +81,4 @@
     'phillyleg'
 )
 
-AUTH_PROFILE_MODULE = 'phillyleg.subscription'
+#AUTH_PROFILE_MODULE = 'phillyleg.subscription'
diff --git a/settings.pyc b/settings.pyc
diff --git a/urls.py b/urls.py
@@ -18,6 +18,7 @@
 
     (r'^subs/$', 'phillyleg.views.index'),
     (r'^subs/create/$', 'phillyleg.views.create'),
-    (r'^subs/(?P<subscription_id>\d+)/$', 'phillyleg.views.edit'),
+    (r'^subs/unsubscribe/$', 'phillyleg.views.unsubscribe'),
+    #(r'^subs/(?P<subscription_id>\d+)/$', 'phillyleg.views.edit'),
     (r'^subs/delete/$', 'phillyleg.views.delete')
 )
diff --git a/urls.pyc b/urls.pyc