e9_crm 0.1.24 → 0.1.25

data/app/models/campaign.rb

@@ -38,7 +38,7 @@ class Campaign < ActiveRecord::Base
   scope :of_group, lambda {|val| joins(:campaign_group).where(:campaign_group_id => val.to_param) }
   scope :typed,    lambda { where(arel_table[:type].not_eq('NoCampaign')) }
   scope :ordered,  lambda { order(arel_table[:name].asc) }
-  
+
   scope :reports, lambda {|*args|
     options = args.extract_options!
 
@@ -50,6 +50,7 @@ class Campaign < ActiveRecord::Base
       COUNT(deals.id)                                   lead_count,
 
       SUM(IF(deals.status='won',1,0))               won_deal_count,
+      SUM(IF(deals.status IN('won','lost'),1,0)) closed_deal_count,
       SUM(IF(deals.status='won',deals.value,0))        total_value, 
       AVG(IF(deals.status='won',deals.value,NULL))   average_value, 
       
@@ -60,10 +61,13 @@ class Campaign < ActiveRecord::Base
       rv.count                                       repeat_visits,
       nv.count                                          new_visits,
 
-      FLOOR(AVG(
-        DATEDIFF(
-          deals.closed_at,
-          deals.created_at)))                       average_elapsed
+      SUM(DATEDIFF(
+        deals.closed_at,
+        deals.created_at))                           total_elapsed,
+
+      AVG(DATEDIFF(
+        deals.closed_at,
+        deals.created_at))                         average_elapsed
     SQL
 
     select(selects)

data/app/views/e9_crm/campaigns/_reports_table.html.haml

@@ -60,7 +60,10 @@
             = m record.average_cost
           %td.record-average-elapsed.num
             - dat[:average_elapsed] << record.average_elapsed
-            = record.average_elapsed && "%s days" % record.average_elapsed || 'n/a'
+            = record.closed_deal_count > 0 ? record.average_elapsed && ("%i days" % record.average_elapsed) || 0 : 'n/a'
+
+        - dat[:closed_deal_count] << record.closed_deal_count
+        - dat[:total_elapsed]     << record.total_elapsed
 
     %tfooter
       %tr{:class => 'record-totals'}
@@ -75,14 +78,18 @@
         %td.record-deal-count.num
           = dat[:deal_count].sum.to_i
         %td.record-won-deal-count.num
-          = dat[:won_deal_count].sum.to_i
+          = won_deal_count = dat[:won_deal_count].sum.to_i
         %td.record-total-value.num
-          = m dat[:total_value].compact.sum
+          - total_value = dat[:total_value].compact.sum
+          = m(total_value)
         %td.record-average-value.num
-          = m dat[:average_value].compact.average
+          = m(total_value.to_f / won_deal_count)
         %td.record-total-cost.num
-          = m dat[:total_cost].compact.sum
+          - total_cost = dat[:total_cost].compact.sum
+          = m(total_cost)
         %td.record-average-cost.num
-          = m dat[:average_cost].compact.average
+          = m(total_cost.to_f / won_deal_count)
         %td.record-average-elapsed.num
-          = "%s days" % dat[:average_elapsed].compact.average
+          - total_elapsed     = dat[:total_elapsed].compact.sum.to_f
+          - closed_deal_count = dat[:closed_deal_count].sum.to_i
+          = "%i days" % (total_elapsed / closed_deal_count)

data/lib/e9_crm/rack/contact_auto_completer.rb

@@ -33,7 +33,7 @@ module E9Crm::Rack
           contacts = []
         end
 
-        [200, {"Content-Type" => "application/json", "Cache-Control" => "max-age=3600, must-revalidate"}, [contacts.to_json]]
+        [200, {"Content-Type" => "application/json", "Cache-Control" => "no-cache"}, [contacts.to_json]]
       else
         [404, {"Content-Type" => "text/html", "X-Cascade" => "pass"}, ["Not Found"]]
       end

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.24'
+  VERSION = '0.1.25'
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails