Index: openacs-4/packages/assessment/www/admin/action-params.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-params.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/action-params.tcl	25 Jan 2005 22:03:44 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/action-params.tcl	28 Jan 2005 20:33:19 -0000	1.3
@@ -19,7 +19,7 @@
     ad_script_abort
 }
 set title $assessment_data(title)
-set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] [ list "add-edit-check?assessment_id=$assessment_id&section_id=$section_id" "$title Checks"] [list "action-select?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&action_id=$action_id&section_id=$section_id" "[_ assessment.action_select]"] "[_ assessment.action_params]" ]
+set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "[_ assessment.action_params]" ]
 
 set new_assessment_revision [db_string get_assessment_id {select max(revision_id) from cr_revisions where item_id=:assessment_id}]
 	
Index: openacs-4/packages/assessment/www/admin/action-select.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-select.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/action-select.tcl	25 Jan 2005 22:03:44 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/action-select.tcl	28 Jan 2005 20:33:19 -0000	1.3
@@ -20,7 +20,7 @@
 set edit_p [ db_string exist_check {}]
 
 set title $assessment_data(title)
-set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] [ list "add-edit-check?assessment_id=$assessment_id&section_id=$section_id" "$title Triggers"] [_ assessment.action_select]]
+set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] [_ assessment.action_select]]
 
 set title "[_ assessment.action_select]" 
 set options [list [list "[_ assessment.immediately]" "i"] [list "[_ assessment.at_the_end]" "aa"] [list "[_ assessment.manually]" "m"]]
@@ -74,13 +74,16 @@
 		db_dml edit_action {}
 
 	    } else {
-		    ns_log notice "----------------------- no es igual $perform $action_perform"
+		ns_log notice "----------------------- no es igual $perform $action_perform"
 		#re-order the other group
 		as::assessment::check::re_order_actions -check_id $inter_item_check_id -section_id $section_id -action_perform $perform
 		set order [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform]
 		db_dml edit_action_order_by {}
 	    }
 	} else {
+	    db_dml delete_action_map {}
+	    db_dml delete_param_map {}
+		
 	    set order [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform]
 	    db_dml select_action {}
 	}
Index: openacs-4/packages/assessment/www/admin/action-select.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-select.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/action-select.xql	24 Jan 2005 17:45:56 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/action-select.xql	28 Jan 2005 20:33:19 -0000	1.2
@@ -53,10 +53,25 @@
 </querytext>
 </fullquery>
 
+
 <fullquery name="edit_action_order_by">
 <querytext>
 	update as_action_map set action_perform=:action_perform, action_id=:action_id, user_message=:user_message,order_by=:order where inter_item_check_id=:inter_item_check_id
 </querytext>
 </fullquery>
 
+<fullquery name="delete_action_map">
+<querytext>
+	delete from as_action_map where inter_item_check_id=:inter_item_check_id;
+</querytext>
+</fullquery>
+
+<fullquery name="delete_param_map">
+<querytext>
+	delete from as_param_map where inter_item_check_id=:inter_item_check_id;
+</querytext>
+</fullquery>
+
+
+
 </queryset>
Index: openacs-4/packages/assessment/www/admin/add-edit-check-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/add-edit-check-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/add-edit-check-oracle.xql	24 Jan 2005 17:45:56 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/add-edit-check-oracle.xql	28 Jan 2005 20:33:19 -0000	1.2
@@ -14,6 +14,7 @@
 		description		=>	:description,
 		postcheck_p		=>	:postcheck_p,
 		item_id			=>	null,
+		assessment_id		=>	:assessment_id,
 		creation_user		=>	:user_id,
 		context_id		=>	null,
 		object_type		=>	'as_inter_item_checks',
Index: openacs-4/packages/assessment/www/admin/add-edit-check-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/add-edit-check-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/add-edit-check-postgresql.xql	27 Jan 2005 18:08:40 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/add-edit-check-postgresql.xql	28 Jan 2005 20:33:19 -0000	1.3
@@ -10,7 +10,7 @@
 
 <fullquery name="new_check">
 <querytext>
-	select as_inter_item_check__new (:inter_item_check_id,:action_p,:section_id_from,null,:check_sql,:name,:description,:postcheck_p,null,:user_id,null)	
+	select as_inter_item_check__new (:inter_item_check_id,:action_p,:section_id_from,null,:check_sql,:name,:description,:postcheck_p,null,:user_id,null,:assessment_id)	
 </querytext>
 </fullquery>
 
