Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 15 May 2007 20:14:34 -0000 1.15 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 9 Nov 2008 23:29:25 -0000 1.16 @@ -15,7 +15,7 @@ set bulk_actions "" db_1row get_grade_info { *SQL* } -set submitted_label "
[_ evaluation-portlet.lt_smallTotal_points_in__1]
" +set submitted_label "[_ evaluation-portlet.lt_smallTotal_points_in__1]" if { $admin_p } { if { $simple_p } { @@ -48,34 +48,34 @@ if { $simple_p } { lappend elements perfect_score \ [list label "[_ evaluation-portlet.points_value]" \ - display_template {
@grade_tasks_admin.perfect_score@
} \ + display_template { @grade_tasks_admin.perfect_score@ } \ orderby_asc {perfect_score asc} \ aggregate "" \ aggregate_label "@max_grade_label;noquote@" \ orderby_desc {perfect_score desc}] } lappend elements task_weight \ [list label "[_ evaluation-portlet.Weight_]" \ - display_template {
@grade_tasks_admin.task_weight@%
} \ + display_template {@grade_tasks_admin.task_weight@% } \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc} \ aggregate "" \ aggregate_label "@max_weight_label;noquote@"] if { $simple_p } { lappend elements solution \ - [list label "
[_ evaluation-portlet.solution]
" \ - display_template "
@grade_tasks_admin.solution@
" \ + [list label "[_ evaluation-portlet.solution]" \ + display_template "@grade_tasks_admin.solution@" \ link_url_col solution_url \ aggregate "" \ aggregate_label "@solution_label;noquote@"] lappend elements grade \ [list label "[_ evaluation-portlet.grade]" \ link_url_col grade_url \ - display_template {
[_ evaluation-portlet.evaluate]
} ] + display_template {[_ evaluation-portlet.evaluate] } ] lappend elements edit \ [list label "" \ sub_class narrow \ - display_template {
[_ evaluation-portlet.edit]
[_ evaluation-portlet.delete]
}] + display_template {[_ evaluation-portlet.edit]
[_ evaluation-portlet.delete]}] } else { lappend elements audit_info \ [list label "" \ @@ -85,34 +85,34 @@ } set multirow_name grade_tasks_admin - set actions "\#evaluation-portlet.Add_grade_name_\#\#evaluation-portlet.edit_grade_scale\#" + set actions "\#evaluation-portlet.Add_grade_name_\#\#evaluation-portlet.edit_grade_scale\#" } else { #student if { $simple_p } { lappend elements submitted \ - [list label "
[_ evaluation-portlet.Submitted]
" \ - display_template {
@grade_tasks.submitted_date;noquote@
} \ + [list label "[_ evaluation-portlet.Submitted]" \ + display_template {@grade_tasks.submitted_date;noquote@ } \ aggregate "" \ link_url_col submitted_date_url \ aggregate_label "@submitted_label;noquote@" ] lappend elements task_grade \ [list label "[_ evaluation-portlet.Points]" \ - display_template {
@grade_tasks.task_grade@
} \ + display_template {@grade_tasks.task_grade@ } \ aggregate "" \ aggregate_label "@max_grade_label;noquote@" ] lappend elements task_weight \ [list label "[_ evaluation-portlet.Total_Points]" \ - display_template {
@grade_tasks.perfect_score@
} \ + display_template {@grade_tasks.perfect_score@ } \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc} \ aggregate "" \ aggregate_label "@max_weight_label;noquote@"] } lappend elements grade \ [list label "[_ evaluation-portlet.Grade_over_100_]" \ - display_template {
@grade_tasks.grade@
} \ + display_template {@grade_tasks.grade@} \ aggregate "" \ aggregate_label "@grade_of_label;noquote@"] @@ -124,7 +124,7 @@ if {!$simple_p} { lappend elements task_weight \ [list label "[_ evaluation-portlet.Net_Value]" \ - display_template {
@grade_tasks.task_weight@
} \ + display_template {@grade_tasks.task_weight@ } \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc}] @@ -179,11 +179,11 @@ set max_weight [format %0.2f [expr $max_weight + $task_weight]] set task_weight [format %0.2f $task_weight] set max_grade [expr $max_grade + $perfect_score] - set max_grade_label "
$max_grade pts.
" - set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] $low_name )" + set max_grade_label "$max_grade pts." + set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] $low_name )" if { $simple_p } { - set max_weight_label "
$max_weight %
" + set max_weight_label "$max_weight %" } if { [db_0or1row solution_info { *SQL* }] } { set solution_mode display @@ -286,8 +286,8 @@ set answer "" } set max_weight [expr $max_weight + $perfect_score] - set max_grade_label "
$max_grade pts.
" - set max_weight_label "
$max_weight %
" + set max_grade_label "$max_grade pts." + set max_weight_label "$max_weight %" if { [empty_string_p $submitted_date]} { if { [string eq $online_p "t"] } {