Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 13 Jul 2009 12:19:21 -0000 1.21
+++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 13 Jul 2009 12:20:06 -0000 1.22
@@ -24,10 +24,10 @@
if { $admin_p } {
if { $simple_p } {
- set bottom_line "[_ evaluation-portlet.lt_smallWeight_used_in_g]"
+ set bottom_line "[_ evaluation-portlet.lt_smallWeight_used_in_g]"
} else {
- set bottom_line ""
-
+ set bottom_line ""
+
}
} else {
set bottom_line ""
@@ -41,52 +41,52 @@
set grade_of_label ""
}
set elements [list task_name \
- [list label "[_ evaluation-portlet.Name_]" \
- link_url_col task_url \
- orderby_asc {task_name asc} \
- aggregate "" \
- aggregate_label "@bottom_line;noquote@"\
- orderby_desc {task_name desc}]]
+ [list label "[_ evaluation-portlet.Name_]" \
+ link_url_col task_url \
+ orderby_asc {task_name asc} \
+ aggregate "" \
+ aggregate_label "@bottom_line;noquote@"\
+ orderby_desc {task_name desc}]]
if { $admin_p } {
#admin
if { $simple_p } {
- lappend elements perfect_score \
- [list label "[_ evaluation-portlet.points_value]" \
- 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 perfect_score \
+ [list label "[_ evaluation-portlet.points_value]" \
+ 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@%
} \
- orderby_asc {task_weight asc} \
- orderby_desc {task_weight desc} \
- aggregate "" \
- aggregate_label "@max_weight_label;noquote@"]
+ [list label "[_ evaluation-portlet.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@
" \
- 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]
} ]
- lappend elements edit \
- [list label "" \
- sub_class narrow \
- display_template {}]
+ lappend elements 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]
} ]
+ lappend elements edit \
+ [list label "" \
+ sub_class narrow \
+ display_template {}]
} else {
- lappend elements audit_info \
- [list label "" \
- link_url_col audit_info_url \
- link_html { title "[_ evaluation-portlet.Audit_info_]" }]
- set bulk_actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]]
-
+ lappend elements audit_info \
+ [list label "" \
+ link_url_col audit_info_url \
+ link_html { title "[_ evaluation-portlet.Audit_info_]" }]
+ set bulk_actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]]
+
}
set multirow_name grade_tasks_admin
set actions "\#evaluation-portlet.Add_grade_name_\#\#evaluation-portlet.edit_grade_scale\#"
@@ -95,48 +95,48 @@
#student
if { $simple_p } {
lappend elements submitted \
- [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@
} \
- aggregate "" \
- aggregate_label "@max_grade_label;noquote@" ]
- lappend elements task_weight \
- [list label "[_ evaluation-portlet.Total_Points]" \
- display_template { @grade_tasks.perfect_score@
} \
- orderby_asc {task_weight asc} \
- orderby_desc {task_weight desc} \
- aggregate "" \
- aggregate_label "@max_weight_label;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@
} \
+ aggregate "" \
+ aggregate_label "@max_grade_label;noquote@" ]
+ lappend elements task_weight \
+ [list label "[_ evaluation-portlet.Total_Points]" \
+ 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@
} \
- aggregate "" \
- aggregate_label "@grade_of_label;noquote@"]
+ [list label "[_ evaluation-portlet.Grade_over_100_]" \
+ display_template { @grade_tasks.grade@
} \
+ aggregate "" \
+ aggregate_label "@grade_of_label;noquote@"]
lappend elements comments \
- [list label "[_ evaluation-portlet.Comments_]" \
- link_url_col comments_url \
- link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }]
+ [list label "[_ evaluation-portlet.Comments_]" \
+ link_url_col comments_url \
+ link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }]
if {!$simple_p} {
- lappend elements task_weight \
- [list label "[_ evaluation-portlet.Net_Value_]" \
- display_template { @grade_tasks.task_weight@
} \
- orderby_asc {task_weight asc} \
- orderby_desc {task_weight desc}]
-
+ lappend elements task_weight \
+ [list label "[_ evaluation-portlet.Net_Value_]" \
+ display_template { @grade_tasks.task_weight@
} \
+ orderby_asc {task_weight asc} \
+ orderby_desc {task_weight desc}]
+
}
lappend elements answer \
- [list label "" \
- display_template {@grade_tasks.answer;noquote@} \
- link_html { title "[_ evaluation-portlet.View_my_answer_]" }]
+ [list label "" \
+ display_template {@grade_tasks.answer;noquote@} \
+ link_html { title "[_ evaluation-portlet.View_my_answer_]" }]
set multirow_name grade_tasks
set actions ""
@@ -176,163 +176,163 @@
if { $admin_p } {
#admin
db_multirow -extend { task_url grade_url audit_info audit_info_url task_points solution solution_url} grade_tasks_admin get_tasks_admin { *SQL* } {
- if { $simple_p } {
- set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }]
- } else {
- set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }]
- }
- set category_weight [expr $category_weight + $task_weight]
- set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }]
- 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 )"
-
- if { $simple_p } {
- set max_weight_label "$max_weight %
"
- }
- if { [db_0or1row solution_info { *SQL* }] } {
- set solution_mode display
- set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id solution_id return_url solution_mode }]"
- set solution "[_ evaluation-portlet.ViewEdit_Solution_]"
- } else {
- set solution_mode edit
- set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id return_url solution_mode }]"
+ if { $simple_p } {
+ set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }]
+ } else {
+ set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }]
+ }
+ set category_weight [expr $category_weight + $task_weight]
+ set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }]
+ 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 )"
+
+ if { $simple_p } {
+ set max_weight_label "$max_weight %
"
+ }
+ if { [db_0or1row solution_info { *SQL* }] } {
+ set solution_mode display
+ set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id solution_id return_url solution_mode }]"
+ set solution "[_ evaluation-portlet.ViewEdit_Solution_]"
+ } else {
+ set solution_mode edit
+ set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id return_url solution_mode }]"
if { $online_p } {
- set solution "[_ evaluation-portlet.Upload_Solution_]"
+ set solution "[_ evaluation-portlet.Upload_Solution_]"
}
- }
-
- set task_points [format %0.2f [expr ($task_weight*$grade_weight)/100.0]]
- set audit_info_url [export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }]
-
- set audit_info "[_ evaluation-portlet.Audit_Info_]"
-
+ }
+
+ set task_points [format %0.2f [expr ($task_weight*$grade_weight)/100.0]]
+ set audit_info_url [export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }]
+
+ set audit_info "[_ evaluation-portlet.Audit_Info_]"
+
}
} else {
db_multirow -extend { task_url submitted_date submitted_date_url comments comments_url grade_url answer answer_url grade task_grade} grade_tasks get_grade_tasks { *SQL* } {
- if { $simple_p } {
- set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }]
- } else {
- set task_url ""
- }
- set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }]
- if { [db_0or1row get_evaluation_info { *SQL* }] } {
-
- if { ![empty_string_p $comments] } {
- set comments "[_ evaluation-portlet.View_comments_]"
- set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]"
- } else {
- set comments "[_ evaluation-portlet.lt_View_evaluation_detai]"
- set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]"
- }
-
+ if { $simple_p } {
+ set task_url [export_vars -base "${base_url}task-view" { grade_id task_id return_url }]
+ } else {
+ set task_url ""
+ }
+ set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }]
+ if { [db_0or1row get_evaluation_info { *SQL* }] } {
+
+ if { ![empty_string_p $comments] } {
+ set comments "[_ evaluation-portlet.View_comments_]"
+ set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]"
+ } else {
+ set comments "[_ evaluation-portlet.lt_View_evaluation_detai]"
+ set comments_url "[export_vars -base "${base_url}evaluation-view" { evaluation_id return_url }]"
+ }
+
-
- set over_weight ""
- if { [string eq $show_student_p "t"] } {
- if { ![empty_string_p $grade] } {
- set grade [lc_numeric $grade]
- set over_weight "[lc_numeric $task_grade]/"
- if { $simple_p } {
- set task_grade [format %0.2f [expr ($grade*$perfect_score/100.0)]]
- }
- set total_grade [expr $total_grade + $task_grade]
- if { $simple_p } {
- set max_grade [expr $task_grade + $max_grade]
- } else {
- set max_grade [expr $task_weight + $max_grade]
- }
- } else {
- set grade "[_ evaluation-portlet.Not_evaluated_]"
- set task_grade "[_ evaluation-portlet.Not_evaluated_]"
- }
- set task_weight "${over_weight}[lc_numeric $task_weight]"
-
- } else {
- set grade "[_ evaluation-portlet.Not_available_]"
- set task_weight [lc_numeric $task_weight]
- }
- } else {
- set grade "[_ evaluation-portlet.Not_evaluated_]"
- if { $simple_p } {
- set task_weight [lc_numeric $task_weight]
- } else {
- set task_weight "[_ evaluation-portlet.Not_evaluated_]"
- }
- set task_grade "[_ evaluation-portlet.Not_evaluated_]"
- }
-
- if { [db_0or1row get_answer_info { *SQL* }] } {
- set submitted_date $creation_date
- # working with answer stuff (if it has a file/url attached)
- if { [string eq $answer_title "link"] } {
- # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
- # so we have to deal with this case
- array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"]
- if { ![regexp ([join [split [parameter::get -parameter urlProtocols -package_id $community_info(package_id)] ","] "|"]) "$answer_data"] } {
- set answer_data "http://$answer_data"
- }
- set answer_url "[export_vars -base "$answer_data" { }]"
- set answer "[_ evaluation-portlet.View_my_answer_]"
- } else {
- # we assume it's a file
- set answer_url "[export_vars -base "${base_url}view/$answer_title" { {revision_id $answer_id} }]"
- set answer "[_ evaluation-portlet.View_my_answer_]"
- }
-
- if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
- set answer ""
- set answer_url ""
- set grade "[_ evaluation-portlet.No_group_for_task_]"
- }
- } else {
- set answer_url ""
- set answer ""
- }
- set max_weight [expr $max_weight + $perfect_score]
- 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"] } {
- if { [db_string compare_due_date { *SQL* } -default 0] } {
- if { ![db_0or1row answer_info { *SQL* }] } {
- set submitted_date "[_ evaluation-portlet.submit_answer_]"
- set submitted_date_mode edit
- set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]"
- } else {
- set submitted_date "[_ evaluation-portlet.submit_answer_again_]"
- set submitted_date_mode display
- set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
- }
- } elseif { [string eq $late_submit_p "t"] } {
- if { ![db_0or1row answer_info { *SQL* }] } {
- set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f]"
- set submitted_date_mode edit
- set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]"
- } else {
- set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f_1]"
- set submitted_date_mode display
- set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
- }
- }
- if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
- set submitted_date "[_ evaluation-portlet.No_group_for_task_]"
- set submitted_date_url ""
- }
- }
- } else {
- set submitted_date_url "[export_vars -base "${base_url}answer-view" { grade_id task_id return_url answer_mode {answer_id}}]"
- if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
-
- set submitted_date "[_ evaluation-portlet.No_group_for_task_]"
- set submitted_date_url ""
- }
-
- }
+
+ set over_weight ""
+ if { [string eq $show_student_p "t"] } {
+ if { ![empty_string_p $grade] } {
+ set grade [lc_numeric $grade]
+ set over_weight "[lc_numeric $task_grade]/"
+ if { $simple_p } {
+ set task_grade [format %0.2f [expr ($grade*$perfect_score/100.0)]]
+ }
+ set total_grade [expr $total_grade + $task_grade]
+ if { $simple_p } {
+ set max_grade [expr $task_grade + $max_grade]
+ } else {
+ set max_grade [expr $task_weight + $max_grade]
+ }
+ } else {
+ set grade "[_ evaluation-portlet.Not_evaluated_]"
+ set task_grade "[_ evaluation-portlet.Not_evaluated_]"
+ }
+ set task_weight "${over_weight}[lc_numeric $task_weight]"
+
+ } else {
+ set grade "[_ evaluation-portlet.Not_available_]"
+ set task_weight [lc_numeric $task_weight]
+ }
+ } else {
+ set grade "[_ evaluation-portlet.Not_evaluated_]"
+ if { $simple_p } {
+ set task_weight [lc_numeric $task_weight]
+ } else {
+ set task_weight "[_ evaluation-portlet.Not_evaluated_]"
+ }
+ set task_grade "[_ evaluation-portlet.Not_evaluated_]"
+ }
+
+ if { [db_0or1row get_answer_info { *SQL* }] } {
+ set submitted_date $creation_date
+ # working with answer stuff (if it has a file/url attached)
+ if { [string eq $answer_title "link"] } {
+ # there is a bug in the template::list, if the url does not has a http://, ftp://, the url is not absolute,
+ # so we have to deal with this case
+ array set community_info [site_node::get -url "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]][evaluation::package_key]"]
+ if { ![regexp ([join [split [parameter::get -parameter urlProtocols -package_id $community_info(package_id)] ","] "|"]) "$answer_data"] } {
+ set answer_data "http://$answer_data"
+ }
+ set answer_url "[export_vars -base "$answer_data" { }]"
+ set answer "[_ evaluation-portlet.View_my_answer_]"
+ } else {
+ # we assume it's a file
+ set answer_url "[export_vars -base "${base_url}view/$answer_title" { {revision_id $answer_id} }]"
+ set answer "[_ evaluation-portlet.View_my_answer_]"
+ }
+
+ if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
+ set answer ""
+ set answer_url ""
+ set grade "[_ evaluation-portlet.No_group_for_task_]"
+ }
+ } else {
+ set answer_url ""
+ set answer ""
+ }
+ set max_weight [expr $max_weight + $perfect_score]
+ 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"] } {
+ if { [db_string compare_due_date { *SQL* } -default 0] } {
+ if { ![db_0or1row answer_info { *SQL* }] } {
+ set submitted_date "[_ evaluation-portlet.submit_answer_]"
+ set submitted_date_mode edit
+ set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]"
+ } else {
+ set submitted_date "[_ evaluation-portlet.submit_answer_again_]"
+ set submitted_date_mode display
+ set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
+ }
+ } elseif { [string eq $late_submit_p "t"] } {
+ if { ![db_0or1row answer_info { *SQL* }] } {
+ set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f]"
+ set submitted_date_mode edit
+ set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]"
+ } else {
+ set submitted_date "[_ evaluation-portlet.lt_submit_answer_style_f_1]"
+ set submitted_date_mode display
+ set submitted_date_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]"
+ }
+ }
+ if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
+ set submitted_date "[_ evaluation-portlet.No_group_for_task_]"
+ set submitted_date_url ""
+ }
+ }
+ } else {
+ set submitted_date_url "[export_vars -base "${base_url}answer-view" { grade_id task_id return_url answer_mode {answer_id}}]"
+ if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } {
+
+ set submitted_date "[_ evaluation-portlet.No_group_for_task_]"
+ set submitted_date_url ""
+ }
+
+ }
}
}