Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 10 Sep 2004 19:16:31 -0000 1.9 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 14 Sep 2004 21:44:11 -0000 1.10 @@ -38,6 +38,7 @@ foreach party_id [array names grades_gs] { if { [info exists grades_gs($party_id)] && ![empty_string_p $grades_gs($party_id)] } { incr counter + set grades_gs($party_id) [template::util::leadingTrim $grades_gs($party_id)] if { ![ad_var_type_check_number_p $grades_gs($party_id)] } { set wrong_grade $grades_gs($party_id) ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" @@ -53,6 +54,7 @@ foreach party_id [array names grades_wa] { if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { incr counter + set grades_wa($party_id) [template::util::leadingTrim $grades_wa($party_id)] if { ![ad_var_type_check_number_p $grades_wa($party_id)] } { set wrong_grade $grades_wa($party_id) ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" @@ -68,6 +70,7 @@ foreach party_id [array names grades_na] { if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)]} { incr counter + set grades_na($party_id) [template::util::leadingTrim $grades_na($party_id)] if { ![ad_var_type_check_number_p $grades_na($party_id)] } { set wrong_grade $grades_na($party_id) ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" @@ -83,6 +86,7 @@ foreach party_id [array names grades_to_edit] { if { [info exists grades_to_edit($party_id)] && ![empty_string_p $grades_to_edit($party_id)] } { incr counter + set grades_to_edit($party_id) [template::util::leadingTrim $grades_to_edit($party_id)] if { ![ad_var_type_check_number_p $grades_to_edit($party_id)] } { set wrong_grade $grades_to_edit($party_id) ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" 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.5 -r1.6 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 10 Sep 2004 19:16:31 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 14 Sep 2004 21:44:11 -0000 1.6 @@ -32,6 +32,7 @@ foreach party_id [array names grades_wa] { if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { incr counter + set grades_wa($party_id) [template::util::leadingTrim $grades_wa($party_id)] 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]" @@ -48,6 +49,7 @@ if { [empty_string_p $grade_all] } { if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } { incr counter + set grades_na($party_id) [template::util::leadingTrim $grades_na($party_id)] 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]" @@ -65,6 +67,7 @@ set counter 0 foreach party_id [array names grades] { if { [info exists grades($party_id)] && ![empty_string_p $grades($party_id)] } { + set grades($party_id) [template::util::leadingTrim $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]" Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 10 Sep 2004 19:16:31 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 14 Sep 2004 21:44:11 -0000 1.9 @@ -73,7 +73,7 @@ set evaluation [split $clean_line ","] if { $line_number == 3 } { - set max_grade [string trim [lindex $evaluation 1]] + set max_grade [string trim [template::util::leadingTrim [lindex $evaluation 1]]] if { ![ad_var_type_check_number_p $max_grade] } { ad_return_error "Invalid Max Grade" "Max Grade does not seem to be a real number. Please don't leave it blank." return @@ -99,7 +99,7 @@ set party_id [string trim [lindex $evaluation 0]] set party_name [db_string get_party_name { *SQL* }] - set grade [string trim [lindex $evaluation 2]] + set grade [string trim [template::util::leadingTrim [lindex $evaluation 2]]] set comments [string trim [lindex $evaluation 3]] # removing the first and last " that comes from the csv format