Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	7 Jul 2004 17:26:44 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	12 Aug 2004 17:46:42 -0000	1.7
@@ -1,43 +1,44 @@
 # /packages/evaluaiton/www/admin/evaluations/evaluations-edit.tcl
 
 ad_page_contract {
-	Displays the evaluations of students in order to edit them
-	
+    Displays the evaluations of students in order to edit them
+    
     @author jopez@galileo.edu
     @creation-date Mar 2004
     @cvs-id $Id$
 } {
-	task_id:integer,notnull
-	{return_url "student-list?[export_vars -url { task_id }]"}
+    task_id:integer,notnull
+    {return_url "student-list?[export_vars -url { task_id }]"}
 } 
 
 set page_title "[_ evaluation.Edit_Evaluations_]"
 set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Edit_Evaluations_]"]
 
 set elements [list party_name \
-				  [list label "[_ evaluation.Name_]" \
-					   orderby_asc {party_name asc} \
-					   orderby_desc {party_name desc}] \
-				  answer \
-				  [list label "[_ evaluation.Answer_]" \
-					   link_url_col answer_url \
-					   link_html { title "View answer" }] \
-				  submission_date_pretty \
-				  [list label "[_ evaluation.Submission_Date_]" \
-					   orderby_asc {submission_date asc} \
-					   orderby_desc {submission_date desc}] \
-				  grade \
-				  [list label "[_ evaluation.Maximun_Grade_] <input type=text name=\"max_grade\" maxlength=\"6\" size=\"3\" value=\"100\">" \
-					   display_template { <input type=text name=grades.@evaluated_students.party_id@ value=\"@evaluated_students.grade@\" maxlength=\"6\" size=\"3\"> } ] \
-				  edit_reason \
-				  [list label "[_ evaluation.Edit_Reason_]" \
-					   display_template { <textarea rows="3" cols="15" wrap name=reasons.@evaluated_students.party_id@></textarea> } \
-					  ] \
-				  show_student_p \
-				  [list label "[_ evaluation.lt_Allow_the_students_br]" \
-					   display_template { Yes <input @evaluated_students.radio_yes_checked@ type=radio name="show_student.@evaluated_students.party_id@" value=t> No <input @evaluated_students.radio_no_checked@ type=radio name="show_student.@evaluated_students.party_id@" value=f> } \
-					  ] \
-				 ]
+		  [list label "[_ evaluation.Name_]" \
+		       orderby_asc {party_name asc} \
+		       orderby_desc {party_name desc}] \
+		  answer \
+		  [list label "[_ evaluation.Answer_]" \
+		       display_template { @evaluated_students.answer;noquote@ } \
+		       link_url_col answer_url \
+		       link_html { title "View answer" }] \
+		  submission_date_pretty \
+		  [list label "[_ evaluation.Submission_Date_]" \
+		       orderby_asc {submission_date asc} \
+		       orderby_desc {submission_date desc}] \
+		  grade \
+		  [list label "[_ evaluation.Maximun_Grade_] <input type=text name=\"max_grade\" maxlength=\"6\" size=\"3\" value=\"100\">" \
+		       display_template { <input type=text name=grades.@evaluated_students.party_id@ value=\"@evaluated_students.grade@\" maxlength=\"6\" size=\"3\"> } ] \
+		  edit_reason \
+		  [list label "[_ evaluation.Edit_Reason_]" \
+		       display_template { <textarea rows="3" cols="15" wrap name=reasons.@evaluated_students.party_id@></textarea> } \
+		      ] \
+		  show_student_p \
+		  [list label "[_ evaluation.lt_Allow_the_students_br]" \
+		       display_template { Yes <input @evaluated_students.radio_yes_checked@ type=radio name="show_student.@evaluated_students.party_id@" value=t> No <input @evaluated_students.radio_no_checked@ type=radio name="show_student.@evaluated_students.party_id@" value=f> } \
+		      ] \
+		 ]
 
 template::list::create \
     -name evaluated_students \
@@ -54,37 +55,40 @@
 
 db_multirow -extend { answer answer_url radio_yes_checked radio_no_checked submission_date_pretty } evaluated_students get_evaluated_students { *SQL* } {
 
-    set submission_date_pretty [lc_time_fmt $submission_date_ansi "%q"]
     set grade [format %.2f [lc_numeric $grade]]
-	if { [string eq $online_p "t"] } {
-		# working with answer stuff (if it has a file/url attached)
-		if { [empty_string_p $answer_data] } {
-			set answer "[_ evaluation.No_response_]"
-		} elseif { [regexp "http://" $answer_data] } {
-			set answer_url "[export_vars -base "$answer_data" { }]"
-			set answer "[_ evaluation.View_answer_]"
-		} else {
-			# we assume it's a file
-			set answer_url "[export_vars -base "[ad_conn package_url]view/$answer_title" { }]"
-		}
-		if { ![string eq $answer "[_ evaluation.No_response_]"] && ([template::util::date::compare $submission_date $evaluation_date] > 0) } {
-			append answer_url "<span style=\"color:red;\"> [_ evaluation.NEW_answer_]</span>"
-		}
-		if { [template::util::date::compare $submission_date $due_date] > 0 } {
-			set pretty_submission_date "$pretty_submission_date [_ evaluation.late__1]"
-		}
+    if { [string eq $online_p "t"] } {
+	if { [db_0or1row get_answer_info { *SQL* }] } {
+	    
+	    # working with answer stuff (if it has a file/url attached)
+	    if { [empty_string_p $answer_data] } {
+		set answer "[_ evaluation.No_response_]"
+	    } elseif { [regexp "http://" $answer_data] } {
+		set answer_url "[export_vars -base "$answer_data" { }]"
+		set answer "[_ evaluation.View_answer_]"
+	    } else {
+		# we assume it's a file
+		set answer_url "[export_vars -base "[ad_conn package_url]view/$answer_title" { }]"
+	    }
+	    if { ![string eq $answer "[_ evaluation.No_response_]"] && [db_string compare_evaluation_date { *SQL* } -default 0] } {
+		set answer "<span style=\"color:red;\"> [_ evaluation.View_NEW_answer_]</span>"
+	    }
+	    set submission_date_pretty [lc_time_fmt $submission_date_ansi "%q"]
+	    if { [db_string compare_submission_date { *SQL* } -default 0] } {
+		set submission_date_pretty "$submission_date_pretty [_ evaluation.late__1]"
+	    }
 	}
-
-	if { [string eq $show_student_p "t"] } {
-		set radio_yes_checked "checked"
-		set radio_no_checked ""
-	} else {
-		set radio_yes_checked ""
-		set radio_no_checked "checked"
-	}
-
-	set evaluation_ids($party_id) $evaluation_id
-	set item_to_edit_ids($party_id) $item_id
+    }
+    
+    if { [string eq $show_student_p "t"] } {
+	set radio_yes_checked "checked"
+	set radio_no_checked ""
+    } else {
+	set radio_yes_checked ""
+	set radio_no_checked "checked"
+    }
+    
+    set evaluation_ids($party_id) $evaluation_id
+    set item_to_edit_ids($party_id) $item_id
 } 
 
 set grades_sheet_item_id [db_nextval acs_object_id_seq]