diff app/helpers/activities_helper.rb @ 1338:25603efa57b5

Merge from live branch

--- a/app/helpers/activities_helper.rb	Wed Jan 23 13:11:25 2013 +0000
+++ b/app/helpers/activities_helper.rb	Thu Jun 20 13:14:14 2013 +0100
@@ -15,11 +15,11 @@
     end
   end
 
-  def busy_projects(events, count)
+  def project_activity_on_events(events)
 
     # Score each project for which there are any events, by giving
     # each event a score based on how long ago it was (the more recent
-    # the better).
+    # the better). Return a hash mapping project id to score.
 
     projhash = Hash.new
     
@@ -40,6 +40,89 @@
       end
     end
 
+    projhash
+  end
+
+  def projects_by_activity(user, count)
+
+    # Return up to count of the user's project ids ordered by that user's
+    # recent activity, omitting any projects for which no activity
+    # occurred in the recent past and any projects not visible to
+    # the current user
+
+    activity = Redmine::Activity::Fetcher.new(User.current, :author => user)
+
+    # Limit scope so as to exclude issues (which non-members can add)
+    activity.scope = [ "changesets", "files", "documents", "news", "wiki_edits", "messages", "time_entries", "publications" ]
+
+    days = Setting.activity_days_default.to_i
+    events = activity.events(Date.today - days, Date.today + 1)
+    projhash = project_activity_on_events(events)
+    projhash.keys.sort_by { |k| -projhash[k] }.first(count)
+  end
+
+  def render_active_colleagues(colleagues)
+
+    s = ""
+
+    start = Time.now
+
+    my_inst = ""
+    if ! User.current.ssamr_user_detail.nil?
+      my_inst = User.current.ssamr_user_detail.institution_name
+    end
+
+    actives = Hash.new
+    for c in colleagues
+      u = User.find_by_id(c)
+      active_projects = projects_by_activity(u, 3)
+      if !active_projects.empty?
+        actives[c] = active_projects
+      end
+    end
+
+    if actives.empty?
+      l(:label_no_active_colleagues)
+    else
+
+      s << "<dl>"
+      for c in actives.keys.sample(10)
+        u = User.find_by_id(c)
+        s << "<dt>"
+        s << avatar(u, :size => '24')
+        s << "<span class='user'>"
+        s << h(u.name)
+        s << "</span>"
+        if !u.ssamr_user_detail.nil?
+          inst = u.ssamr_user_detail.institution_name
+          if inst != "" and inst != my_inst
+            s << " - <span class='institution'>"
+            s << h(u.ssamr_user_detail.institution_name)
+            s << "</span>"
+          end
+        end
+        s << "</dt>"
+        s << "<dd>"
+        s << "<span class='active'>"
+        s << (actives[c].map { |p| link_to_project(p) }.join ", ")
+        s << "</span>"
+      end
+      s << "</dl>"
+
+      finish = Time.now
+      logger.info "render_active_colleagues: took #{finish-start}"
+    
+      s.html_safe
+    end
+  end
+
+  def busy_projects(events, count)
+
+    # Return a list of count projects randomly selected from amongst
+    # the busiest projects represented by the given activity events
+
+    projhash = project_activity_on_events(events)
+
     # pick N highest values and use cutoff value as selection threshold
     threshold = projhash.values.sort.last(count).first