From 9823642115ef52f0a21b9466cef412098a124f3d Mon Sep 17 00:00:00 2001
From: nfoy <nfoy@purdue.edu>
Date: Thu, 24 Apr 2014 19:03:36 -0400
Subject: Mailboxer progress without generate changes.

---
 app/controllers/pms_controller.rb |  10 +++-
 app/views/pms/_form.html.erb      |   4 ++
 app/views/pms/index.html.erb      | 117 ++++++++++++++++++++++----------------
 app/views/pms/show.html.erb       |   2 +-
 4 files changed, 80 insertions(+), 53 deletions(-)

diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
index 1d6540d..9dbe760 100644
--- a/app/controllers/pms_controller.rb
+++ b/app/controllers/pms_controller.rb
@@ -24,11 +24,11 @@ class PmsController < ApplicationController
 	def create
 		@pm = Pm.new(pm_params)
 		@pm.author = current_user
-		require 'pp'
-		pp @pm.message
+		#require 'pp'
+		#pp @pm.message
 		@pm.recipient = User.find_by_user_name(pm_params['recipient_id'])
 
-		@pm.author.send_message(@pm.recipient, @pm.message, 'Default')
+		@pm.conversation = @pm.author.send_message(@pm.recipient, @pm.message, @pm.subject).conversation
 
 		respond_to do |format|
 			if @pm.save
@@ -41,6 +41,10 @@ class PmsController < ApplicationController
 		end
 	end
 
+	#def reply
+	#	current_user.reply_to_conversation(conversation, message)
+	#end
+
 	# PATCH/PUT /pms/1
 	# PATCH/PUT /pms/1.json
 	def update
diff --git a/app/views/pms/_form.html.erb b/app/views/pms/_form.html.erb
index e9a7c08..b329e24 100644
--- a/app/views/pms/_form.html.erb
+++ b/app/views/pms/_form.html.erb
@@ -14,6 +14,10 @@
   <div class="field">
     <%= f.label :recipient_id %><br>
     <%= f.text_field :recipient_id %>
+  </div>
+    <div class="field">
+    <%= f.label :subject %><br>
+    <%= f.text_field :subject %>
   </div>
   <div class="field">
     <%= f.label :message %><br>
diff --git a/app/views/pms/index.html.erb b/app/views/pms/index.html.erb
index 1175cb2..ee31e08 100644
--- a/app/views/pms/index.html.erb
+++ b/app/views/pms/index.html.erb
@@ -1,66 +1,85 @@
-<h1>Listing pms</h1>
+<h1>Conversations</h1>
 
 <table>
-  <thead>
-    <tr>
-      <th>Author</th>
-      <th>Recipient</th>
-      <th>Message</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
   <tbody>
-
     <tr>
-      <td><h2>Inbox<h2></td>
+      <td><h3>Inbox<h3></td>
     </tr>
+    <tr>
+      <% conversations = current_user.mailbox.inbox %>
+      <% if !conversations.empty? %>
+      <%# require 'pp' %>
+      <%= conversations.class %>
+        <tr>
+          <td><b>From</b></td>
+          <td><b>Subject</b></td>
+          <td><b>Body</b></td>
+        </tr>
+        <% conversations.each do |conversation| %>
+          <% receipts = conversation.receipts_for current_user %>
+          <% receipts.each do |receipt| %>
+            <% message = receipt.message %>
+            <tr>
+            <td><%= conversation.last_sender.user_name %></td>
+            <td><%= message.subject %></td>
+            <td><%= message.body %></td>
+            <td><%# link_to 'Show', @pms.where(conversation: conversation) %></td>
+            </tr>
+          <% end %>
+        <% end %>
 
-    <% message = @pms.where(recipient: current_user) %>
-    <% unless message.empty? then message.each do |pm| %>
-      <tr>
-        <td><%= pm.author.user_name %></td>
-        <td><%= pm.recipient.user_name %></td>
-        <td><%= pm.message %></td>
-        <td><%= link_to 'Show', pm %></td>
-        <td><%# link_to 'Edit', edit_pm_path(pm) %></td>
-        <td><%= link_to 'Delete', pm, method: :delete, data: { confirm: 'Are you sure (also deletes the author\'s copy)?' } %></td>
-      </tr>
+      <% else %>
+          <td><p> No Messages </p></td>
       <% end %>
-    <% else %>
-      <td><h3>No New Messages</h3></td>
-    <% end %>
+     </tr>
 
-    <tr>
-      <td><h2>Outbox<h2></td>
+     <tr>
+      <td><h3>Outbox<h3></td>
     </tr>
-
-    <% message = @pms.where(author: current_user) %>
-    <% unless message.empty? then message.each do |pm| %>
-      <tr>
-        <td><%= pm.author.user_name %></td>
-        <td><%= pm.recipient.user_name %></td>
-        <td><%= pm.message %></td>
-        <td><%= link_to 'Show', pm %></td>
-        <td><%# link_to 'Edit', edit_pm_path(pm) %></td>
-        <td><%= link_to 'Delete', pm, method: :delete, data: { confirm: 'Are you sure (also deletes the recipient\'s copy)?'} %></td>
-      </tr>
+    <tr>
+      <% conversations = current_user.mailbox.sentbox %>
+      <% if !conversations.empty? %>
+        <tr>
+          <td><b>To</b></td>
+          <td><b>Subject</b></td>
+          <td><b>Body</b></td>
+        </tr>
+        <% conversations.each do |conversation| %>
+          <% receipts = conversation.receipts_for current_user %>
+          <% receipts.each do |receipt| %>
+            <% message = receipt.message %>
+            <tr>
+            <td>Doesn't work</td>
+            <td><%= message.subject %></td>
+            <td><%= message.body %></td>
+            <td><%# link_to 'Show', @pms.where(conversation: conversation) %></td>
+            </tr>
+          <% end %>
+        <% end %>
+            
+      <% else %>
+          <td><p> No Messages </p></td>
       <% end %>
-    <% else %>
-      <td><h3>No New Messages</h3></td>
-    <% end %>
+     </tr>
 
-    <tr>
-      <td><h2>Conversations<h2></td>
-    </tr>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Pm', new_pm_path %>
+<h1>Conversations</h1>
+
+<table>
+  <tbody>
     <tr>
       <td><h3>Inbox<h3></td>
     </tr>
     <tr>
       <% conversations = current_user.mailbox.inbox %>
-      <% if !conversations.nil? %>
+      <% if !conversations.empty? %>
+      <%# require 'pp' %>
+      <%= conversations.class %>
         <tr>
           <td><b>From</b></td>
           <td><b>Subject</b></td>
@@ -74,7 +93,7 @@
             <td><%= conversation.last_sender.user_name %></td>
             <td><%= message.subject %></td>
             <td><%= message.body %></td>
-            <td><%# link_to 'Show', pm %></td>
+            <td><%# link_to 'Show', @pm.where(conversation: conversation) %></td>
             </tr>
           <% end %>
         <% end %>
@@ -89,7 +108,7 @@
     </tr>
     <tr>
       <% conversations = current_user.mailbox.sentbox %>
-      <% if !conversations.nil? %>
+      <% if !conversations.empty? %>
         <tr>
           <td><b>To</b></td>
           <td><b>Subject</b></td>
diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb
index cfaf00d..aec160f 100644
--- a/app/views/pms/show.html.erb
+++ b/app/views/pms/show.html.erb
@@ -1,6 +1,6 @@
 <p>
   <strong>Author:</strong>
-  <%= @conversation.last_sender.user_name %>
+  <%# @conversation.last_sender.user_name %>
 </p>
 
 <p>
-- 
cgit v1.2.3-54-g00ecf