works good

5 files changed, 19 insertions, 6 deletions

diff --git a/dump.dat b/dump.dat
new file mode 100644
index 0000000..e401938
--- /dev/null
+++ b/dump.dat
@@ -0,0 +1 @@
+[{"pk": 6, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.contenttype", "fields": {"model": "group", "name": "group", "app_label": "auth"}}, {"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}}, {"pk": 10, "model": "contenttypes.contenttype", "fields": {"model": "match", "name": "match", "app_label": "main"}}, {"pk": 4, "model": "contenttypes.contenttype", "fields": {"model": "message", "name": "message", "app_label": "auth"}}, {"pk": 1, "model": "contenttypes.contenttype", "fields": {"model": "permission", "name": "permission", "app_label": "auth"}}, {"pk": 9, "model": "contenttypes.contenttype", "fields": {"model": "player", "name": "player", "app_label": "main"}}, {"pk": 7, "model": "contenttypes.contenttype", "fields": {"model": "session", "name": "session", "app_label": "sessions"}}, {"pk": 8, "model": "contenttypes.contenttype", "fields": {"model": "site", "name": "site", "app_label": "sites"}}, {"pk": 3, "model": "contenttypes.contenttype", "fields": {"model": "user", "name": "user", "app_label": "auth"}}, {"pk": "1d57b12d6a85aca7690724513e1b4880", "model": "sessions.session", "fields": {"expire_date": "2011-02-03 17:09:59", "session_data": "MTJjYzMxNzBlNTViMDQ3YjUyYmE0NWVjYzQ1NDE5NjhmZDFiZGYzYzqAAn1xAShVEl9hdXRoX3Vz\nZXJfYmFja2VuZHECVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHED\nVQ1fYXV0aF91c2VyX2lkcQRLAXUu\n"}}, {"pk": 1, "model": "sites.site", "fields": {"domain": "example.com", "name": "example.com"}}, {"pk": 1, "model": "main.player", "fields": {"name": "Nadav"}}, {"pk": 2, "model": "main.player", "fields": {"name": "Shai"}}, {"pk": 3, "model": "main.player", "fields": {"name": "Yuval"}}, {"pk": 4, "model": "main.player", "fields": {"name": "Omri"}}, {"pk": 5, "model": "main.player", "fields": {"name": "Dan"}}, {"pk": 6, "model": "main.player", "fields": {"name": "Ilan"}}, {"pk": 7, "model": "main.player", "fields": {"name": "Yoni"}}, {"pk": 8, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2011-01-20 17:10:30", "object_repr": "Yoni", "object_id": "7", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 7, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2011-01-20 17:10:26", "object_repr": "Ilan", "object_id": "6", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 6, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2011-01-20 17:10:22", "object_repr": "Dan", "object_id": "5", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 5, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2011-01-20 17:10:20", "object_repr": "Omri", "object_id": "4", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 4, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2011-01-20 17:10:17", "object_repr": "Yuval", "object_id": "3", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 3, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2011-01-20 17:10:14", "object_repr": "Shai", "object_id": "2", "change_message": "Changed name.", "user": 1, "content_type": 9}}, {"pk": 2, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2011-01-20 17:10:08", "object_repr": "Sha", "object_id": "2", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 1, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2011-01-20 17:10:05", "object_repr": "Nadav", "object_id": "1", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 5}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 5}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 6}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "add_match", "name": "Can add match", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "change_match", "name": "Can change match", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "delete_match", "name": "Can delete match", "content_type": 10}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_player", "name": "Can add player", "content_type": 9}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "change_player", "name": "Can change player", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_player", "name": "Can delete player", "content_type": 9}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 7}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 8}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2011-01-20 17:09:59", "groups": [], "user_permissions": [], "password": "sha1$ca26c$7ccc4ad9aff833fdba96f126ad24383d2499d0d7", "email": "a@b.com", "date_joined": "2011-01-20 15:03:45"}}]
\ No newline at end of file
diff --git a/main/views.py b/main/views.py
index ac95d31..3dc9fd4 100644
--- a/main/views.py
+++ b/main/views.py
@@ -8,7 +8,7 @@ from datetime import datetime
 import json
 
 def index(request):
-    matches = Match.objects.all().order_by('date')
+    matches = Match.objects.all().order_by('date')  
     players = Player.objects.all()
     return render_to_response('main.html', {'matches' : matches, 'players' : players}, context_instance=RequestContext(request))
 
@@ -17,9 +17,11 @@ def match(request):
     p2 = Player.objects.get(id=int(request.POST.get('p2')))
     try:
         p3 = Player.objects.get(id=int(request.POST.get('p3')))
-        p4 = Player.objects.get(id=int(request.POST.get('p4')))
     except:
         p3 = None
+    try:
+        p4 = Player.objects.get(id=int(request.POST.get('p4')))
+    except:
         p4 = None
         
     s1 = int(request.POST.get('s1'))
@@ -27,7 +29,7 @@ def match(request):
     
     if None not in (p1, p2, s1, s2):
         date = datetime.now()
-        match = Match(player1=p1, player2=p2, score1=s1, score2=s2, date=date)
+        match = Match(player1=p1, player2=p2, player3=p3, player4=p4, score1=s1, score2=s2, date=date)
         match.save()
     
     return HttpResponseRedirect('/')
diff --git a/media/js/base.js b/media/js/base.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/media/js/base.js
diff --git a/templates/main.html b/templates/main.html
index d45f7a7..4a2a3c1 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -23,16 +23,26 @@
 	        	<h1>Top7 Foosball League</h1>
 	        {% endblock %}
 	        
-	        <div id="content" class="span-12 last">
+	        <div id="matches" class="span-12 last">
 				<h2>Games</h2>
 		        {% block contentArea %}
+				<table>
 				{% for m in matches%}
-					<h3>{{ m }}</h3>
+					<tr>
+						<td>{{ m.player1 }}</td>
+						<td>{{ m.player2 }}</td>
+						<td>{{ m.player3 }}</td>
+						<td>{{ m.player4 }}</td>
+						<td>{{ m.score1 }}</td>
+						<td>{{ m.score2 }}</td>
+						<td>{{ m.date }}</td>
+					</tr>
 				{% endfor %}
+				</table>
 		        {% endblock %}
 	        </div>
 	
-			<div id="content" class="span-12 last">
+			<div id="newmatch" class="span-12 last">
 				<h2>New Match</h2>
 				<form method="post" action="/match/">
 					<select name="p1">
diff --git a/test.db b/test.db
index ee2590b..672be85 100644
--- a/test.db
+++ b/test.db