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.9.2.1 -r1.9.2.2 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 31 May 2005 23:13:11 -0000 1.9.2.1 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 16 Jun 2005 09:22:36 -0000 1.9.2.2 @@ -9,6 +9,7 @@ } { grade_id:integer,notnull + {set_task_id_live:optional ""} } set user_id [ad_conn user_id] @@ -18,9 +19,16 @@ set context [list [list "grades" "[_ evaluation.Assignment_Types_]"] "[_ evaluation.lt_Assignment_Types_Dist]"] set class "list" if { $simple_p } { -set class "pbs_list" + set class "pbs_list" } + db_1row grade_info { *SQL* } + +if { ![empty_string_p $set_task_id_live] } { + evaluation::set_live_task -task_item_id $set_task_id_live +} + +ns_log notice "el grade es $grade_item_id !!" set elements [list task_name \ [list label "[_ evaluation.name]" \ display_template {@grades.task_name@}\ @@ -31,18 +39,23 @@ display_template {
} \ aggregate sum \ aggregate_label { [_ evaluation.total]} - ] \ + ] \ relative_weight \ [list label "[_ evaluation.rel_weight]" \ display_template {
@grades.relative_weight@
} \ aggregate sum \ - ]\ + ]\ requires_grade \ [list label "[_ evaluation.requires_grade]" \ display_template { [_ evaluation.Yes_] [_ evaluation.No_] } \ - ] \ - - ] + ] \ + delete \ + [list label {} \ + sub_class narrow \ + display_template { @grades.delete_template;noquote@ } \ + link_html { title "[_ evaluation.lt_Delete_assignment_typ]" } \ + ] \ + ] # points \ @@ -67,7 +80,9 @@ set orderby " order by task_name asc" } -db_multirow -extend { radio_yes_checked radio_no_checked } grades get_grade_tasks { *SQL* } { +set return_url "../grades/distribution-edit?[export_vars { grade_id } ]" + +db_multirow -extend { radio_yes_checked radio_no_checked delete_template } grades get_grade_tasks { *SQL* } { set task_weight [format %0.2f $task_weight] @@ -78,9 +93,19 @@ set radio_yes_checked "" set radio_no_checked "checked" } + + if { [empty_string_p $live_revision] } { + set delete_template "[_ evaluation.Deleted] [_ evaluation.make_it_live]" + } elseif { $simple_p } { + set delete_template "[_ evaluation-portlet.Delete]" + } else { + set delete_template "" + } + } +