scoping added

.gitignore

@@ -0,0 +1,6 @@
+db/*.sqlite3
+db/schema.rb
+config/database.yml
+log/*.log
+tmp/**/*
+

app/models/event.rb

@@ -5,7 +5,6 @@ class Event < ActiveRecord::Base
 
   has_many :participants
   has_many :attendees, :through => :participants, :source => :user
-  # has_many :users, :through => :participants
 
   accepts_nested_attributes_for :participants
 

app/models/user.rb

@@ -4,6 +4,13 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
+  scope :investors, where('investor_id IS NOT NULL')
+  scope :employees, where('investor_id IS NULL')
+
+  # if the assignments were all there this would work
+  #scope :investors, joins(:assignments).where('assignments.role_id = 3')
+  #scope :employees, joins(:assignments).where('assignments.role_id in (1,2)')
+
   def has_role(role)
     self.roles.find_by_name(role)
   end
@@ -30,5 +37,9 @@ def has_role(role)
   has_many :roles, :through => :assignments
 
   accepts_nested_attributes_for :participants
+
+  def to_s
+    [first_name, last_name].join(' ')
+  end
 
 end

app/views/events/show.html.erb

@@ -19,7 +19,7 @@
 			<th class='left'>Investors Present</th>
 			<td class='left'>
 				<ul>
-					<% @event.attendees.each do |attendee| %>
+					<% @event.attendees.investors.each do |attendee| %>
 						<li><%= attendee.first_name %></li>
 					<% end %>
 				</ul>
@@ -29,15 +29,15 @@
 			<th class='left'>H12 Team Present</th>
 			<td class='left'>
 				<ul>
-					<%  %>
-						<li><%=  %></li>
-					<%  %>
+					<% @event.attendees.employees.each do |attendee| %>
+						<li><%= attendee.first_name %></li>
+					<% end %>
 				</ul>
 			</td>
 		</tr>
 		<tr>
 			<th class='left'>User ID</th>
-			<td class='left'><%= @event.user_id %></td>
+			<td class='left'><%= @event.user %></td>
 		</tr>
 	</table>
 

app/views/investors/show.html.erb

@@ -125,7 +125,7 @@
 			<td class='left'><%= task.investor.name %></td>
 			<td class='left'><%= link_to 'Edit', edit_investor_task_path(@investor, task) %></td>
 			<td class='left'>
-				<%= link_to_function 'Destroy', "destroy_it_now('tasks', #{task.id.to_s})" %>
+				<%= link_to 'Destroy', "#", :onclick => 'return false;', :class => 'destroy', 'data-model' => 'tasks', 'data-id' => task.id.to_s  %>
 			</td>
 		</tr>
 		<% end %>
@@ -158,7 +158,7 @@
 			<td class='left'><%= event.user.first_name %></td>
 			<td class='left'><%= link_to 'Edit', edit_investor_event_path(@investor, event) %></td>
 			<td class='left'>
-				<%= link_to_function 'Destroy', "destroy_it_now('events', #{event.id.to_s})" %>
+				<%= link_to 'Destroy', "#", :onclick => 'return false;', :class => 'destroy', 'data-model' => 'events', 'data-id' => event.id.to_s  %>
 			</td>
 		</tr>
 		<% end %>
@@ -169,11 +169,4 @@
 
 <div class='back_footer'>
 	<%= link_to "< Back", investors_path %>
-</div>
-
-<script type="text/javascript" charset="utf-8">
-	function destroy_it_now(model_name, item_id) {
-		$('#' + model_name + '_' + item_id).hide();
-		$.post('/' + model_name + '/' + item_id, {_method : 'delete', authenticity_token : '<%= form_authenticity_token %>'});
-	}	
-</script>
+</div>

config/initializers/date_formats.rb

@@ -0,0 +1 @@
+Date::DATE_FORMATS[:default] = "%m/%d/%y"