Index: openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl	11 Apr 2005 19:08:59 -0000	1.8
+++ openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl	12 Jun 2006 02:49:51 -0000	1.9
@@ -26,15 +26,16 @@
     set show_p 0
     set by_item_p 1
     set item_p "&item_id=$item_id"
-    set item_id_check $item_id
+    set item_id_check $item_id 
+    set as_item_id_i [db_string get_item_id { select item_id from cr_revisions where revision_id = :item_id}]
     set check_list "and c.inter_item_check_id in ("
     set checks [db_list_of_lists get_all_checks { }]
     set count  0
     
     foreach check $checks {
 	set cond_list  [split [lindex $check 1] "="]
-	set as_item_id [lindex [split [lindex $cond_list 2] " "] 0]
-	if { $item_id == $as_item_id} {
+	set as_item_id [lindex [split [lindex $cond_list 2] ")"] 0]
+	if { $as_item_id_i == $as_item_id} {
 	    incr count
 	    append check_list "[lindex $check 0],"
 	}
@@ -47,6 +48,8 @@
     append  check_list ")"
 } 
 
+db_multirow  or_checks get_or_checks {}  
+db_multirow  sa_checks get_sa_checks {}  
 db_multirow  aa_checks get_aa_checks {}  
 db_multirow  i_checks  get_i_checks {}  
 db_multirow  branches  get_branches {} 
@@ -64,6 +67,94 @@
 
 
 template::list::create \
+    -name or_checks \
+    -multirow or_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"\#assessment.Delete\#" "confirm-delete" "\#assessment.delete_checked\#"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	assessment_id
+	section_id
+	{type_check t}
+	item_id_check
+	by_item_p
+    }\
+    -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \
+    -elements {
+	name {
+	    label "[_ assessment.Name]"
+	    display_template {
+		<a href=add-edit-section-check?assessment_id=$assessment_id&inter_item_check_id=@or_checks.inter_item_check_id@&section_id=@or_checks.section_id_from@&edit_check=t&by_item_p=$by_item_p$item_p><img border=0 src=images/Edit16.gif></a>  @or_checks.name@
+	    }
+	}
+	action_name {
+	    label "[_ assessment.action_to_perform]"
+	}
+	counter {
+	    display_template {    
+		<if $show_p eq 1>
+		<if @or_checks.order_by@ lt @or_checks:rowcount@>
+		<a href="swap-actions?assessment_id=$assessment_id&check_id=@or_checks.inter_item_check_id@&order_by=@or_checks.order_by@&section_id=@or_checks.section_id_from@&action_perform=@or_checks.action_perform@&direction=d"><img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#"></a>
+		</if>
+		<if @or_checks.order_by@ gt 1>
+		<a href="swap-actions?assessment_id=$assessment_id&check_id=@or_checks.inter_item_check_id@&order_by=@or_checks.order_by@&section_id=@or_checks.section_id_from@&action_perform=@or_checks.action_perform@&direction=u"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+		</if>
+		</if>
+		<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@or_checks.inter_item_check_id@&section_id=$section_id>#assessment.notify_user#</a>
+		
+	    }
+	    
+	}
+    }
+
+
+template::list::create \
+    -name sa_checks \
+    -multirow sa_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"\#assessment.Delete\#" "confirm-delete" "\#assessment.delete_checked\#"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	assessment_id
+	section_id
+	{type_check t}
+	item_id_check
+	by_item_p
+    }\
+    -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \
+    -elements {
+	name {
+	    label "[_ assessment.Name]"
+	    display_template {
+		<a href=add-edit-section-check?assessment_id=$assessment_id&inter_item_check_id=@sa_checks.inter_item_check_id@&section_id=@sa_checks.section_id_from@&edit_check=t&by_item_p=$by_item_p$item_p><img border=0 src=images/Edit16.gif></a>  @sa_checks.name@
+	    }
+	}
+	action_name {
+	    label "[_ assessment.action_to_perform]"
+	}
+	counter {
+	    display_template {    
+		<if $show_p eq 1>
+		<if @sa_checks.order_by@ lt @sa_checks:rowcount@>
+		<a href="swap-actions?assessment_id=$assessment_id&check_id=@sa_checks.inter_item_check_id@&order_by=@sa_checks.order_by@&section_id=@sa_checks.section_id_from@&action_perform=@sa_checks.action_perform@&direction=d"><img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#"></a>
+		</if>
+		<if @sa_checks.order_by@ gt 1>
+		<a href="swap-actions?assessment_id=$assessment_id&check_id=@sa_checks.inter_item_check_id@&order_by=@sa_checks.order_by@&section_id=@sa_checks.section_id_from@&action_perform=@sa_checks.action_perform@&direction=u"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+		</if>
+		</if>
+		<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@sa_checks.inter_item_check_id@&section_id=$section_id>#assessment.notify_user#</a>
+		
+	    }
+	    
+	}
+    }
+
+
+template::list::create \
     -name aa_checks \
     -multirow aa_checks \
     -key inter_item_check_id \
