Index: openacs-4/packages/assessment/www/asm-admin/results-users.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.xql,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/assessment/www/asm-admin/results-users.xql	24 Jan 2007 20:15:30 -0000	1.2.2.1
+++ openacs-4/packages/assessment/www/asm-admin/results-users.xql	7 Jul 2007 00:27:51 -0000	1.2.2.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="assessment_results">
+<fullquery name="assessment_results_orig">
 	<querytext>
 	select s.session_id, s.subject_id, s.percent_score,
 	       to_char(s.completed_datetime, :format) as completed_datetime,
@@ -21,4 +21,56 @@
 	order by s.completed_datetime
 	</querytext>
 </fullquery>
+
+<fullquery name="assessment_results">
+	<querytext>
+    select  a.title, 
+	a.user_id, a.first_names, a.last_name,
+    to_char(cs.completed_datetime, :format) as completed_datetime,
+    to_char(coalesce(cs.last_mod_datetime, ns.last_mod_datetime), :format) as last_mod_datetime,
+    coalesce(cs.subject_id, ns.subject_id) as subject_id,
+    coalesce(cs.session_id, ns.session_id) as session_id,
+    cs.percent_score,
+    a.last_name || ', ' || a.first_names as subject_name
+ 
+    from (select a.assessment_id, cr.title, cr.item_id, cr.revision_id,
+	  u.user_id, u.first_names, u.last_name
+	  
+	  from as_assessments a, cr_revisions cr, cr_items ci, acs_users_all u
+	  where a.assessment_id = cr.revision_id
+	  and cr.revision_id = ci.latest_revision
+	  and ci.parent_id = :folder_id
+          and u.user_id <> 0 
+	  and exists (
+                      select 1 from acs_object_party_privilege_map
+                      where object_id = :assessment_id
+                      and party_id = u.user_id
+                      and privilege = 'read')) a
+    left join (select as_sessions.*, cr.item_id
+	       from as_sessions, cr_revisions cr
+	       where session_id in (select max(session_id)
+				    from as_sessions, acs_objects o
+				    where not completed_datetime is null
+                                    and o.object_id = session_id
+                                    and o.package_id = :package_id
+				    group by subject_id, assessment_id )
+               and revision_id=assessment_id) cs
+    on (a.user_id = cs.subject_id and a.item_id = cs.item_id)
+
+    left join (select *
+	       from as_sessions
+	       where session_id in (select max(session_id)
+				    from as_sessions, acs_objects o
+				    where completed_datetime is null
+                                    and o.object_id = session_id
+                                    and o.package_id = :package_id
+                                    group by subject_id, assessment_id)) ns
+    on (a.user_id = ns.subject_id and a.assessment_id = ns.assessment_id)
+
+    where true
+    [list::filter_where_clauses -and -name "results"]
+
+    order by lower(a.title), lower(a.last_name), lower(a.first_names)          
+	</querytext>
+</fullquery>
 </queryset>