Index: openacs-4/packages/assessment/www/admin/add-edit-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/add-edit-check.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/add-edit-check.tcl	25 Jan 2005 22:03:44 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/add-edit-check.tcl	28 Jan 2005 20:33:19 -0000	1.3
@@ -17,7 +17,7 @@
 set section_id_from ""
 set return_url ""
 as::assessment::data -assessment_id $assessment_id
-
+set assessment_rev_id $assessment_data(assessment_rev_id)
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
     ad_script_abort
@@ -102,7 +102,7 @@
     set condition_sql [db_string get_item_id {}] 
     #parse condition_sql to get choice_id
     set cond_list  [split $condition_sql "="]
-#    set condition [string range [lindex $cond_list 1] 0 3]
+    #set condition [string range [lindex $cond_list 1] 0 3]
     set condition [lindex [split [lindex $cond_list 1] " "] 0]
 
 } -edit_data {
Index: openacs-4/packages/assessment/www/admin/admin-request.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/admin-request.adp	24 Jan 2005 17:45:56 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/admin-request.adp	28 Jan 2005 20:33:19 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="admin-master">
-<property name="title">Waiting List</property>
+<property name="title">#assessment.Request# #assessment.Administration#</property>
+<property name="context_bar">@context;noquote@</property>
 
-
 <script language="JavaScript">
 
 function get_interval() {
Index: openacs-4/packages/assessment/www/admin/admin-request.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/admin-request.tcl	25 Jan 2005 22:03:44 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/admin-request.tcl	28 Jan 2005 20:33:19 -0000	1.4
@@ -20,6 +20,7 @@
 set assessment_list [as::assessment::check::get_assessments]
 set intervals [as::assessment::check::intervals]
 
+set context [list "[_ assessment.Request] [_ assessment.Administration]"]
 
 # set default values
 
Index: openacs-4/packages/assessment/www/admin/assessment-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/assessment-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/admin/assessment-delete.tcl	27 Jan 2005 18:08:40 -0000	1.3
+++ openacs-4/packages/assessment/www/admin/assessment-delete.tcl	28 Jan 2005 20:33:19 -0000	1.4
@@ -33,7 +33,7 @@
 } -select_query_name {assessment_title} \
 -on_submit {
     if {$confirmation} {
-	as::assessment::check::delete_assessment_checks -assessment_rev_id $assessment_rev_id
+	as::assessment::check::delete_assessment_checks -assessment_id $assessment_id
 	db_dml remove_assessment {}
     }
 } -after_submit {
Index: openacs-4/packages/assessment/www/admin/checks-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-admin.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/checks-admin.adp	25 Jan 2005 22:03:44 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/checks-admin.adp	28 Jan 2005 20:33:19 -0000	1.3
@@ -1,5 +1,6 @@
 <master>
 <property name="title">@title@ #assessment.Administration#</property>
+<property name="context_bar">@context_bar;noquote@</property>
 <br>
 <b>#assessment.after_this_asm#</b>
 <br>
Index: openacs-4/packages/assessment/www/admin/checks-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-admin.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/checks-admin.tcl	25 Jan 2005 22:03:44 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/checks-admin.tcl	28 Jan 2005 20:33:19 -0000	1.3
@@ -10,17 +10,16 @@
 }
 
 as::assessment::data -assessment_id $assessment_id
-set new_assessment_revision [db_string get_assessment_id {select max(revision_id) from cr_revisions where item_id=:assessment_id}]
+set new_assessment_revision $assessment_data(assessment_rev_id)
 
 
-
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
     ad_script_abort
 }
 
-set title "$assessment_data(title) \#assessment.triggers\#"
-set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title \#assessment.triggers\#"]
+set title "$assessment_data(title)"
+set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title [_ assessment.Administration]"]
 
 db_multirow aa_checks get_aa_checks {} 
 
Index: openacs-4/packages/assessment/www/admin/checks-admin.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-admin.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/checks-admin.xql	24 Jan 2005 17:45:56 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/checks-admin.xql	28 Jan 2005 20:33:19 -0000	1.2
@@ -3,7 +3,7 @@
 
 <fullquery name="get_aa_checks">
 <querytext>		
