--- /dev/null
+++ b/app/models/event/debug_event.rb
@@ -0,0 +1,3 @@
+class DebugEvent < ActiveRecord::Base
+  
+end

--- /dev/null
+++ b/app/models/event/error_event.rb
@@ -0,0 +1,3 @@
+class ErrorEvent < ActiveRecord::Base
+  
+end

--- a/app/models/event/event.rb
+++ b/app/models/event/event.rb
@@ -3,7 +3,25 @@ class Event < ActiveRecord::Base
   protected
   
     def self.find_by_project(project_id)
-      find(:all, :conditions => ["project_id = '#{project_id}'"], :order => "created_at DESC")
+      find_by_sql ["SELECT events.id,
+                           events.entry_type,
+                           events.entry_id,
+                           events.project_id,
+                           events.user_id,
+                           users.fullname AS user_fullname,
+                           users.slug AS user_slug,
+                           events.created_at,
+                           coalesce(system_events.summary,
+                                    debug_events.summary,
+                                    error_events.summary
+                                   ) AS summary
+                    FROM events
+                    LEFT JOIN system_events ON events.entry_type = 'system' AND events.entry_id = system_events.id
+                    LEFT JOIN debug_events ON events.entry_type = 'debug' AND events.entry_id = debug_events.id
+                    LEFT JOIN error_events ON events.entry_type = 'debug' AND events.entry_id = error_events.id
+                    LEFT JOIN users ON events.user_id = users.id
+                    WHERE project_id = '#{project_id}'
+                    ORDER BY events.created_at DESC"]
     end
   
 end

--- /dev/null
+++ b/app/models/event/system_event.rb
@@ -0,0 +1,3 @@
+class SystemEvent < ActiveRecord::Base
+  
+end

--- a/app/views/events/ac_project_index.html.erb
+++ b/app/views/events/ac_project_index.html.erb
@@ -9,20 +9,18 @@
 
 <tr>
   <th width='<%= STYLE_TABLE_COL_WIDTH_ID %>'>ID</th>
-  <th></th>
-  <th></th>
-  <th></th>
-  <th></th>
+  <th width='120'>Type</th>
+  <th>Summary</th>
+  <th width='<%= STYLE_TABLE_COL_WIDTH_USER_NAME %>'>User</th>
   <th width='<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>'>Created</th>
 </tr>
 
 <% for event in @events %>
 <tr>
   <td><%= event.id %></td>
-  <td><%= event.entry_type %></td>
-  <td><%= event.entry_id %></td>
-  <td><%= event.project_id %></td>
-  <td><%= event.user_id %></td>
+  <td><%= event.entry_type.to_s.capitalize %></td>
+  <td><%= event.summary %></td>
+  <td><%= link_to event.user_fullname, user_path(event.user_slug) if ! event.user_fullname.nil? %></td>
   <td><%= format_datetime_ddmmyyhhmm(event.created_at) %></td>
 </tr>
 <% end %>

--- a/db/migrate/401_create_events.rb
+++ b/db/migrate/401_create_events.rb
@@ -4,6 +4,10 @@
 # Message - messages posted by developers (different to a commit message, and different to an article)
 # Error - error log messages
 # Debug - debug log messages
+# System - system log messages
+# 
+# Note: Journal events table in CreateJournal
+
 
 class CreateEvents < ActiveRecord::Migration
 
@@ -34,7 +38,6 @@ class CreateEvents < ActiveRecord::Migration
       t.string :summary
     end
     add_index :error_events, [:id]
-
   end
 
   

--- a/test/fixtures/events.yml
+++ b/test/fixtures/events.yml
@@ -3,6 +3,18 @@
 #
 #
 
+<% fixtures :projects, :users %>
+
 1:
   id: 1
   entry_type: :system
+  entry_id: 1
+
+2:
+  id: 2
+  entry_type: :system
+  entry_id: 2
+  project_id: <%= projects(:gitlab) %>
+  user_id: <%= users(:mtkd) %>
+
+

--- /dev/null
+++ b/test/fixtures/system_events.yml
@@ -0,0 +1,13 @@
+
+#
+#
+#
+
+1:
+  id: 1
+  summary: "Build"
+
+2:
+  id: 2
+  summary: "Project GitLab created"
+