From 952387be24043e76dfd9b7a461ee31d1246fa58e Mon Sep 17 00:00:00 2001
From: nfoy <nfoy@purdue.edu>
Date: Mon, 28 Apr 2014 00:07:57 -0400
Subject: Messages and alerts play together more nicely now.

---
 app/views/pms/index.html.erb | 69 +++++++++++++++++++++++++++++++++++++-------
 app/views/pms/show.html.erb  |  1 +
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/app/views/pms/index.html.erb b/app/views/pms/index.html.erb
index 056b371..fec6db2 100644
--- a/app/views/pms/index.html.erb
+++ b/app/views/pms/index.html.erb
@@ -23,6 +23,9 @@
           <% if conversation.is_unread?(current_user) && receipts.last.message.sender != current_user %>
             <% message = receipts.last.message %>
             <tr>
+            <% if conversation.subject == "Pay Attention!" %>
+              <% conversation.mark_as_read(current_user) %>
+            <% end %>
             <td>
               <% people = conversation.participants %>
               <% people.each do |person| %>
@@ -65,17 +68,63 @@
           <% if conversation.is_read?(current_user) || receipts.last.message.sender == current_user  %>
             <% message = receipts.last.message %>
             <tr>
-            <td>
-              <% people = conversation.participants %>
-              <% people.each do |person| %>
-                <% unless person == current_user %>
-                  <%= truncate(person.user_name, length: 20) %>
+            <% if conversation.subject != "Pay Attention!" %>
+              <td>
+                <% people = conversation.participants %>
+                <% people.each do |person| %>
+                  <% unless person == current_user %>
+                    <%= truncate(person.user_name, length: 20) %>
+                  <% end %>
                 <% end %>
-              <% end %>
-            </td>
-            <td><%= truncate(conversation.subject, length: 30) %></td>
-            <td><%= truncate(message.body, length: 42) %></td>
-            <td><%= link_to 'View', @pms.find_by(conversation: conversation) %></td>
+              </td>
+              <td><%= truncate(conversation.subject, length: 30) %></td>
+              <td><%= truncate(message.body, length: 42) %></td>
+              <td><%= link_to 'View', @pms.find_by(conversation: conversation) %></td>
+            <% end %>
+            </tr>
+          <% end %>
+        <% end %>
+      </tr>
+    <% #else %>
+      
+    <% #end %>
+  </tbody>
+</table>
+
+<br>
+<h3>Alerts</h3>
+<% conversations = current_user.mailbox.conversations %>
+
+<table>
+  <col width="150">
+  <col width="250">
+  <col width="300">
+  <tbody>
+    <%# if conversations.reject { |c| c.is_read?(current_user) || (c.receipts_for current_user).last.message.sender == current_user }.empty? %>
+      <tr>
+        <tr>
+          <td><b>With</b></td>
+          <td><b>Subject</b></td>
+          <td><b>Body</b></td>
+        </tr>
+        <% conversations.each do |conversation| %>
+          <% receipts = conversation.receipts_for current_user %>
+          <% if conversation.is_read?(current_user) || receipts.last.message.sender == current_user  %>
+            <% message = receipts.last.message %>
+            <tr>
+            <% if conversation.subject == "Pay Attention!" %>
+              <td>
+                <% people = conversation.participants %>
+                <% people.each do |person| %>
+                  <% unless person == current_user %>
+                    <%= truncate(person.user_name, length: 20) %>
+                  <% end %>
+                <% end %>
+              </td>
+              <td><%= truncate(conversation.subject, length: 30) %></td>
+              <td><%= truncate(message.body, length: 42) %></td>
+              <td><%= link_to 'View', @pms.find_by(conversation: conversation) %></td>
+            <% end %>
             </tr>
           <% end %>
         <% end %>
diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb
index ca8d9bf..2c93102 100644
--- a/app/views/pms/show.html.erb
+++ b/app/views/pms/show.html.erb
@@ -31,6 +31,7 @@
 
 <p> ________________________________________________ </p>
 <p> 
+  <% @pm.message = "" %>
   <%= form_for(@pm) do |f| %>
     <div class="field">
     <%= f.text_area :message %>
-- 
cgit v1.2.3


From ee238dbbca6ee979aa886a4f4cebad41e6f79cce Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Mon, 28 Apr 2014 00:17:33 -0400
Subject: 30 minutes to add a single line

---
 app/views/tournaments/_form.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 2a871ea..a5eba7a 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -17,6 +17,7 @@
 </fieldset>
 <% else %>
 	<%= form_for(@tournament, url: tournaments_path, method: "post") do |f| %>
+		<%= f.hidden_field(:game_id) %>
 		<p>
 			<%= f.label :name %>
 			<%= f.text_field :name %>
-- 
cgit v1.2.3