Index: openacs-4/packages/evaluation/evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v diff -u -N -r1.37.2.5 -r1.37.2.6 --- openacs-4/packages/evaluation/evaluation.info 20 May 2016 20:30:12 -0000 1.37.2.5 +++ openacs-4/packages/evaluation/evaluation.info 13 Feb 2017 14:32:20 -0000 1.37.2.6 @@ -7,19 +7,20 @@ f f - + Jose Pablo Escobedo Del Cid This package allows the users (professors and students) to use the system to submit and grade the tasks. - 2015-10-04 + 2017-02-13 This package allows the professors and TAs to assign tasks to the students and to grade them, and to the students to upload their answers and see their grades. 2 #evaluation.Evaluations# - + + Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v diff -u -N -r1.41.2.2 -r1.41.2.3 --- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 28 Oct 2016 20:31:56 -0000 1.41.2.2 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 13 Feb 2017 14:32:20 -0000 1.41.2.3 @@ -319,7 +319,7 @@ } { set now [list] foreach v [clock format [clock seconds] -format "%Y %m %d %H %M %S"] { - lappend now [template::util::leadingTrim $v] + lappend now [util::trim_leading_zeros $v] } set day [lindex $now 2] 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 -N -r1.19.2.1 -r1.19.2.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 12 Sep 2015 11:06:03 -0000 1.19.2.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 13 Feb 2017 14:32:20 -0000 1.19.2.2 @@ -38,7 +38,7 @@ foreach party_id [array names grades_gs] { if { [info exists grades_gs($party_id)] && $grades_gs($party_id) ne "" } { incr counter - set grades_gs($party_id) [template::util::leadingTrim $grades_gs($party_id)] + set grades_gs($party_id) [util::trim_leading_zeros $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]" @@ -54,7 +54,7 @@ foreach party_id [array names grades_wa] { if { [info exists grades_wa($party_id)] && $grades_wa($party_id) ne "" } { incr counter - set grades_wa($party_id) [template::util::leadingTrim $grades_wa($party_id)] + set grades_wa($party_id) [util::trim_leading_zeros $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]" @@ -70,7 +70,7 @@ foreach party_id [array names grades_na] { if { [info exists grades_na($party_id)] && $grades_na($party_id) ne ""} { incr counter - set grades_na($party_id) [template::util::leadingTrim $grades_na($party_id)] + set grades_na($party_id) [util::trim_leading_zeros $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]" @@ -86,7 +86,7 @@ foreach party_id [array names grades_to_edit] { if { [info exists grades_to_edit($party_id)] && $grades_to_edit($party_id) ne "" } { incr counter - set grades_to_edit($party_id) [template::util::leadingTrim $grades_to_edit($party_id)] + set grades_to_edit($party_id) [util::trim_leading_zeros $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 -N -r1.12.2.2 -r1.12.2.3 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 1 Dec 2016 13:22:58 -0000 1.12.2.2 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 13 Feb 2017 14:32:20 -0000 1.12.2.3 @@ -32,7 +32,7 @@ foreach party_id [array names grades_wa] { if { [info exists grades_wa($party_id)] && $grades_wa($party_id) ne "" } { incr counter - set grades_wa($party_id) [template::util::leadingTrim $grades_wa($party_id)] + set grades_wa($party_id) [util::trim_leading_zeros $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]" @@ -49,7 +49,7 @@ if { $grade_all eq "" } { if { [info exists grades_na($party_id)] && $grades_na($party_id) ne "" } { incr counter - set grades_na($party_id) [template::util::leadingTrim $grades_na($party_id)] + set grades_na($party_id) [util::trim_leading_zeros $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]" @@ -67,7 +67,7 @@ set counter 0 foreach party_id [array names grades] { if { [info exists grades($party_id)] && $grades($party_id) ne "" } { - set grades($party_id) [template::util::leadingTrim $grades($party_id)] + set grades($party_id) [util::trim_leading_zeros $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 -N -r1.16.2.2 -r1.16.2.3 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 1 Dec 2016 13:01:22 -0000 1.16.2.2 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 13 Feb 2017 14:32:20 -0000 1.16.2.3 @@ -73,7 +73,7 @@ set evaluation [split $clean_line ","] if { $line_number == 3 } { - set max_grade [string trim [template::util::leadingTrim [lindex $evaluation 1]]] + set max_grade [string trim [util::trim_leading_zeros [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 [template::util::leadingTrim [lindex $evaluation 2]]] + set grade [string trim [util::trim_leading_zeros [lindex $evaluation 2]]] # removing any " at the end or at the beginning of the grade that might come from the cvs file regsub ^\" $grade "" grade regsub \"\$ $grade "" grade