From 55f1d11f66f216f0aff40fbe3ba90373339beb55 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Mon, 7 Apr 2014 02:48:17 -0400
Subject: profiles updated

---
 app/views/matches/index.html.erb |  3 ++-
 app/views/users/show.html.erb    | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

(limited to 'app/views')

diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index def97ba..78c97bb 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -38,7 +38,8 @@
   <SVG version="1.1"
   baseProfile="full"
   width="100%" height="<%= @height = [@height, 500].max %>"
-  xmlns="http://www.w3.org/2000/svg">
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
      <% lastrx = 0
        lastry = 0 
        lastrh = 0
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 7bda009..c2b5c75 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,10 +1,8 @@
-<p>
-  <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %>
-</p>
+
+<h1> <%= @user.user_name %>'s Profile </h1>
 
 <p>
-  <strong>Name:</strong>
-  <%= @user.name %>
+  <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %>
 </p>
 
 <p>
@@ -13,9 +11,35 @@
 </p>
 
 <p>
-  <strong>User name:</strong>
+  <strong>Preferred name:</strong>
   <%= @user.user_name %>
 </p>
 
+<p>
+  <strong>Relationship Status:</strong>
+  too single
+</p>
+
+<div class="row">
+	<div class="col-md-6">
+	  	<h3> Recent Tournaments Players </h3>
+		<ul>
+			<% @user.tournaments_played.each do |t| %>
+				<li><%= t.name %></li>
+			<% end %>
+		</ul>
+	  </div>
+    <div class="col-md-6">
+    	<h3> Recent Tournaments Hosted </h3>
+    	<% if  @user.tournaments_hosted.count == 0 %> <p> <%= @user.user_name %> has never hosted a tournament </p> <%end %>
+		<ul>
+			<% @user.tournaments_hosted.each do |t| %>
+				<li><%= t.name %></li>
+			<% end %>
+		</ul>
+	  </div>
+    </div>
+</div>
+
 <%= link_to 'Edit', edit_user_path(@user) %> |
 <%= link_to 'Users', users_path %>
-- 
cgit v1.2.3-2-g168b


From 29df65e51b2cb38e31b1c377c536e7bba1eecc90 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Mon, 7 Apr 2014 02:57:59 -0400
Subject: Updated Peer Review -- Now allows review and scoring -- not tested
 because Davis can not yaml.

---
 app/views/matches/show.html.erb          | 19 +++++++++++++++++--
 app/views/tournaments/_selected.html.erb |  4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index cd30926..a0540f9 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -117,7 +117,7 @@
 <% if @tournament.players.include?(current_user) %>
 <br />
 <div id="host">
-    <%= form_tag(tournament_match_path(@tournament, @match), method: "put") do %>
+    <%= form_tag(tournament_match_path(@tournament, @match), method: "put", name: "peeris") do %>
     	<% case @match.status %>
 		<% when 0 %>
         	<input type="hidden" name="update_action" value="start">
@@ -126,8 +126,9 @@
             <input type="hidden" name="update_action" value="peer">
         	<%= submit_tag("Begin Peer Evaluation") %>
         <% when 2 %>
+		<input type="hidden" name="review_action" value="">
         	<input type="hidden" name="update_action" value="finish">
-        	<%= submit_tag("End Match") %>   
+        	<%= submit_tag("End Peer Evaluation", :onsubmit => "score_peers()") %>   
          <% when 3 %>
         	<input type="hidden" name="update_action" value="reset">
         	<%= submit_tag("Reset Status") %>   
@@ -136,3 +137,17 @@
 
 </div>
 <% end %>
+
+<script type="text/javascript">
+	//get each player in order and assign score here!
+	var $lisp = $('ol li peeris');
+	var comma = ","
+	for(var i=0; i < $lisp.length; i++) {
+		if ( i == lisp.length-1) {
+			comma = "";
+		} 
+		$('review_action').value +=  $('ol li peeris:eq(' + i + ')').text() + comma;
+	}
+</script>
+
+
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index d37c741..1be1adf 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -23,9 +23,9 @@
         <% when 0 %>
            <%= setting_fields.text_field( setting.name, :name ) %>
         <% when 1 %>
-           <%= setting_fields.text_area( setting.name, setting.name ) %>
+           <%#setting_fields.text_area( setting.name, setting.name ) %>
         <% when 2 %>
-           <%= setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(',') ) %>
+           <%#setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(',') ) %>
         <% when 3 %>
            <%= setting_fields.collection_check_boxes( setting.name, setting.type_opt.split(',') ) %>
         <% when 4 %>
-- 
cgit v1.2.3-2-g168b