Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl	12 Aug 2004 17:46:42 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl	10 Sep 2004 19:16:31 -0000	1.5
@@ -7,118 +7,121 @@
     @creation-date Mar 2004
     @cvs-id $Id$
 } { 
-	task_id:integer,notnull
-	max_grade:integer,notnull
-	item_ids:array,integer,optional
-	item_to_edit_ids:array,integer,optional
- 
-	grades:array,optional
-	reasons:array,optional
-	show_student:array,optional
-	evaluation_ids:array,integer,optional
+    task_id:integer,notnull
+    max_grade:integer,notnull
+    item_ids:array,integer,optional
+    item_to_edit_ids:array,integer,optional
+    
+    grades:array,optional
+    reasons:array,optional
+    show_student:array,optional
+    evaluation_ids:array,integer,optional
 
-	grades_wa:array,optional
-	comments_wa:array,optional
-	show_student_wa:array,optional
+    grades_wa:array,optional
+    comments_wa:array,optional
+    show_student_wa:array,optional
 
-	grades_na:array,optional
-	comments_na:array,optional
-	show_student_na:array,optional
+    grades_na:array,optional
+    comments_na:array,optional
+    show_student_na:array,optional
 
-	{grade_all ""}
+    {grade_all ""}
 } -validate {
-	valid_grades_wa {
-		set counter 0
-		foreach party_id [array names grades_wa] {
-			if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } {
-				incr counter
-				if { ![ad_var_type_check_number_p $grades_wa($party_id)] } {
-				    set wrong_grade $grades_wa($party_id)
-				    ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
-				}
-			}
+    valid_grades_wa {
+	set counter 0
+	foreach party_id [array names grades_wa] {
+	    if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } {
+		incr counter
+		if { ![ad_var_type_check_number_p $grades_wa($party_id)] } {
+		    set wrong_grade $grades_wa($party_id)
+		    ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
 		}
-		if { !$counter && ([array size show_student_wa] > 0)} {
-			ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
-		}
+	    }
 	}
-	valid_grades_na {
-		set counter 0
-		foreach party_id [array names grades_na] {
-			if { [empty_string_p $grade_all] } {
-				if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } {
-					incr counter
-					if { ![ad_var_type_check_number_p $grades_na($party_id)] } {
-					    set wrong_grade $grades_na($party_id)
-					    ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
-					}
-				}
-			} else {
-				set grades_na($party_id) 0
-			}
-		}
-		if { !$counter && ([array size show_student_na] > 0) && [empty_string_p $grade_all] } {
-			ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
-		}
+	if { !$counter && ([array size show_student_wa] > 0) } {
+	    ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
 	}
-	valid_grades {
-		set counter 0
-		foreach party_id [array names grades] {
-			if { [info exists grades($party_id)] && ![empty_string_p $grades($party_id)] } {
-				if { ![ad_var_type_check_number_p $grades($party_id)] } {
-				    set wrong_grade $grades($party_id)
-				    ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
-				} else {			
-				    set old_grade  [format %.2f [lc_numeric [db_string get_old_grade { *SQL* }]]]
-				    if { ![string eq $old_grade  [format %.2f [lc_numeric $grades($party_id)]]] } {
-						incr counter
-						if { ![info exists reasons($party_id)] || [empty_string_p $reasons($party_id)] } {
-						    set grade_wo_reason $grades($party_id)
-						    ad_complain "[_ evaluation.lt_You_must_give_an_edit]"
-						}
-						set grades_to_edit($party_id) $grades($party_id)
-						set reasons_to_edit($party_id) $reasons($party_id)
-						set show_student_to_edit($party_id) $show_student($party_id)				
-					}
-				}
-			}
+    }
+    valid_grades_na {
+	set counter 0
+	foreach party_id [array names grades_na] {
+	    if { [empty_string_p $grade_all] } {
+		if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } {
+		    incr counter
+		    if { ![ad_var_type_check_number_p $grades_na($party_id)] } {
+			set wrong_grade $grades_na($party_id)
+			ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
+		    }
 		}
-		if { !$counter && ([array size show_student] > 0) } {
-			ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
-		}
+	    } else {
+		set grades_na($party_id) 0
+	    }
 	}
-	valid_data {
-		foreach party_id [array names comments_wa] {
-			if { [info exists comments_wa($party_id)] && ![info exists grades_wa($party_id)] } {
-			    set wrong_comments $comments_wa($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
+	if { !$counter && ([array size show_student_na] > 0) && [empty_string_p $grade_all] } {
+	    ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
+	}
+    }
+    valid_grades {
+	set counter 0
+	foreach party_id [array names grades] {
+	    if { [info exists grades($party_id)] && ![empty_string_p $grades($party_id)] } {
+		if { ![ad_var_type_check_number_p $grades($party_id)] } {
+		    set wrong_grade $grades($party_id)
+		    ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
+		} else {			
+		    set old_grade  [format %.2f [db_string get_old_grade { *SQL* }]]
+		    if { ![string eq $old_grade  [format %.2f [expr $grades($party_id)*100/$max_grade]]] } {
+			incr counter
+			if { $max_grade != 100  } {
+			    append reasons($party_id) "[_ evaluation.Weight_change]"
 			}
-			if { [info exists comments_wa($party_id)] && ([string length $comments_wa($party_id)] > 400) } {
-			    set wrong_comments $comments_wa($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_la_1]"
+			if { ![info exists reasons($party_id)] || [empty_string_p $reasons($party_id)] } {
+			    set grade_wo_reason $grades($party_id)
+			    ad_complain "[_ evaluation.lt_You_must_give_an_edit]"
 			}
+			set grades_to_edit($party_id) $grades($party_id)
+			set reasons_to_edit($party_id) $reasons($party_id)
+			set show_student_to_edit($party_id) $show_student($party_id)				
+		    }
 		}
-		foreach party_id [array names comments_na] {
-			if { [info exists comments_na($party_id)] && ![info exists grades_na($party_id)] } {
-			    set wrong_comments $comments_na($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
-			}
-			if { [info exists comments_na($party_id)] && ([string length $comments_na($party_id)] > 400) } {
-			    set wrong_comments $comments_na($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_a_comment_la]"
-			}
-		}
-		foreach party_id [array names reasons] {
-			if { [info exists reasons($party_id)] && ![info exists grades($party_id)] } {
-			    set wrong_comments $reasons($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_an_edit_reas]"
-			}
-			if { [info exists reasons($party_id)] && ([string length $reasons($party_id)] > 400) } {
-			    set wrong_comments $reasons($party_id)
-			    ad_complain "[_ evaluation.lt_There_is_an_edit_reas_1]"
-			}
-		}
+	    }
 	}
+	if { !$counter && ([array size show_student] > 0) && ($max_grade == 100) } {
+	    ad_complain "[_ evaluation.lt_There_must_be_at_leas]"
+	}
+    }
+    valid_data {
+	foreach party_id [array names comments_wa] {
+	    if { [info exists comments_wa($party_id)] && ![info exists grades_wa($party_id)] } {
+		set wrong_comments $comments_wa($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
+	    }
+	    if { [info exists comments_wa($party_id)] && ([string length $comments_wa($party_id)] > 400) } {
+		set wrong_comments $comments_wa($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_la_1]"
+	    }
+	}
+	foreach party_id [array names comments_na] {
+	    if { [info exists comments_na($party_id)] && ![info exists grades_na($party_id)] } {
+		set wrong_comments $comments_na($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
+	    }
+	    if { [info exists comments_na($party_id)] && ([string length $comments_na($party_id)] > 400) } {
+		set wrong_comments $comments_na($party_id)
+		ad_complain "[_ evaluation.lt_There_is_a_comment_la]"
+	    }
+	}
+	foreach party_id [array names reasons] {
+	    if { [info exists reasons($party_id)] && ![info exists grades($party_id)] } {
+		set wrong_comments $reasons($party_id)
+		ad_complain "[_ evaluation.lt_There_is_an_edit_reas]"
+	    }
+	    if { [info exists reasons($party_id)] && ([string length $reasons($party_id)] > 400) } {
+		set wrong_comments $reasons($party_id)
+		ad_complain "[_ evaluation.lt_There_is_an_edit_reas_1]"
+	    }
+	}
+    }
 }
 
 set page_title "[_ evaluation.lt_Confirm_Your_Evaluati]"
@@ -131,20 +134,20 @@
 # if the structure of the multirow datasource ever changes, this needs to be rewritten    
 set counter 0
 foreach party_id [array names show_student_wa] {
-	if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { 
-		incr counter 
-		set party_name [db_string get_party_name { *SQL* }]
-		set evaluations_wa:${counter}(rownum) $counter
-		set evaluations_wa:${counter}(party_name) $party_name
-		set evaluations_wa:${counter}(grade) $grades_wa($party_id)
-		set evaluations_wa:${counter}(comment) $comments_wa($party_id)
-		if { [string eq $show_student_wa($party_id) "t"] } {
-			set evaluations_wa:${counter}(show_student) "[_ evaluation.Yes_]"
-		} else {
-			set evaluations_wa:${counter}(show_student) "[_ evaluation.No_]"
-		}
-		set item_ids($party_id) [db_nextval acs_object_id_seq]
+    if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { 
+	incr counter 
+	set party_name [db_string get_party_name { *SQL* }]
+	set evaluations_wa:${counter}(rownum) $counter
+	set evaluations_wa:${counter}(party_name) $party_name
+	set evaluations_wa:${counter}(grade) $grades_wa($party_id)
+	set evaluations_wa:${counter}(comment) " $comments_wa($party_id)"
+	if { [string eq $show_student_wa($party_id) "t"] } {
+	    set evaluations_wa:${counter}(show_student) "[_ evaluation.Yes_]"
+	} else {
+	    set evaluations_wa:${counter}(show_student) "[_ evaluation.No_]"
 	}
+	set item_ids($party_id) [db_nextval acs_object_id_seq]
+    }
 }
 
 set evaluations_wa:rowcount $counter
@@ -154,20 +157,20 @@
 # if the structure of the multirow datasource ever changes, this needs to be rewritten    
 set counter 0
 foreach party_id [array names show_student_na] {
-	if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } { 
-		incr counter 
-		set party_name [db_string get_party_name { *SQL* }]
-		set evaluations_na:${counter}(rownum) $counter
-		set evaluations_na:${counter}(party_name) $party_name
-		set evaluations_na:${counter}(grade) $grades_na($party_id)
-		set evaluations_na:${counter}(comment) $comments_na($party_id)
-		if { [string eq $show_student_na($party_id) "t"] } {
-			set evaluations_na:${counter}(show_student) "[_ evaluation.Yes_]"
-		} else {
-			set evaluations_na:${counter}(show_student) "[_ evaluation.No_]"
-		}
-		set item_ids($party_id) [db_nextval acs_object_id_seq]
+    if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } { 
+	incr counter 
+	set party_name [db_string get_party_name { *SQL* }]
+	set evaluations_na:${counter}(rownum) $counter
+	set evaluations_na:${counter}(party_name) $party_name
+	set evaluations_na:${counter}(grade) $grades_na($party_id)
+	set evaluations_na:${counter}(comment) " $comments_na($party_id)"
+	if { [string eq $show_student_na($party_id) "t"] } {
+	    set evaluations_na:${counter}(show_student) "[_ evaluation.Yes_]"
+	} else {
+	    set evaluations_na:${counter}(show_student) "[_ evaluation.No_]"
 	}
+	set item_ids($party_id) [db_nextval acs_object_id_seq]
+    }
 }
 
 set evaluations_na:rowcount $counter
@@ -177,19 +180,19 @@
 # if the structure of the multirow datasource ever changes, this needs to be rewritten    
 set counter 0
 foreach party_id [array names show_student] {
-	if { [info exists grades_to_edit($party_id)] && ![empty_string_p $grades_to_edit($party_id)] } { 
-		incr counter 
-		set party_name [db_string get_party_name { *SQL* }]
-		set evaluations:${counter}(rownum) $counter
-		set evaluations:${counter}(party_name) $party_name
-		set evaluations:${counter}(grade) $grades_to_edit($party_id)
-		set evaluations:${counter}(reason) $reasons_to_edit($party_id)
-		if { [string eq  $show_student_to_edit($party_id) "t"] } {
-			set evaluations:${counter}(show_student) "[_ evaluation.Yes_]"
-		} else {
-			set evaluations:${counter}(show_student) "[_ evaluation.No_]"
-		}
+    if { [info exists grades_to_edit($party_id)] && ![empty_string_p $grades_to_edit($party_id)] } { 
+	incr counter 
+	set party_name [db_string get_party_name { *SQL* }]
+	set evaluations:${counter}(rownum) $counter
+	set evaluations:${counter}(party_name) $party_name
+	set evaluations:${counter}(grade) $grades_to_edit($party_id)
+	set evaluations:${counter}(reason) $reasons_to_edit($party_id)
+	if { [string eq  $show_student_to_edit($party_id) "t"] } {
+	    set evaluations:${counter}(show_student) "[_ evaluation.Yes_]"
+	} else {
+	    set evaluations:${counter}(show_student) "[_ evaluation.No_]"
 	}
+    }
 }
 
 set evaluations:rowcount $counter