Index: openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql	4 Oct 2005 12:36:49 -0000	1.3
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet-oracle.xql	20 Sep 2006 15:04:15 -0000	1.4
@@ -5,16 +5,20 @@
 
 <fullquery name="open_asssessments">
 	<querytext>
-select a.*, cr.item_id as assessment_id, cr.title, cr.description, a.password,
-       sc.node_id as comm_node_id, sa.node_id as as_node_id,p.instance_name as community_name
-from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf, site_nodes sa, site_nodes sc, apm_packages p
-where a.assessment_id = cr.revision_id
-and sysdate < a.end_time
-and sysdate > a.start_time
-and cr.revision_id = ci.latest_revision
-and ci.parent_id = cf.folder_id
-and cf.package_id in ([join $list_of_package_ids ", "])
-and sa.object_id = cf.package_id
+	select cr.item_id as assessment_id, cr.title, cr.description, a.password,
+	       to_char(a.start_time, 'YYYY-MM-DD HH24:MI:SS') as start_time,
+	       to_char(a.end_time, 'YYYY-MM-DD HH24:MI:SS') as end_time,
+	       to_char(sysdate, 'YYYY-MM-DD HH24:MI:SS') as cur_time,
+	       cf.package_id, p.instance_name as community_name,
+	       sc.node_id as comm_node_id, sa.node_id as as_node_id,
+	       acs_permission__permission_p(a.assessment_id,:user_id,'admin') as admin_p
+	from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf,
+	     site_nodes sa, site_nodes sc, apm_packages p
+	where a.assessment_id = cr.revision_id
+	and cr.revision_id = ci.latest_revision
+	and ci.parent_id = cf.folder_id
+	and cf.package_id in ([join $list_of_package_ids ", "])
+	and sa.object_id = cf.package_id
 	and sc.node_id = sa.parent_id
 	and p.package_id = sc.object_id
 and exists (select 1
Index: openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql	17 Feb 2006 12:17:58 -0000	1.8
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql	20 Sep 2006 15:04:15 -0000	1.9
@@ -10,7 +10,8 @@
 	       to_char(a.end_time, 'YYYY-MM-DD HH24:MI:SS') as end_time,
 	       to_char(now(), 'YYYY-MM-DD HH24:MI:SS') as cur_time,
 	       cf.package_id, p.instance_name as community_name,
-	       sc.node_id as comm_node_id, sa.node_id as as_node_id
+	       sc.node_id as comm_node_id, sa.node_id as as_node_id, a.anonymous_p,
+	       acs_permission__permission_p(a.assessment_id,:user_id,'admin') as admin_p
 	from as_assessments a, cr_revisions cr, cr_items ci, cr_folders cf,
 	     site_nodes sa, site_nodes sc, apm_packages p,
              (select distinct asm.assessment_id
Index: openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl	17 Feb 2006 12:17:58 -0000	1.9
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl	20 Sep 2006 15:04:15 -0000	1.10
@@ -32,7 +32,31 @@
 	 label "[_ assessment.open_assessments]" \
 	 display_template {<a href="@assessments.assessment_url@">@assessments.title@</a>}]
 
+lappend elements anonymous_p \
+    [list \
+	 label "[_ assessment-portlet.lt_Is_this_assessment_an]" \
+	 display_template {<if @assessments.anonymous_p@ eq "t">Yes</if><else>No</else>}]
 
+if {[llength $list_of_package_ids]==1} {
+    set admin_p [permission::permission_p \
+		     -party_id $user_id \
+		     -privilege admin \
+		     -object_id $list_of_package_ids]
+} else {
+    set admin_p 0
+}
+
+if {$admin_p} {
+    set hide 0
+} else {
+    set hide 1
+}
+
+lappend elements results {
+            hide_p $hide
+	    label "[_ assessment.View_results]"
+	    display_template {<a href="assessment/asm-admin/results-users?assessment_id=@assessments.assessment_id@">\#assessment.View_results\#</a>}
+	}
 # create a list with all open assessments
 template::list::create \
     -name assessments \
@@ -42,10 +66,10 @@
     -main_class narrow
 
 # get the information of all open assessments
-template::multirow create assessments assessment_id title description assessment_url community_url community_name
+template::multirow create assessments assessment_id title description assessment_url community_url community_name anonymous_p
 set old_comm_node_id 0
 db_foreach open_asssessments {} {
-	if {$comm_node_id == $old_comm_node_id} {
+	if {$comm_node_id == $old_comm_node_id} {e
 	    set community_name ""
 	}
 	set community_url [site_node::get_url -node_id $comm_node_id]
@@ -58,7 +82,7 @@
 	    append assessment_url [export_vars -base "assessment-password" {assessment_id}]
 	}
 
-	template::multirow append assessments $assessment_id $title $description $assessment_url $community_url $community_name
+	template::multirow append assessments $assessment_id $title $description $assessment_url $community_url $community_name $anonymous_p
 }