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.14.2.2 -r1.14.2.3
--- openacs-4/packages/evaluation/www/admin/grades/grades.tcl 8 Jun 2005 18:57:14 -0000 1.14.2.2
+++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl 16 Jun 2005 09:22:36 -0000 1.14.2.3
@@ -9,6 +9,7 @@
@cvs-id $Id$
} -query {
{orderby:optional}
+ {set_grade_id_live:optional ""}
}
set context [list "[_ evaluation.Grades_]"]
@@ -24,6 +25,10 @@
set a_label [_ evaluation.total_of_course]
set actions "[_ evaluation.Add_assignment_type_]"
+if { ![empty_string_p $set_grade_id_live] } {
+ evaluation::set_live_grade -grade_item_id $set_grade_id_live
+}
+
if { [lc_numeric %2.f [db_string sum_grades { *SQL* }]] > 100.00} {
set aggregate_label "[_ evaluation.Total_d]"
} else {
@@ -86,9 +91,7 @@
delete {
label {}
sub_class narrow
- display_template {[_ evaluation-portlet.delete]
- }
- link_url_eval {[export_vars -base "grades-delete" { grade_id return_url }]}
+ display_template {@grades.delete_template;noquote@}
link_html { title "[_ evaluation.lt_Delete_assignment_typ]" }
}
}
@@ -100,10 +103,17 @@
}
-db_multirow -extend {} grades get_class_grades { *SQL* } {
+db_multirow -extend { delete_template } grades get_class_grades { *SQL* } {
if { $simple_p } {
set total [expr $total + $weight]
}
+ 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 ""
+ }
}
db_1row get_total_weight { *SQL* }