@@ -83,7 +174,7 @@
 	name {
 	    label "[_ assessment.Name]"
 	    display_template {
-		<a href=add-edit-check?assessment_id=$assessment_id&inter_item_check_id=@aa_checks.inter_item_check_id@&edit_check=t&by_item_p=$by_item_p$item_p><img border=0 src=images/Edit16.gif></a>  @aa_checks.name@
+		<a href=add-edit-check?assessment_id=$assessment_id&inter_item_check_id=@aa_checks.inter_item_check_id@&edit_check=t&by_item_p=$by_item_p$item_p&section_id=$section_id><img border=0 src=images/Edit16.gif></a>  @aa_checks.name@
 	    }
 	}
 	action_name {
@@ -129,7 +220,7 @@
 	name {
 	    label "[_ assessment.Name]"
 	    display_template {
-		<a href=add-edit-check?assessment_id=$assessment_id&inter_item_check_id=@i_checks.inter_item_check_id@&edit_check=t&by_item_p=$by_item_p$item_p><img border=0 src=images/Edit16.gif></a>  @i_checks.name@
+		<a href=add-edit-check?assessment_id=$assessment_id&section_id=$section_id&inter_item_check_id=@i_checks.inter_item_check_id@&edit_check=t&by_item_p=$by_item_p$item_p><img border=0 src=images/Edit16.gif></a>  @i_checks.name@
 	    }
 	}
 	action_name {
@@ -174,7 +265,7 @@
 	name {
 	    label "[_ assessment.Name]"
 	    display_template {
-		<a href=add-edit-check?assessment_id=$assessment_id&inter_item_check_id=@m_checks.inter_item_check_id@&edit_check=t&by_item_p=$by_item_p$item_p><img border=0 src=images/Edit16.gif></a>  @m_checks.name@
+		<a href=add-edit-check?assessment_id=$assessment_id&inter_item_check_id=@m_checks.inter_item_check_id@&edit_check=t&by_item_p=$by_item_p$item_p&section_id=$section_id><img border=0 src=images/Edit16.gif></a>  @m_checks.name@
 	    }
 	}
 	action_name {
@@ -209,7 +300,7 @@
 	name {
 	    label "[_ assessment.Name]"
 	    display_template {
-		<a href=add-edit-check?assessment_id=$assessment_id&inter_item_check_id=@branches.inter_item_check_id@&edit_check=t&type=b&by_item_p=$by_item_p$item_p><img border=0 src=images/Edit16.gif></a>  @branches.name@
+		<a href=add-edit-check?assessment_id=$assessment_id&inter_item_check_id=@branches.inter_item_check_id@&edit_check=t&type=b&by_item_p=$by_item_p$item_p&section_id=$section_id><img border=0 src=images/Edit16.gif></a>  @branches.name@
 	    }
 	}
 	section_id_to {