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.7 -r1.8 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 12 Aug 2004 17:46:42 -0000 1.7 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 26 Aug 2004 01:47:48 -0000 1.8 @@ -25,6 +25,10 @@ display_template {
@grade_tasks_admin.task_weight@%
} \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc}] + lappend elements audit_info \ + [list label "" \ + link_url_col audit_info_url \ + link_html { title "[_ evaluation-portlet.Audit_info_]" }] set multirow_name grade_tasks_admin set actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]] } else { @@ -75,10 +79,13 @@ if { $admin_p } { #admin - db_multirow -extend { task_url } grade_tasks_admin get_tasks_admin { *SQL* } { + db_multirow -extend { task_url audit_info audit_info_url } grade_tasks_admin get_tasks_admin { *SQL* } { set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { task_id grade_id }] set category_weight [expr $category_weight + $task_weight] set task_weight [format %.2f [lc_numeric $task_weight]] + + 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 { Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 12 Aug 2004 17:46:42 -0000 1.7 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 26 Aug 2004 01:47:48 -0000 1.8 @@ -31,10 +31,6 @@ [list label "" \ link_url_col solution_url \ link_html { title "[_ evaluation-portlet.Addedit_solution_]" }] - lappend elements audit_info \ - [list label "" \ - link_url_col audit_info_url \ - link_html { title "[_ evaluation-portlet.Audit_info_]" }] lappend elements groups_admin \ [list label "" \ link_url_col groups_admin_url \ @@ -97,9 +93,9 @@ if { $admin_p } { - db_multirow -extend { solution_url due_date_pretty solution solution_mode task_url audit_info audit_info_url groups_admin groups_admin_url } tasks_admin get_tasks_admin { *SQL* } { + db_multirow -extend { solution_url due_date_pretty solution solution_mode task_url groups_admin groups_admin_url } tasks_admin get_tasks_admin { *SQL* } { - set due_date_pretty [lc_time_fmt $due_date_ansi "%q"] + set due_date_pretty [lc_time_fmt $due_date_ansi "%q %r"] # working with task stuff (if it has a file/url attached) if { [empty_string_p $task_data] } { set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]" @@ -131,9 +127,6 @@ set solution "[_ evaluation-portlet.Upload_Solution_]" } - set audit_info_url "[export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }]" - set audit_info "[_ evaluation-portlet.Audit_Info_]" - if { ![string eq $number_of_members 1] } { set groups_admin_url "[export_vars -base "${base_url}admin/groups/one-task" { grade_id task_id }]" set groups_admin "[_ evaluation-portlet.Groups_Admin_]" @@ -144,7 +137,7 @@ db_multirow -extend { task_url solution_url solution due_date_pretty solution_mode answer answer_url } tasks get_tasks { *SQL* } { set answer_mode display - set due_date_pretty [lc_time_fmt $due_date_ansi "%q"] + set due_date_pretty [lc_time_fmt $due_date_ansi "%q %r"] # working with task stuff (if it has a file/url attached) if { [empty_string_p $task_data] } { set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]" @@ -189,7 +182,7 @@ } } if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } { - set answer "" + set answer "[_ evaluation-portlet.No_group_for_task_]" set answer_url "" } }