Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql 10 Sep 2004 19:16:28 -0000 1.6 +++ openacs-4/packages/evaluation/lib/student-grades-report-chunk-postgresql.xql 24 Sep 2004 21:23:12 -0000 1.7 @@ -28,10 +28,10 @@ select et.task_name, et.task_item_id, eg.weight as g_weight, - eg.weight as grade_weight, + round(eg.weight,2) as grade_weight, et.task_id, et.weight as t_weight, - (et.weight*eg.weight)/100 as task_weight, + round((et.weight*eg.weight)/100,2) as task_weight, et.number_of_members, to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, et.online_p @@ -84,9 +84,9 @@ - select ese.grade, + select round(ese.grade,2) as grade, ese.description as comments, - (ese.grade*:t_weight*:g_weight)/10000 as net_grade, + round((ese.grade*:t_weight*:g_weight)/10000,2) as net_grade, person__name(ese.creation_user) as grader_name from evaluation_student_evalsi ese, cr_items cri, Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl 10 Sep 2004 19:16:28 -0000 1.5 +++ openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl 24 Sep 2004 21:23:12 -0000 1.6 @@ -99,10 +99,10 @@ if { ![empty_string_p $grade] } { - set grade [format %.2f [lc_numeric $grade]] - set over_weight "[format %.2f [lc_numeric $net_grade]]/" + set grade [lc_numeric $grade] + set over_weight "[lc_numeric $net_grade]/" set total_grade [expr $total_grade + $net_grade] - set net_grade [format %.2f [lc_numeric $net_grade]] + set net_grade [lc_numeric $net_grade] set task_status "[_ evaluation.Evaluated_]" } else { set net_grade "[_ evaluation.na_]" @@ -117,7 +117,7 @@ set max_grade [expr $task_weight + $max_grade] - set task_weight "${over_weight}[format %.2f [lc_numeric $task_weight]]" + set task_weight "${over_weight}[lc_numeric $task_weight]" set group_id [db_string get_group_id { *SQL* }] if { $number_of_members > 1 } { @@ -133,6 +133,6 @@ } -set total_grade [format %.2f [lc_numeric [expr $total_grade]]] -set max_grade [format %.2f [lc_numeric $max_grade]] -set grade_weight [format %.2f [lc_numeric $grade_weight]] \ No newline at end of file +set total_grade [lc_numeric [expr $total_grade]] +set max_grade [lc_numeric $max_grade] +set grade_weight [lc_numeric $grade_weight] \ No newline at end of file Index: openacs-4/packages/evaluation/www/evaluation-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-list.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/evaluation-list.tcl 11 Sep 2004 00:49:21 -0000 1.5 +++ openacs-4/packages/evaluation/www/evaluation-list.tcl 24 Sep 2004 21:23:13 -0000 1.6 @@ -20,7 +20,7 @@ if { $admin_p } { set actions "[_ evaluation.Grade_Distribution_]" } else { - set actions "[_ evaluation.Total_current_grade_] [format %.2f [lc_numeric [db_string total_grade { *SQL* }]]] / [format %.2f [lc_numeric [db_string max_grade { *SQL* }]]]" + set actions "[_ evaluation.Total_current_grade_] [lc_numeric %.2f [db_string total_grade { *SQL* }]] / [lc_numeric %.2f [db_string max_grade { *SQL* }]]" } set page_title "[_ evaluation.Evaluations_List_]" Index: openacs-4/packages/evaluation/www/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-view.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/evaluation-view.tcl 20 Sep 2004 18:16:49 -0000 1.1 +++ openacs-4/packages/evaluation/www/evaluation-view.tcl 24 Sep 2004 21:23:13 -0000 1.2 @@ -34,9 +34,9 @@ set due_date [template::util::date::from_ansi $due_date_ansi] set evaluation_date [template::util::date::from_ansi $evaluation_date_ansi] -set task_weight [format %.2f [lc_numeric $task_weight]] -set grade_weight [format %.2f [lc_numeric $grade_weight]] -set net_grade [format %.2f [lc_numeric $net_grade]] +set task_weight [lc_numeric %.2f $task_weight] +set grade_weight [lc_numeric %.2f $grade_weight] +set net_grade [lc_numeric %.2f $net_grade] if { ![empty_string_p $answer_data] } { Index: openacs-4/packages/evaluation/www/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/evaluation/www/task-view.tcl 11 Sep 2004 00:49:21 -0000 1.10 +++ openacs-4/packages/evaluation/www/task-view.tcl 24 Sep 2004 21:23:13 -0000 1.11 @@ -120,7 +120,7 @@ db_1row task_info { *SQL* } set due_date [template::util::date::from_ansi $due_date_ansi] - set weight [format %.2f [lc_numeric $weight]] + set weight [lc_numeric %.2f $weight] } 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.6 -r1.7 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 14 Sep 2004 21:44:11 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 24 Sep 2004 21:23:14 -0000 1.7 @@ -72,8 +72,8 @@ 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]]] } { + set old_grade [lc_numeric %.2f [db_string get_old_grade { *SQL* }]] + if { ![string eq $old_grade [lc_numeric %.2f [expr $grades($party_id)*100/$max_grade]]] } { incr counter if { $max_grade != 100 } { append reasons($party_id) "[_ evaluation.Weight_change]" Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql 7 Jul 2004 17:26:44 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.xql 24 Sep 2004 21:23:14 -0000 1.3 @@ -6,7 +6,7 @@ - select grade from evaluation_student_evals where evaluation_id = $evaluation_ids($party_id) + select round(grade,2) as grade from evaluation_student_evals where evaluation_id = $evaluation_ids($party_id) 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.9 -r1.10 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 14 Sep 2004 21:44:11 -0000 1.9 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 24 Sep 2004 21:23:14 -0000 1.10 @@ -129,7 +129,7 @@ } # editing without reason - if { ![string eq [format %.2f [db_string check_evaluated { *SQL* } -default $grade]] [format %.2f $grade]] && [empty_string_p $comments] } { + if { ![string eq [lc_numeric %.2f [db_string check_evaluated { *SQL* } -default $grade]] [lc_numeric %.2f $grade]] && [empty_string_p $comments] } { incr errors append errors_text "
  • [_ evaluation.lt_There_must_be_an_edit]
    • " } Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 11 Sep 2004 00:49:21 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 24 Sep 2004 21:23:14 -0000 1.7 @@ -49,7 +49,7 @@ db_multirow -extend { radio_yes_checked radio_no_checked } grades get_grade_tasks { *SQL* } { - set task_weight [format %.2f [lc_numeric $task_weight]] + set task_weight [lc_numeric %.2f $task_weight] if { [string eq $requires_grade_p "t"] } { set radio_yes_checked "checked" set radio_no_checked "" Index: openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl 11 Sep 2004 00:49:21 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl 24 Sep 2004 21:23:14 -0000 1.7 @@ -49,7 +49,7 @@ } -edit_request { db_1row get_grade_info { *SQL* } - set weight [format %.2f [lc_numeric $weight]] + set weight [lc_numeric %.2f $weight] set grade_id $item_id } -validate { Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql 10 Sep 2004 19:16:32 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql 24 Sep 2004 21:23:14 -0000 1.9 @@ -20,7 +20,7 @@ select eg.grade_id, eg.grade_plural_name, - eg.weight + round(eg.weight,0) as weight from evaluation_grades eg, acs_objects ao, cr_items cri where cri.live_revision = eg.grade_id and eg.grade_item_id = ao.object_id Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl 11 Sep 2004 00:49:21 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl 24 Sep 2004 21:23:14 -0000 1.9 @@ -41,7 +41,7 @@ ] db_foreach grade_type { *SQL* } { - set weight [format %.0f [lc_numeric $weight]] + set weight [lc_numeric $weight] set grade_label_${grade_id} "${grade_plural_name} ($weight%) " append pass_grades " grade_label_${grade_id} " lappend elements grade_$grade_id \ Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/evaluation/www/admin/grades/grades.tcl 11 Sep 2004 00:49:21 -0000 1.10 +++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl 24 Sep 2004 21:23:14 -0000 1.11 @@ -20,7 +20,7 @@ set actions [list "[_ evaluation.Add_assignment_type_]" [export_vars -base "grades-add-edit" { }]] -if { [format %2.f [db_string sum_grades { *SQL* }]] > 100.00} { +if { [lc_numeric %2.f [db_string sum_grades { *SQL* }]] > 100.00} { set aggregate_label "[_ evaluation.Total_]" } else { set aggregate_label "[_ evaluation.Total_]" @@ -80,12 +80,12 @@ } db_multirow grades get_class_grades { *SQL* } { - set weight [format %.2f [lc_numeric $weight]] + set weight [lc_numeric %.2f $weight] } db_1row get_total_weight { *SQL* } -set total_weight [format %.2f $total_weight] +set total_weight [lc_numeric %.2f $total_weight] if { ![string eq $total_weight "100.00"] && ![string eq $total_weight "0"] } { set notice "[_ evaluation.lt_The_sum_of_the_weight]" Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql 11 Sep 2004 00:49:21 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report-postgresql.xql 24 Sep 2004 21:23:14 -0000 1.5 @@ -32,7 +32,7 @@ - select sum(et.weight*eg.weight/100) + select round(sum(et.weight*eg.weight/100),2) from evaluation_tasks et, evaluation_grades eg, cr_items cri1, @@ -51,7 +51,7 @@ - select coalesce(sum((ese.grade*et.weight*eg.weight)/10000),0) as grade + select coalesce(round(sum((ese.grade*et.weight*eg.weight)/10000),2),0) as grade from evaluation_grades eg, evaluation_tasks et, evaluation_student_evals ese, acs_objects ao where et.task_item_id = ese.task_item_id and et.grade_item_id = eg.grade_item_id Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl 11 Sep 2004 00:49:21 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl 24 Sep 2004 21:23:14 -0000 1.5 @@ -28,7 +28,7 @@ } -set total_class_grade [format %.2f [lc_numeric [db_string get_total_grade { *SQL* }]]] -set max_possible_grade [format %.2f [lc_numeric [db_string max_possible_grade { *SQL* }]]] +set total_class_grade [lc_numeric [db_string get_total_grade { *SQL* }]] +set max_possible_grade [lc_numeric [db_string max_possible_grade { *SQL* }]] ad_return_template Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql 7 Jul 2004 17:26:45 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-postgresql.xql 24 Sep 2004 21:23:15 -0000 1.3 @@ -6,15 +6,15 @@ - select acs_rel__new ( + select coalesce((select acs_rel__new ( null, 'evaluation_task_group_rel', :evaluation_group_id, :student_id, :package_id, :creation_user_id, :creation_ip - ); + ) where not exists (select 1 from acs_rels where object_id_one = :evaluation_group_id and object_id_two = :student_id and rel_type = 'evaluation_task_group_rel')),0); Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 10 Sep 2004 19:16:33 -0000 1.17 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 24 Sep 2004 21:23:15 -0000 1.18 @@ -245,7 +245,7 @@ db_1row task_info { *SQL* } set due_date [template::util::date::from_ansi $due_date_ansi "YYYY-MM-DD HH24:MI:SS"] - set weight [format %.2f [lc_numeric $weight]] + set weight [lc_numeric %.2f $weight] } -validate { {url @@ -261,11 +261,11 @@ { [_ evaluation.lt_First_unattach_the_fi] } } {net_value - { [string eq [format %.2f $net_value] 0.00] || ([empty_string_p $net_value] && [string eq $requires_grade_p f]) || (($net_value > 0) && ($net_value <= $grade_weight) && ([string eq [format %.2f $weight] 0.00] || [empty_string_p $weight])) } + { !$net_value || ([empty_string_p $net_value] && [string eq $requires_grade_p f]) || (($net_value > 0) && ($net_value <= $grade_weight) && (!$weight || [empty_string_p $weight])) } { [_ evaluation.lt_The_net_value_must_be] } } {weight - { [string eq [format %.2f $weight] 0.00] || ([empty_string_p $weight] && [string eq $requires_grade_p f]) || (($weight > 0) && ([string eq [format %.2f $net_value] 0.00] || [empty_string_p $net_value])) } + { !$weight || ([empty_string_p $weight] && [string eq $requires_grade_p f]) || (($weight > 0) && (!$net_value || [empty_string_p $net_value])) } { [_ evaluation.lt_The_weight_must_be_gr] } } {number_of_members