app/models/activity_observer.rb app/views/home/_activity.html.haml test/unit/activity_observer_test.rb @@ -7,6 +7,7 @@ then you win. –- Mahatma Gandhi Wed, Apr 8, 2009 --------------------------------------------------------------------- - Created Activity model, related table, and factory. +- Basic initial implementation of activity observers and recent activity. Tue, Apr 7, 2009 --------------------------------------------------------------------- CHANGELOG @@ -5,9 +5,10 @@ class HomeController < ApplicationController #---------------------------------------------------------------------------- def index - @hello = "world" + @hello = "Hello world" # The hook below can access controller's instance variables. hook(:home_controller, self, :params => "it works!") - logger.p "Hello, #{@hello}!" + + @activities = Activity.latest end # Save expand/collapse state in the session. AJAX app/controllers/home_controller.rb @@ -21,12 +21,13 @@ # class Account < ActiveRecord::Base - belongs_to :user - has_many :account_contacts, :dependent => :destroy - has_many :contacts, :through => :account_contacts, :uniq => true - has_many :account_opportunities, :dependent => :destroy - has_many :opportunities, :through => :account_opportunities, :uniq => true, :order => "id DESC" - has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + belongs_to :user + has_many :account_contacts, :dependent => :destroy + has_many :contacts, :through => :account_contacts, :uniq => true + has_many :account_opportunities, :dependent => :destroy + has_many :opportunities, :through => :account_opportunities, :uniq => true, :order => "id DESC" + has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + has_many :activities, :as => :subject, :order => 'created_at DESC' uses_mysql_uuid uses_user_permissions app/models/account.rb @@ -1,7 +1,8 @@ class Activity < ActiveRecord::Base - belongs_to :user - belongs_to :asset, :polymorphic => true + belongs_to :user + belongs_to :subject, :polymorphic => true + named_scope :latest, lambda { { :conditions => [ "activities.created_at >= ?", Date.today - 1.week ], :include => :user, :order => "activities.created_at DESC" } } - validates_presence_of :user, :asset + validates_presence_of :user, :subject end app/models/activity.rb @@ -26,10 +26,11 @@ # class Campaign < ActiveRecord::Base - belongs_to :user - has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' - has_many :leads, :dependent => :destroy, :order => "id DESC" - has_many :opportunities, :dependent => :destroy, :order => "id DESC" + belongs_to :user + has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + has_many :leads, :dependent => :destroy, :order => "id DESC" + has_many :opportunities, :dependent => :destroy, :order => "id DESC" + has_many :activities, :as => :subject, :order => 'created_at DESC' named_scope :only, lambda { |filters| { :conditions => [ "status IN (?)" + (filters.delete("other") ? " OR status IS NULL" : ""), filters ] } } uses_mysql_uuid app/models/campaign.rb @@ -17,6 +17,7 @@ class Comment < ActiveRecord::Base belongs_to :user belongs_to :commentable, :polymorphic => true + has_many :activities, :as => :subject, :order => 'created_at DESC' validates_presence_of :user_id, :commentable_id, :commentable_type, :comment end app/models/comment.rb @@ -33,14 +33,15 @@ # class Contact < ActiveRecord::Base - belongs_to :user - belongs_to :lead - belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to - has_one :account_contact, :dependent => :destroy - has_one :account, :through => :account_contact - has_many :contact_opportunities, :dependent => :destroy - has_many :opportunities, :through => :contact_opportunities, :uniq => true, :order => "id DESC" - has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + belongs_to :user + belongs_to :lead + belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to + has_one :account_contact, :dependent => :destroy + has_one :account, :through => :account_contact + has_many :contact_opportunities, :dependent => :destroy + has_many :opportunities, :through => :contact_opportunities, :uniq => true, :order => "id DESC" + has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + has_many :activities, :as => :subject, :order => 'created_at DESC' uses_mysql_uuid uses_user_permissions app/models/contact.rb @@ -33,11 +33,12 @@ # class Lead < ActiveRecord::Base - belongs_to :user - belongs_to :campaign - belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to - has_one :contact - has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + belongs_to :user + belongs_to :campaign + belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to + has_one :contact + has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + has_many :activities, :as => :subject, :order => 'created_at DESC' named_scope :only, lambda { |filters| { :conditions => [ "status IN (?)" + (filters.delete("other") ? " OR status IS NULL" : ""), filters ] } } named_scope :converted, :conditions => "status='converted'" named_scope :for_campaign, lambda { |id| { :conditions => [ "campaign_id=?", id ] } } app/models/lead.rb @@ -22,15 +22,16 @@ # class Opportunity < ActiveRecord::Base - belongs_to :user - belongs_to :account - belongs_to :campaign - belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to - has_one :account_opportunity, :dependent => :destroy - has_one :account, :through => :account_opportunity - has_many :contact_opportunities, :dependent => :destroy - has_many :contacts, :through => :contact_opportunities, :uniq => true, :order => "id DESC" - has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + belongs_to :user + belongs_to :account + belongs_to :campaign + belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to + has_one :account_opportunity, :dependent => :destroy + has_one :account, :through => :account_opportunity + has_many :contact_opportunities, :dependent => :destroy + has_many :contacts, :through => :contact_opportunities, :uniq => true, :order => "id DESC" + has_many :tasks, :as => :asset, :dependent => :destroy, :order => 'created_at DESC' + has_many :activities, :as => :subject, :order => 'created_at DESC' named_scope :only, lambda { |filters| { :conditions => [ "stage IN (?)" + (filters.delete("other") ? " OR stage IS NULL" : ""), filters ] } } uses_mysql_uuid app/models/opportunity.rb @@ -23,9 +23,10 @@ class Task < ActiveRecord::Base attr_accessor :calendar - belongs_to :user - belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to - belongs_to :asset, :polymorphic => true + belongs_to :user + belongs_to :assignee, :class_name => "User", :foreign_key => :assigned_to + belongs_to :asset, :polymorphic => true + has_many :activities, :as => :subject, :order => 'created_at DESC' # Base scopes to be combined with the due date and completion time. named_scope :my, lambda { |user| { :conditions => [ "(user_id = ? AND assigned_to IS NULL) OR assigned_to = ?", user.id, user.id ], :include => :assignee } } app/models/task.rb @@ -1,5 +1,11 @@ -.title_tools Not implemented yet. -.title Dashboard +.title Recent Activity +.list#activities + - unless @activities.empty? + = render :partial => "activity", :collection => @activities + - else + %div There are no recorded activities yet. + + / Check out HTML source to view the output of the hook if you have sample plugin installed http://github.com/michaeldv/crm_sample_plugin/tree/master app/views/home/index.html.haml @@ -73,7 +73,7 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # Please note that observers generated using script/generate observer need to have an _observer suffix - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer + config.active_record.observers = :activity_observer # Have migrations with numeric prefix instead of UTC timestamp. config.active_record.timestamped_migrations = false config/environment.rb @@ -13,3 +13,5 @@ Sass::Plugin.options[:css_location] = File.join(RAILS_ROOT, "public/stylesheets" #--------------------------------------------------------------------- Date::DATE_FORMATS[:mmddyyyy] = "%m/%d/%Y" +Date::DATE_FORMATS[:mmdd] = "%b %e" +Date::DATE_FORMATS[:mmddhhss] = "%b %e at %I:%M%p" config/initializers/fat_free_crm.rb @@ -1,11 +1,11 @@ class CreateActivities < ActiveRecord::Migration def self.up create_table :activities, :force => true do |t| - t.references :user # User who's activity gets recorded. - t.references :asset, :polymorphic => true # Associated asset, including tasks. + t.references :user # User who's activity gets recorded. + t.references :subject, :polymorphic => true # Points to related asset (account, contact, etc.). t.string :action, :limit => 32, :default => "created" # Action taken: created, updated, deleted. - t.string :info, :default => "" # Extra information related to the asset and the action. - t.boolean :private, :default => false # True if the action shouldn't be shared with others. + t.string :info, :default => "" # Extra information related to the asset and the action. + t.boolean :private, :default => false # True if the action shouldn't be shared with others. t.timestamps end db/migrate/017_create_activities.rb @@ -68,7 +68,7 @@ end #---------------------------------------------------------------------------- Factory.define :activity do |a| a.user { |a| a.association(:user) } - a.asset { raise "Please specify :asset for the activity" } + a.subject { raise "Please specify :subject for the activity" } a.action nil a.info nil a.private false spec/factories.rb @@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Activity do before(:each) do @valid_attributes = { - :user => Factory(:user), - :asset => Factory(:lead) + :user => Factory(:user), + :subject => Factory(:lead) } end spec/models/activity_spec.rb 815985fedd11486a0183cb931ae472c597f8fad1 Mike Dvorkin mike@dvorkin.net http://github.com/mocra/fat_free_crm/commit/c3e97a3df26d72cb16ab6b9f30da37f6c60f73f0 c3e97a3df26d72cb16ab6b9f30da37f6c60f73f0 2009-04-08T14:28:02-07:00 2009-04-08T14:28:02-07:00 Basic initial implementation of activity observers and recent activity [#17 state:open] ecd2bf159ee390890f3833e09531bf70675528ed Mike Dvorkin mike@dvorkin.net