Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl	5 Aug 2004 00:32:55 -0000	1.6
+++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl	12 Aug 2004 17:46:42 -0000	1.7
@@ -63,9 +63,10 @@
 } else { 
 	#student
 	lappend elements answer \
-		[list label "" \
-			 link_url_col answer_url \
-			 link_html { title "[_ evaluation-portlet.Addedit_answer_]" }]
+	    [list label "" \
+		 link_url_col answer_url \
+		 display_template { @tasks.answer;noquote@ } \
+		 link_html { title "[_ evaluation-portlet.Addedit_answer_]" }]
 	lappend elements view \
 		[list label "" \
 			 sub_class narrow \
@@ -145,7 +146,7 @@
 	set answer_mode display
 	set due_date_pretty [lc_time_fmt $due_date_ansi "%q"]
 	# working with task stuff (if it has a file/url attached)
-	if { [string eq $task_title "link"] } {
+	if { [empty_string_p $task_data] } {
 	    set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]"
 	    set task_name "[_ evaluation-portlet.task_name_No_data_]"
 	} elseif { [string eq $task_title "link"] } {
@@ -166,7 +167,7 @@
 	}
 
 	if { [string eq $online_p "t"] } {
-	    if { ([template::util::date::compare $due_date [template::util::date::now]] > 0) } {
+	    if { [db_string compare_due_date { *SQL* } -default 0] } {
 		if { [empty_string_p $answer_id] } {
 		    set answer "[_ evaluation-portlet.submit_answer_]"
 		    set answer_mode edit
@@ -176,15 +177,15 @@
 		    set answer_mode display
 		    set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
 		}
-	    } elseif { [string eq $turn_in_late_p "t"] } {
+	    } elseif { [string eq $late_submit_p "t"] } {
 		if { [empty_string_p $answer_id] } {
 		    set answer "[_ evaluation-portlet.lt_submit_answer_style_f]"
 		    set answer_mode edit
 		    set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]"
 		} else {
 		    set answer "[_ evaluation-portlet.lt_submit_answer_style_f_1]"
 		    set answer_mode display
-		    set answer_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id answer_id return_url solution_mode }]"
+		    set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
 		}
 	    }
 	    if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {