populating database

2 files changed, 40 insertions, 70 deletions

diff --git a/public/js/protocols_site.js b/public/js/protocols_site.js
index 41123bd..b5d3352 100644
--- a/public/js/protocols_site.js
+++ b/public/js/protocols_site.js
@@ -156,34 +156,26 @@ var Party =
 		$('#userViewContainer').hide()
 		$.get(URL.party.list,{},Party.listCallback)
 		},
-	listCallback: function (raw)
+	listCallback: function (parties)
 		{
 		warn("got party list")
-		var lines = raw.split("\n")
-		if (lines.shift() !== API_MAGIC)
-			{
-			warn(raw)
-			warn("bad api: party list")
-			return
-			}
 		var partyList = ""
-		if (Party.currentID != -1)
+		if (Party.currentID != -1) {
 			var firstPartyID = Party.currentID
-		for (i in lines)
-			{
-			if (! lines[i])
-				continue
-			var fields = lines[i].split('\t')
-			if (! firstPartyID)
-				firstPartyID = fields[0]
-			// 0 id  1 date
-			partyList += "<li id='party-"+fields[0]+"'>"+fields[1]+"</li>"
-			Party.parties["party-"+fields[0]] = fields
+		}
+		parties.forEach(function(party){
+			if (! firstPartyID) {
+				firstPartyID = party.id
 			}
+			partyList += "<li id='party-"+party.id+"'>"+party.date+"</li>"
+			Party.parties["party-"+party.id] = party
+		})
+		
 		$('#partyList').html(partyList)
 		$('#partyListContainer').fadeIn(200)
-		for (id in Party.parties)
-			$('#'+id).click(Party.liclick)
+		for (id in Party.parties) {
+			$('#'+id).click(Party.liclick).data('party', Party.parties[id])
+		}
 		Nav.selectClass(Party.parties, "party-"+firstPartyID)
 		if (firstPartyID)
 			Party.view(firstPartyID)
@@ -194,68 +186,46 @@ var Party =
 		$('#userEditContainer').hide()
 		$('#partyEditContainer').hide()
 		$('#userListContainer').fadeOut(200)
+		Party.partyData = $(this).data('party')
 		$.get(URL.party.view, {'id':id}, Party.viewCallback)
 		},
-	viewCallback: function (raw)
+	viewCallback: function (users)
 		{
-		warn ("got party view")
-		var lines = raw.split("\n")
-		if (lines.shift() !== API_MAGIC)
-			{
-			warn("bad api: party view")
-			return
-			}
-		var partyData = '';
 		var partyUserList = ""
 		var partyLocationTag = ""
 		var editable = []
 		var currentHost = -1
-		for (i in lines)
-			{
-			if (! lines[i])
-				continue
+
+		users.forEach(function(user){
 			var fields = lines[i].split('\t')
-			if (! partyData)
-				{ partyData = fields; continue }
+
 			// 0 id  1 group  2 name  3 email  4 blurb
-			if (fields[1] !== currentHost)
-				{
-				currentHost = fields[1]
-				if (currentHost === '0')
-					partyUserList += "<li class='hostlist'>guest host</li>"
-				else
-					partyUserList += "<li class='hostlist'>invited by "+Auth.hosts[fields[1]]+"</li>"
-				}
-			partyUserList += "<li><span class='view' id='user-"+fields[0]+"'>"+fields[2]+"</span>"
-			if (Auth.isHost || fields[0] === Auth.userID)
-				{
-				partyUserList += "<span class='edit' id='edit-"+fields[0]+"'>edit</span>"
-				editable.push(fields[0])
-				}
-			partyUserList += "</li>"
-			Users.userlist['user-'+fields[0]] = fields
+			partyUserList += "<li><span class='view' id='user-"+ user.id +"'>"+ user.name +"</span>"
+			if (Auth.isHost || user.id === Auth.userID) {
+				partyUserList += "<span class='edit' id='edit-"+user.id+"'>edit</span>"
+				editable.push(user.id)
 			}
-		partyLocationTag = partyData[2]
-		Party.currentID = partyData[0]
+			partyUserList += "</li>"
+			Users.userlist['user-'+user.id] = user
+		})
+		
+		partyLocationTag = Party.partyData.location
+		Party.currentID = Party.partyData.id
 		Party.partyData = partyData
 		$('#partyLocation').html(partyLocationTag)
 		$('#userList').html(partyUserList)
-		if (Auth.isHost)
-			{
+		if (Auth.isHost) {
 			$('#user-add').show()
 			$('#party-edit').show()
-			}
+		}
 		$('#userListContainer').fadeIn(200)
 		$('#userViewContainer').show()
-		for (id in Users.userlist)
-			{
-			$('#'+id).hover(Users.limousein, Users.limouseout)
-			$('#'+id).click(Users.liclick)
-			}
-		for (i in editable)
-			{
-			$('#edit-'+editable[i]).bind("click",Users.editClick)
-			}
+		for (id in Users.userlist) {
+			$('#'+id).hover(Users.limousein, Users.limouseout).click(Users.liclick).data('user', Users.userlist[id])
+		}
+		for (i in editable) {
+			$('#edit-'+editable[i]).bind("click",Users.editClick).data('user', Users.userlist[editable[i]])
+		}
 		Users.hovering = true
 		},
 	addClick: function ()
@@ -860,7 +830,7 @@ var Auth =
 
 		// 0 id  1 name  2 firstname  3 email  4 access
 		var user = Auth.user = json.user
-		
+
 		var name = user.name.split(' ')[0] || user.email.split('@')[0]
 		warn( "Logged in! Hello "+name )
 		Auth.userID = user.id
diff --git a/public/protocols/index.html b/public/protocols/index.html
index 9b68f4b..62a5ebf 100644
--- a/public/protocols/index.html
+++ b/public/protocols/index.html
@@ -224,8 +224,8 @@ Illustration by <a href="http://mollycrabapple.com/" target="_blank">Molly Craba
 </section>
 
 </body>
-<script type="text/javascript" src="jquery-1.4.4.min.js"></script>
-<script type="text/javascript" src="base64.js"></script>
-<script type="text/javascript" src="protocols_site.js"></script>
+<script type="text/javascript" src="/js/jquery-1.4.4.min.js"></script>
+<script type="text/javascript" src="/js/base64.js"></script>
+<script type="text/javascript" src="/js/protocols_site.js"></script>
 </html>