Index: openacs-4/packages/assessment-portlet/www/assessment-portlet.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/Attic/assessment-portlet.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.xql	7 Apr 2006 23:12:50 -0000	1.5
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.xql	26 Sep 2006 04:10:09 -0000	1.6
@@ -3,14 +3,26 @@
 
 <fullquery name="answered_assessments">
 	<querytext>
-select ass.*, sc.node_id as comm_node_id, sa.node_id as as_node_id, p.instance_name as community_name from 
-  (select cr.item_id as assessment_id, cr.title, cr.description, cf.package_id
+select * from (select ass.*, sc.node_id as comm_node_id, sa.node_id as as_node_id, p.instance_name as community_name,
+acs_permission__permission_p(ass.assessment_id,:user_id,'admin') as admin_p,
+	(select count(*) from as_sessions s1 where
+         s1.assessment_id=ass.assessment_id
+	 and s1.subject_id=:user_id
+         and completed_datetime is null) as in_progress_p,
+	(select count(*) from as_sessions s1 where
+         s1.assessment_id=ass.assessment_id
+	 and s1.subject_id=:user_id
+         and completed_datetime is not null) as completed_p
+ from 
+  (select cr.item_id as assessment_id, cr.title, cr.description, cf.package_id,
+   a.number_tries, a.end_time
    from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf,
       (  select distinct s.assessment_id
          from as_sessions s
          where s.subject_id = :user_id
          and s.completed_datetime is not null) s
          where a.assessment_id = cr.revision_id --
+	and cf.package_id in ([join $list_of_package_ids ", "])
          and cr.item_id = ci.item_id
          and ci.parent_id = cf.folder_id
          and s.assessment_id = a.assessment_id
@@ -20,6 +32,7 @@
 and sc.node_id = sa.parent_id
 and p.package_id = sc.object_id
 order by lower(p.instance_name), lower(ass.title)
+) q where ((q.number_tries is not null and q.completed_p >= q.number_tries) or q.end_time > current_timestamp) and (q.in_progress_p <1)
 	</querytext>
 </fullquery>