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 -r1.11 -r1.11.2.1
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl	26 Sep 2006 04:10:09 -0000	1.11
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl	16 Feb 2007 03:03:05 -0000	1.11.2.1
@@ -30,15 +30,15 @@
 lappend elements title \
     [list \
 	 label "[_ assessment.Title]" \
-	 display_template {<a href="@assessments.assessment_url@">@assessments.title@</a><if @assessments.anonymous_p@ eq "t">Yes</if><if @assessments.anonymous_p@ eq "t">(this assessment is anonymous)</if>}]
+	 display_template {<a href="@assessments.assessment_url@">@assessments.title@</a><if @assessments.anonymous_p@ eq "t">(this assessment is anonymous)</if>}]
 
 lappend elements status {
     label "[_ assessment.Status]"
     display_template {<if @assessments.status@ eq in_progress>Incomplete</if><if @assessments.status@ eq "finished">Finished</if><if @assessments.status@ eq untaken>Untaken</if>}
 }
 lappend elements take {
     label ""
-    display_template {<if @assessments.status@ ne finished><a href="@assessments.assessment_url@"><a href="@assessments.assessment_url@">Take</a></if><else><if @assessments.completed_p@ lt @assessments.number_tries@><a href="@assessments.assessment_url@">Retake</a></if></else>}
+    display_template {<if @assessments.status@ eq in_progress><a href="@assessments.assessment_url@">Finish</a></if><else><if @assessments.status@ eq untaken><a href="@assessments.assessment_url@"><a href="@assessments.assessment_url@">Take</a></if><else><if @assessments.completed_p@ lt @assessments.number_tries@><a href="@assessments.assessment_url@">Retake</a></if></else></else>}
 }
 if {[llength $list_of_package_ids]==1} {
     set admin_p [permission::permission_p \
@@ -76,7 +76,8 @@
     -multirow assessments \
     -key assessment_id \
     -elements $elements \
-    -main_class narrow
+    -main_class narrow \
+    -no_data "\#assssment.No_open_assessments\#"
 
 # get the information of all open assessments
 template::multirow create assessments assessment_id title description assessment_url community_url community_name anonymous_p in_progress_p completed_p status number_tries admin_p
@@ -90,18 +91,18 @@
 	set old_comm_node_id $comm_node_id
 
 	if {[empty_string_p $password]} {
-	    append assessment_url [export_vars -base "assessment" {assessment_id}]
+	    append assessment_url [export_vars -base "instructions" {assessment_id}]
 	} else {
 	    append assessment_url [export_vars -base "assessment-password" {assessment_id}]
 	}
-    if {$in_progress_p > 0} {
+    if {$in_progress_p > 0 } {
 	set status in_progress
     } elseif {$completed_p >0} {
 	set status finished
     } else {
 	set status untaken
     }
-
+    ns_log notice "in_progress $in_progress_p completed $completed_p status $status user_id $user_id assessment_id $assessment_id"
 	template::multirow append assessments $assessment_id $title $description $assessment_url $community_url $community_name $anonymous_p $in_progress_p $completed_p $status $number_tries $admin_p
 }
 
@@ -145,7 +146,8 @@
     -multirow sessions \
     -key assessment_id \
     -elements $elements \
-    -main_class narrow
+    -main_class narrow \
+    -no_data "\#assessment.No_answered_assessments\#"
 
 # get the information of all assessments store in the database
 set old_comm_node_id 0