Index: openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl	30 May 2007 08:36:22 -0000	1.3
+++ openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl	24 Apr 2008 10:50:35 -0000	1.3.2.1
@@ -8,16 +8,57 @@
     @creation-date Dic 2006
 } -query {
     run_id:integer,notnull
-    member_id:integer,notnull
+    {member_id:integer ""}
 }
 
 set page_title "[_ imsld.Individual_Report]"
 set context [list]
-set member_name [party::name -party_id $member_id]
+set frame_header "[_ imsld.This]: "
 
+# Fetch the users that are active in the run
+set users_in_run [imsld::runtime::users_in_run -run_id $run_id]
+
+if { [llength $users_in_run] == 1 } {
+    set member_id [lindex $users_in_run 0]
+}
+
+template::multirow create item_select item_id item_name
+
+set select_name "member_id"
+set select_id "users_in_run"
+set post_text ""
+set selected_item ""
+set select_string ""
+    
+# If no member_id has been given, add the option pull-down menu
+if { [string eq "" $member_id] } {
+    set select_string "[_ imsld.Select]"
+} else {
+    # Set variable portrait_revision if user has portrait
+    if { [db_0or1row get_member_portrait {
+	select c.live_revision
+	from acs_rels a, cr_items c
+	where a.object_id_two = c.item_id
+	and a.object_id_one = :member_id
+	and a.rel_type = 'user_portrait_rel'}]} {
+	
+	set post_text "<img style=\"height: 100px; vertical-align: middle\" src=\"/shared/portrait-bits.tcl?user_id=$member_id\" alt=\"Portrait\"/>"
+    }
+}
+
+foreach user_id_in_run $users_in_run {
+    template::multirow append item_select $user_id_in_run \
+	"[person::name -person_id $user_id_in_run]"
+    
+    if { $member_id == $user_id_in_run} {
+	set selected_item $member_id
+    }
+}
+
 set elements [list user_name \
                   [list label "[_ imsld.Activity_Name]" \
-                       display_template {<a href="activity-frame?run_id=$run_id&type=@related_activities.type@&activity_id=@related_activities.related_id@">@related_activities.activity_name@</a>}] \
+                       display_template \
+		       {<a href="activity-frame?run_id=$run_id&type=@related_activities.type@&activity_id=@related_activities.related_id@" title="[_ imsld.Activity_report]">@related_activities.activity_name@</a>}] \
                   type \
                   [list label "[_ imsld.Activity_Type]"] \
                   started_time \
@@ -44,20 +85,36 @@
         # the elemen exists, replace the list element
         switch $status {
             started {
-                set activities_list [lreplace $activities_list [lsearch -regexp $activities_list $related_id] [lsearch -regexp $activities_list $related_id] \
-                                         [list $related_id \
-                                              [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
-                                              $type \
-                                              $status_date \
-                                              [lindex [lindex $activities_list [lsearch -regexp $activities_list $related_id]] 4]]]
+                set activities_list \
+		    [lreplace $activities_list \
+			 [lsearch -regexp $activities_list $related_id] \
+			 [lsearch -regexp $activities_list $related_id] \
+			 [list $related_id \
+			      [content::item::get_title \
+				   -item_id \
+				   [content::revision::item_id \
+					-revision_id $related_id]] \
+			      $type \
+			      $status_date \
+			      [lindex [lindex $activities_list \
+					   [lsearch -regexp $activities_list \
+						$related_id]] 4]]]
             }
             finished {
-                set activities_list [lreplace $activities_list [lsearch -regexp $activities_list $related_id] [lsearch -regexp $activities_list $related_id] \
-                                         [list $related_id \
-                                              [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
-                                              $type \
-                                              [lindex [lindex $activities_list [lsearch -regexp $activities_list $related_id]] 3] \
-                                              $status_date]]
+                set activities_list \
+		    [lreplace $activities_list \
+			 [lsearch -regexp $activities_list $related_id] \
+			 [lsearch -regexp $activities_list $related_id] \
+			 [list $related_id \
+			      [content::item::get_title \
+				   -item_id \
+				   [content::revision::item_id \
+					-revision_id $related_id]] \
+			      $type \
+			      [lindex [lindex $activities_list \
+					   [lsearch -regexp $activities_list \
+						$related_id]] 3] \
+			      $status_date]]
             }
         } 
     } else {
@@ -66,20 +123,24 @@
             started {
                 lappend activities_list \
                     [list $related_id \
-                         [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
+                         [content::item::get_title \
+			      -item_id [content::revision::item_id \
+					    -revision_id $related_id]] \
                          $type \
                          $status_date \
                          {}]
             }
             finished {
                 lappend activities_list \
                     [list $related_id \
-                         [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
+                         [content::item::get_title \
+			      -item_id [content::revision::item_id \
+					    -revision_id $related_id]] \
                          $type \
                          {} \
                          $status_date]
             }
-        } 
+        }
     }
 }
 
@@ -93,4 +154,4 @@
     -multirow related_activities \
     -key related_id \
     -no_data "[_ imsld.No_info_was_found]" \
-    -elements $elements
\ No newline at end of file
+    -elements $elements