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.21.2.1 -r1.21.2.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 16 Jun 2019 11:49:35 -0000 1.21.2.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 16 Jun 2019 12:33:40 -0000 1.21.2.2
@@ -39,7 +39,7 @@
if { [info exists grades_gs($party_id)] && $grades_gs($party_id) ne "" } {
incr counter
set grades_gs($party_id) [util::trim_leading_zeros $grades_gs($party_id)]
- if { ![ad_var_type_check_number_p $grades_gs($party_id)] } {
+ if { ![string is double -strict $grades_gs($party_id)] } {
set wrong_grade $grades_gs($party_id)
ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
}
@@ -55,7 +55,7 @@
if { [info exists grades_wa($party_id)] && $grades_wa($party_id) ne "" } {
incr counter
set grades_wa($party_id) [util::trim_leading_zeros $grades_wa($party_id)]
- if { ![ad_var_type_check_number_p $grades_wa($party_id)] } {
+ if { ![string is double -strict $grades_wa($party_id)] } {
set wrong_grade $grades_wa($party_id)
ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
}
@@ -71,7 +71,7 @@
if { [info exists grades_na($party_id)] && $grades_na($party_id) ne ""} {
incr counter
set grades_na($party_id) [util::trim_leading_zeros $grades_na($party_id)]
- if { ![ad_var_type_check_number_p $grades_na($party_id)] } {
+ if { ![string is double -strict $grades_na($party_id)] } {
set wrong_grade $grades_na($party_id)
ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
}
@@ -87,7 +87,7 @@
if { [info exists grades_to_edit($party_id)] && $grades_to_edit($party_id) ne "" } {
incr counter
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)] } {
+ if { ![string is double -strict $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.13.2.1 -r1.13.2.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 12 Apr 2019 21:28:35 -0000 1.13.2.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 16 Jun 2019 12:33:40 -0000 1.13.2.2
@@ -33,7 +33,7 @@
if { [info exists grades_wa($party_id)] && $grades_wa($party_id) ne "" } {
incr counter
set grades_wa($party_id) [util::trim_leading_zeros $grades_wa($party_id)]
- if { ![ad_var_type_check_number_p $grades_wa($party_id)] } {
+ if { ![string is double -strict $grades_wa($party_id)] } {
set wrong_grade $grades_wa($party_id)
ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
}
@@ -50,7 +50,7 @@
if { [info exists grades_na($party_id)] && $grades_na($party_id) ne "" } {
incr counter
set grades_na($party_id) [util::trim_leading_zeros $grades_na($party_id)]
- if { ![ad_var_type_check_number_p $grades_na($party_id)] } {
+ if { ![string is double -strict $grades_na($party_id)] } {
set wrong_grade $grades_na($party_id)
ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
}
@@ -68,7 +68,7 @@
foreach party_id [array names grades] {
if { [info exists grades($party_id)] && $grades($party_id) ne "" } {
set grades($party_id) [util::trim_leading_zeros $grades($party_id)]
- if { ![ad_var_type_check_number_p $grades($party_id)] } {
+ if { ![string is double -strict $grades($party_id)] } {
set wrong_grade $grades($party_id)
ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]"
} else {
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.17.2.2 -r1.17.2.3
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 16 Jun 2019 11:25:20 -0000 1.17.2.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 16 Jun 2019 12:33:40 -0000 1.17.2.3
@@ -72,7 +72,7 @@
if { $line_number == 3 } {
set max_grade [string trim [util::trim_leading_zeros [lindex $evaluation 1]]]
- if { ![ad_var_type_check_number_p $max_grade] } {
+ if { ![string is double -strict $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
}
@@ -119,7 +119,7 @@
append errors_text " [_ evaluation.lt_Party_id_party_id_doe]"
}
- if { ![ad_var_type_check_number_p $grade] } {
+ if { ![string is double -strict $grade] } {
incr errors
append errors_text " [_ evaluation.lt_Grade_grade_does_not_]"
}
Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl,v
diff -u -N -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 16 Jun 2019 11:49:35 -0000 1.13.2.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 16 Jun 2019 12:33:40 -0000 1.13.2.2
@@ -59,7 +59,7 @@
} -validate {
{grade
- { [ad_var_type_check_number_p $grade] }
+ { [string is double -strict $grade] }
{ [_ evaluation.lt_The_grade_must_be_a_v_1] }
}
{comments
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl 7 Aug 2017 23:48:10 -0000 1.5
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl 16 Jun 2019 12:33:40 -0000 1.5.2.1
@@ -17,7 +17,7 @@
if { ![info exists weights($id)] } {
ad_complain "The task weight can't be null"
} else {
- if { ![ad_var_type_check_number_p $weights($id)] } {
+ if { ![string is double -strict $weights($id)] } {
ad_complain "The task weight $weights($id) must be a valid number"
}