-        select am.action_perform,c.inter_item_check_id,c.name,a.name as action_name, am.order_by,c.section_id_from from as_inter_item_checks c,as_actions a, as_action_map am where am.inter_item_check_id = c.inter_item_check_id and am.action_id=a.action_id and c.section_id_from =:section_id and am.action_perform = 'aa' and c.action_p = 't'order by order_by
+        select am.action_perform,c.inter_item_check_id,c.name,a.name as action_name, am.order_by,c.section_id_from from as_inter_item_checks c,as_actions a, as_action_map am where am.inter_item_check_id = c.inter_item_check_id and am.action_id=a.action_id and c.section_id_from =:section_id and am.action_perform = 'aa' and c.action_p = 't'and c.assessment_id=:assessment_id order by order_by
 </querytext>			
 </fullquery>
 
@@ -13,7 +13,7 @@
 	as_inter_item_checks c,as_actions a, as_action_map am where
 	am.inter_item_check_id = c.inter_item_check_id and am.action_id=a.action_id
 	and c.section_id_from =:section_id and am.action_perform = 'i' and c.action_p
-	= 't' order by order_by
+	= 't' and c.assessment_id=:assessment_id order by order_by
 </querytext>			
 </fullquery>
 
@@ -23,15 +23,15 @@
 	as_inter_item_checks c,as_actions a, as_action_map am where
 	am.inter_item_check_id = c.inter_item_check_id and am.action_id=a.action_id
 	and c.section_id_from =:section_id and am.action_perform = 'm' and c.action_p
-	= 't' order by order_by
+	= 't' and c.assessment_id=:assessment_id order by order_by
 </querytext>			
 </fullquery>
 
 <fullquery name="get_branches">
 <querytext>		
 	select c.name,c.inter_item_check_id,c.section_id_to,(select cr.title from
 	cr_revisions cr where cr.revision_id=c.section_id_to) as sname  from
-	as_inter_item_checks c where c.action_p='f' and c.section_id_from=:section_id
+	as_inter_item_checks c where c.action_p='f' and c.section_id_from=:section_id and c.assessment_id=:assessment_id
 </querytext>			
 </fullquery>
 
Index: openacs-4/packages/assessment/www/admin/confirm-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/confirm-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/confirm-delete.adp	24 Jan 2005 17:52:14 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/confirm-delete.adp	28 Jan 2005 20:33:19 -0000	1.2
@@ -1,3 +1,5 @@
 <master>
+<property name="context">@context;noquote@</property>
+<property name="title">@title;noquote@</property>
 <include src="/packages/assessment/lib/show-check-info">
 <formtemplate id=delete_checks> </formtemplate> 
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/confirm-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/confirm-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/confirm-delete.tcl	24 Jan 2005 17:52:14 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/confirm-delete.tcl	28 Jan 2005 20:33:19 -0000	1.2
@@ -7,7 +7,12 @@
     section_id
     assessment_id
 }
+as::assessment::data -assessment_id $assessment_id
+set title "$assessment_data(title)"
+set context [list [list "one-a?assessment_id=$assessment_id" $title] [list "checks-admin?assessment_id=$assessment_id&section_id=$section_id" "$title [_ assessment.Administration]"] "[_ assessment.trigger_delete]"]
 
+set title "[_ assessment.trigger_delete]"
+
 ad_form -name delete_checks -form {
 
     {inter_item_check_id:text(hidden) 
Index: openacs-4/packages/assessment/www/admin/request-notification.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/request-notification.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/request-notification.adp	25 Jan 2005 22:03:44 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/request-notification.adp	28 Jan 2005 20:33:19 -0000	1.3
@@ -1,4 +1,5 @@
 <master>
 <property name="title">@title@</property>
+<property name="context">@context;noquote@</property>
 <formtemplate id=notify></formtemplate>
 <listtemplate name="notify_users"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/request-notification.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/request-notification.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/request-notification.tcl	25 Jan 2005 22:03:44 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/request-notification.tcl	28 Jan 2005 20:33:19 -0000	1.3
@@ -8,9 +8,13 @@
   assessment_id
   section_id
 }
-set check_name [db_string get_name {}]
-set title "[_ assessment.request_notif] $check_name"
 
+as::assessment::data -assessment_id $assessment_id
+set title "$assessment_data(title)"
+
+
+set context [list [list "one-a?assessment_id=$assessment_id" $title] [list "checks-admin?assessment_id=$assessment_id&section_id=$section_id" "$title [_ assessment.Administration]"] "[_ assessment.Request] [_ assessment.Notification]"]
+
 form create notify
 set type "as_inter_item_checks_notif"
 set type_id [notification::type::get_type_id -short_name $type]