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 -r1.10
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	22 Dec 2004 22:06:40 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	8 Aug 2006 21:26:42 -0000	1.10
@@ -6,37 +6,70 @@
     @author jopez@galileo.edu
     @creation-date Mar 2004
     @cvs-id $Id$
+
 } {
     grade_id:integer,notnull
+    {set_task_id_live:optional ""}
 } 
 
 set user_id [ad_conn user_id]
+set simple_p [parameter::get -parameter "SimpleVersion"]
 
 set page_title "[_ evaluation.lt_Assignment_Types_Dist]"
 set context [list [list "grades" "[_ evaluation.Assignment_Types_]"] "[_ evaluation.lt_Assignment_Types_Dist]"]
+set class "list"
+if { $simple_p } {
+    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_]" \
+		  [list label "[_ evaluation.name]" \
+		       display_template {<a href="../evaluations/student-list?task_id=@grades.task_id@">@grades.task_name@</a>}\
 		       orderby_asc {task_name asc} \
 		       orderby_desc {task_name desc}] \
 		  task_weight \
-		  [list label "[_ evaluation.lt_Weight_over_grade_wei]" \
-		       display_template { <input size=3 maxlength=6 type=text name=weights.@grades.task_id@ value=@grades.task_weight@>% } \
+		  [list label "[_ evaluation.lt_Weight_over_grade]" \
+		       display_template { <center><input size=5 maxlength=6 type=text name=weights.@grades.task_id@ value=@grades.task_weight@> </ center>} \
 		       aggregate sum \
-		       aggregate_label { Total }
-		      ] \
+		       aggregate_label { [_ evaluation.total]}
+		  ] \
+		  relative_weight \
+		  [list label "[_ evaluation.rel_weight]" \
+		       display_template { <center>@grades.relative_weight@</center> } \
+		       aggregate sum \
+		      ]\
 		  requires_grade \
-		  [list label "[_ evaluation.Requires_Grade_]" \
+		  [list label "[_ evaluation.requires_grade]" \
 		       display_template { [_ evaluation.Yes_] <input @grades.radio_yes_checked@ type=radio name="no_grade.@grades.task_id@" value=t> [_ evaluation.No_] <input @grades.radio_no_checked@ type=radio name="no_grade.@grades.task_id@" value=f> } \
-					     ] \
-		       ]
-	      
+		      ] \
+		  delete \
+		  [list label {} \
+		       sub_class narrow \
+		       display_template { @grades.delete_template;noquote@ } \
+		       link_html { title "[_ evaluation.lt_Delete_assignment_typ]" } \
+		      ] \
+		 ]
+
+
+# points \
+	  [list label "Weight over Total" \
+		       display_template { <input size=5 maxlength=6 type=text name=points.@grades.task_id@ value=@grades.points@> } \
+		       aggregate sum \
+		       aggregate_label { Total } ] 
+
 template::list::create \
     -name grades \
     -multirow grades \
     -key task_id \
+    -main_class $class \
+    -sub_class narrow\
     -filters { grade_id {} } \
     -elements $elements 
 
@@ -47,19 +80,32 @@
     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 [lc_numeric %.2f $task_weight]
+    set task_weight [format  %0.2f $task_weight]
+    
     if { [string eq $requires_grade_p "t"] } {
 	set radio_yes_checked "checked"
 	set radio_no_checked ""
     } else {
 	set radio_yes_checked ""
 	set radio_no_checked "checked"
     }    
+
+    if { [empty_string_p $live_revision] } {
+	set delete_template "<span style=\"font-style: italic; color: red; font-size: 9pt;\">[_ evaluation.Deleted]</span> <a href=[export_vars -base "distribution-edit" { grade_id {set_task_id_live $task_item_id} }]>[_ evaluation.make_it_live]</a>"
+    } elseif { $simple_p } {
+	set delete_template "<a href=\"[export_vars -base "../tasks/task-delete" { task_id grade_id return_url }]\">[_ evaluation-portlet.Delete]</a>"
+    } else {
+	set delete_template "<a href=\"[export_vars -base "../tasks/task-delete" { task_id grade_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\"></a>"
+    }
+    
 } 	
 
 
 
 
 
+