Index: openacs-4/packages/assessment/www/admin/action-params.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-params.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-params.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,4 @@
+<master>
+<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@title;noquote@</property>
+<formtemplate id="get_params"></formtemplate>
\ No newline at end of file
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-params.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,94 @@
+ad_page_contract {
+    
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date 2005-01-07
+    
+    This page allows to add branches or actions to the question and its choices.    
+} {
+    assessment_id:integer
+    inter_item_check_id:integer
+    section_id:integer
+    action_id:integer
+    check_id:optional
+    edit_check:optional
+}
+
+as::assessment::data -assessment_id $assessment_id
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    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" "Action Select"] "Action Parameters"]
+
+set new_assessment_revision [db_string get_assessment_id {select max(revision_id) from cr_revisions where item_id=:assessment_id}]
+	
+set new_section_revision [db_string get_section_id {select max(revision_id) from cr_revisions where item_id=:section_id}]
+
+set has_params_p [db_string has_params {} -default 0]
+
+if {$has_params_p == 0} {
+        ad_returnredirect "one-a?assessment_id=$assessment_id"
+}
+
+set action_perform [db_string get_perform {} -default " "]
+set title "Action Parameters"
+
+ad_form -name get_params -export { assessment_id section_id action_perform} -form {
+    
+    check_id:key
+    {inter_item_check_id:text(hidden)
+	{value $inter_item_check_id}}
+	
+    {action_id:text(hidden)
+	{value $action_id}}
+    
+} 
+db_foreach get_params {} {
+    set choices [list]
+    if { $type == "n" } {
+	if { $action_perform == "aa" || $action_perform == "m"} {
+	    set choices [db_list_of_lists choices {}]
+	} else {
+	    set choices [db_list_of_lists prev_choices {}]
+	}
+    } else {
+	set choices [db_list_of_lists choices_param $query]
+    }    
+    
+    set parameter [list [list param_$parameter_id:text(select),optional [list label $varname] [list options $choices] ]]
+    ad_form -extend -name get_params  -form $parameter
+}
+
+ad_form -extend -name get_params -new_data {
+    db_foreach get_params {} {
+	
+	if { $type == "n"} {
+	    set item_id [set param_$parameter_id]
+	    db_dml param_values_n {}
+	} else {
+	    set value [set param_$parameter_id]
+	    db_dml param_values_q {}
+	}
+	
+    }
+    
+} -edit_request {
+    
+    set action_id $action_id
+    db_foreach get_params {} {
+	set param_$parameter_id [as::assessment::check::get_parameter_value -parameter_id $parameter_id -type $type -check_id $inter_item_check_id]
+	if { [set param_$parameter_id] == ""} {
+	    set param_$parameter_id [lindex [lindex $choices 0] 1]
+	}
+	
+    }
+} -edit_data {
+    db_foreach get_params {} {
+	as::assessment::check::set_parameter_value -parameter_id $parameter_id -type $type -check_id $inter_item_check_id -value [set param_$parameter_id]
+    }
+    
+} -on_submit {
+    ad_returnredirect "one-a?assessment_id=$assessment_id"
+}
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-params.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,92 @@
+ad_page_contract {
+    
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date 2005-01-07
+    
+    This page allows to add branches or actions to the question and its choices.    
+} {
+    assessment_id:integer
+    inter_item_check_id:integer
+    section_id:integer
+    action_id:integer
+    check_id:optional
+    edit_check:optional
+}
+
+as::assessment::data -assessment_id $assessment_id
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    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" "Action Select"] "Action Parameters"]
+
+set new_assessment_revision [db_string get_assessment_id {select max(revision_id) from cr_revisions where item_id=:assessment_id}]
+	
+set new_section_revision [db_string get_section_id {select max(revision_id) from cr_revisions where item_id=:section_id}]
+
+set has_params_p [db_string has_params {} -default 0]
+
+if {$has_params_p == 0} {
+        ad_returnredirect "one-a?assessment_id=$assessment_id"
+}
+
+set action_perform [db_string get_perform {}]
+set title "Action Parameters"
+
+ad_form -name get_params -export { assessment_id section_id action_perform} -form {
+    
+    check_id:key
+    {inter_item_check_id:text(hidden)
+	{value $inter_item_check_id}}
+	
+    {action_id:text(hidden)
+	{value $action_id}}
+    
+} 
+db_foreach get_params {} {
+    set choices [list]
+    if { $type == "n" } {
+	if { $action_perform == "aa" || $action_perform == "m"} {
+	    set choices [db_list_of_lists choices {}]
+	} else {
+	    set choices [db_list_of_lists prev_choices {}]
+	}
+    } else {
+	set choices [db_list_of_lists choices_param $query]
+    }    
+    
+    set parameter [list [list param_$parameter_id:text(select),optional [list label $varname] [list options $choices] ]]
+    ad_form -extend -name get_params  -form $parameter
+}
+
+ad_form -extend -name get_params -new_data {
+    db_foreach get_params {} {
+	
+	if { $type == "n"} {
+	    set item_id [set param_$parameter_id]
+	    db_dml param_values_n {}
+	} else {
+	    set value [set param_$parameter_id]
+	    db_dml param_values_q {}
+	}
+	
+    }
+    
+} -edit_request {
+    
+    set action_id $action_id
+    db_foreach get_params {} {
+	if { [db_0or1row get_param_info {}]} {
+	set param_$parameter_id [as::assessment::check::get_parameter_value -parameter_id $parameter_id -type $type -check_id $inter_item_check_id]
+	}
+    }
+} -edit_data {
+    db_foreach get_params {} {
+	as::assessment::check::set_parameter_value -parameter_id $parameter_id -type $type -check_id $inter_item_check_id -value [set param_$parameter_id]
+    }
+    
+} -on_submit {
+    ad_returnredirect "one-a?assessment_id=$assessment_id"
+}
+
Index: openacs-4/packages/assessment/www/admin/action-params.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-params.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-params.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_params">
+<querytext>
+	select * from as_action_params where action_id=:action_id
+</querytext>
+</fullquery>
+
+<fullquery name="get_perform">
+<querytext>
+	select action_perform from as_action_map where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+
+<fullquery name="has_params">
+<querytext>
+	select count(parameter_id) from as_action_params where action_id=:action_id
+</querytext>
+</fullquery>
+
+
+<fullquery name="get_param_info">
+<querytext>
+	select * from as_param_map where parameter_id=:parameter_id and inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+
+<fullquery name="choices">
+<querytext>
+    select cri.title, sm.as_item_id
+    from as_item_section_map sm, cr_revisions cri
+    where sm.as_item_id = cri.revision_id and sm.section_id in (
+    select s.section_id
+    from as_sections s, cr_revisions cr, cr_items ci,
+    as_assessment_section_map asm,as_item_section_map sm
+    where ci.item_id = cr.item_id
+    and cr.revision_id = s.section_id
+    and s.section_id = asm.section_id 
+    and asm.assessment_id = :new_assessment_revision 
+    order by asm.sort_order)
+
+</querytext>
+</fullquery>
+
+<fullquery name="prev_choices">
+<querytext>
+    select cri.title, sm.as_item_id
+    from as_item_section_map sm, cr_revisions cri
+    where sm.as_item_id = cri.revision_id and sm.section_id in (
+    select s.section_id
+    from as_sections s, cr_revisions cr, cr_items ci,
+    as_assessment_section_map asm,as_item_section_map sm
+    where ci.item_id = cr.item_id
+    and cr.revision_id = s.section_id
+    and s.section_id = asm.section_id 
+    and asm.assessment_id = :new_assessment_revision and asm.sort_order <
+    (select sort_order from as_assessment_section_map where
+    section_id=:section_id and assessment_id=:new_assessment_revision)
+    order by asm.sort_order)
+
+</querytext>
+</fullquery>
+
+
+<fullquery name="param_values_n">
+	   <querytext>
+		insert into as_param_map
+	   (parameter_id,inter_item_check_id,value,item_id) values
+	   (:parameter_id,:inter_item_check_id,null,:item_id)
+	   </querytext>
+</fullquery>	
+
+<fullquery name="param_values_q">
+	   <querytext>
+		insert into as_param_map
+	   (parameter_id,inter_item_check_id,value,item_id) values
+	   (:parameter_id,:inter_item_check_id,:value,null)
+	   </querytext>
+</fullquery>	
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/action-params.xql~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-params.xql~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-params.xql~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_params">
+<querytext>
+	select * from as_action_params where action_id=:action_id
+</querytext>
+</fullquery>
+
+<fullquery name="has_params">
+<querytext>
+	select count(parameter_id) from as_action_params where action_id=:action_id
+</querytext>
+</fullquery>
+
+
+<fullquery name="get_param_info">
+<querytext>
+	select * from as_param_map where parameter_id=:parameter_id and inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+
+<fullquery name="choices">
+<querytext>
+    select cri.title, sm.as_item_id
+    from as_item_section_map sm, cr_revisions cri
+    where sm.as_item_id = cri.revision_id and sm.section_id in (
+    select s.section_id
+    from as_sections s, cr_revisions cr, cr_items ci,
+    as_assessment_section_map asm,as_item_section_map sm
+    where ci.item_id = cr.item_id
+    and cr.revision_id = s.section_id
+    and s.section_id = asm.section_id 
+    and asm.assessment_id = :new_assessment_revision 
+    order by asm.sort_order)
+
+</querytext>
+</fullquery>
+
+<fullquery name="param_values_n">
+	   <querytext>
+		insert into as_param_map
+	   (parameter_id,inter_item_check_id,value,item_id) values
+	   (:parameter_id,:inter_item_check_id,null,:item_id)
+	   </querytext>
+</fullquery>	
+
+<fullquery name="param_values_q">
+	   <querytext>
+		insert into as_param_map
+	   (parameter_id,inter_item_check_id,value,item_id) values
+	   (:parameter_id,:inter_item_check_id,:value,null)
+	   </querytext>
+</fullquery>	
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/action-select.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-select.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-select.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,4 @@
+<master>
+<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@title;noquote@</property>
+<formtemplate id="get_action"></formtemplate>
\ No newline at end of file
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-select.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,94 @@
+ad_page_contract {
+     
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date 2005-01-07
+    
+    This page allows to relate an action to the check.    
+} {
+    assessment_id:integer
+    inter_item_check_id:integer
+    section_id:integer
+    check_id:optional
+    edit_check:optional
+}
+
+as::assessment::data -assessment_id $assessment_id
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    ad_script_abort
+}
+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"] "Action Select"]
+
+set title "Action Select"
+set options [list [list "Immediately" "i"] [list "At the end of this assessment" "aa"] [list "Manually" "m"]]
+set actions_list [db_list_of_lists get_actions {} ]
+set return_url ""
+
+if {[info exists edit_check]} {
+    set return_url "&check_id=$check_id&edit_check=t"
+  
+} 
+ad_form -name get_action -export {edit_p action_perform_value action_value return_url} -form {
+    check_id:key
+    {inter_item_check_id:text(hidden)
+	{value $inter_item_check_id}}
+    
+    {assessment_id:text(hidden)
+	{value $assessment_id}}
+    {section_id:text(hidden)
+	{value $section_id}}
+    {action_id:text(select)
+	{label "Choose the action to perform"}
+	{options $actions_list}
+	{help_text "The action that will be executed."}
+	{$action_value}
+    }
+	{action_perform:text(select)
+	    {label "When this will be executed"}
+	    {options $options}
+	    {help_text "When this action will be executed (ie. At the end of this section)"}
+	    {$action_perform_value}
+	}
+    {user_message:text(textarea),optional
+	{label "Message"}
+	{html {cols 50} {rows 15}}
+	{help_text "Message to display to the user when the action is executed (ie. You have joined \"My Community\")"}
+	{$user_message}
+    }
+    
+} -new_data {
+    set order [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform]
+    db_dml select_action {}
+    
+} -edit_request {
+    db_0or1row get_values {}
+} -edit_data {
+    if {$edit_p > 0} {
+	set action_p [ db_string get_action_p {}]
+	if {$action_p == "t"} {
+	    set perform [db_string action_perform {}]
+	    if { $perform==$action_perform} {
+		db_dml edit_action {}
+
+	    } else {
+		    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 {
+	    set order [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform]
+	    db_dml select_action {}
+	}
+    } 
+    
+    
+} -on_submit {
+    ns_log notice "----------------------- $action_perform"
+    set url "action-params?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&action_id=$action_id&section_id=$section_id"
+    ad_returnredirect "${url}$return_url"
+}
\ No newline at end of file
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-select.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,91 @@
+ad_page_contract {
+     
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date 2005-01-07
+    
+    This page allows to relate an action to the check.    
+} {
+    assessment_id:integer
+    inter_item_check_id:integer
+    section_id:integer
+    check_id:optional
+    edit_check:optional
+}
+
+as::assessment::data -assessment_id $assessment_id
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    ad_script_abort
+}
+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"] "Action Select"]
+
+set title "Action Select"
+set options [list [list "Immediately" "i"] [list "At the end of this assessment" "aa"] [list "Manually" "m"]]
+set actions_list [db_list_of_lists get_actions {} ]
+set return_url ""
+
+if {[info exists edit_check]} {
+    set return_url "&check_id=$check_id&edit_check=t"
+  
+} 
+ad_form -name get_action -export {edit_p action_perfom_value action_value return_url} -form {
+    check_id:key
+    {inter_item_check_id:text(hidden)
+	{value $inter_item_check_id}}
+    
+    {assessment_id:text(hidden)
+	{value $assessment_id}}
+    {section_id:text(hidden)
+	{value $section_id}}
+    {action_id:text(select)
+	{label "Choose the action to perform"}
+	{options $actions_list}
+	{help_text "The action that will be executed."}
+	{$action_value}
+    }
+	{action_perform:text(select)
+	    {label "When this will be executed"}
+	    {options $options}
+	    {help_text "When this action will be executed (ie. At the end of this section)"}
+	    {$action_perform_value}
+	}
+    {user_message:text(textarea),optional
+	{label "Message"}
+	{html {cols 50} {rows 15}}
+	{help_text "Message to display to the user when the action is executed (ie. You have joined \"My Community\")"}
+	{$user_message}
+    }
+    
+} -new_data {
+    set order [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform]
+    db_dml select_action {}
+    
+} -edit_request {
+    db_0or1row get_values {}
+} -edit_data {
+    if {$edit_p > 0} {
+	set action_p [ db_string get_action_p {}]
+	if {$action_p == "t"} {
+	    set perform [db_string action_perform {}]
+	    if { $perform==$action_perform} {
+		db_dml edit_action {}
+	    } else {
+		#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 {
+	    set order [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform]
+	    db_dml select_action {}
+	}
+    } 
+    
+    
+} -on_submit {
+    set url "action-params?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&action_id=$action_id&section_id=$section_id"
+    ad_returnredirect "${url}$return_url"
+}
\ No newline at end of file
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/action-select.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_actions">
+<querytext>
+	select name, action_id from as_actions
+</querytext>
+</fullquery>
+
+<fullquery name="get_max_order">
+<querytext>
+	select max(am.order_by) from as_action_map am,as_inter_item_checks c
+	where c.inter_item_check_id=am.inter_item_check_id and
+	c.section_id_from = :section_id and am.action_perform=:action_perform
+</querytext>
+</fullquery>
+
+<fullquery name="select_action">
+<querytext>
+	insert into as_action_map
+	(inter_item_check_id,action_id,order_by,user_message,action_perform)
+	values (:inter_item_check_id,:action_id,:order,:user_message,:action_perform)
+</querytext>
+</fullquery>
+
+<fullquery name="exist_check">
+<querytext>
+	select count(inter_item_check_id) from as_action_map where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+<fullquery name="get_values">
+<querytext>
+	select * from as_action_map where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+<fullquery name="get_action_p">
+<querytext>
+	select action_p from as_inter_item_checks  where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+<fullquery name="action_perform">
+<querytext>
+	select action_perform from as_action_map   where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+<fullquery name="edit_action">
+<querytext>
+	update as_action_map set action_perform=:action_perform, action_id=:action_id, user_message=:user_message where inter_item_check_id=:inter_item_check_id
+</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>
+
+</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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check-oracle.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="new_check">
+<querytext>
+     declare begin
+        :1 := as_inter_item_check.new (
+		inter_item_check_id	=>     	:inter_item_check_id,
+		name			=> 	:name,
+		action_p		=>	:action_p,
+		section_id_from 	=>	:section_id_from,
+		section_id_to		=>	:section_id_to,
+		check_sql		=>	:check_sql,
+		description		=>	:description,
+		postcheck_p		=>	:postcheck_p,
+		item_id			=>	null,
+		creation_user		=>	:user_id,
+		context_id		=>	null,
+		object_type		=>	'as_inter_item_checks',
+		creation_date		=>	:date
+		);
+	end;
+
+</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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check-oracle.xql~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<queryset>
+
+<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)	
+</querytext>
+</fullquery>
+
+
+</queryset>
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check-postgresql.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<queryset>
+
+<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)	
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/add-edit-check.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/add-edit-check.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+<property name="title">@title@ Triggers</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<formtemplate id="new_check"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/add-edit-check.adp~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/add-edit-check.adp~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check.adp~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+<property name="title">@title@ Checks</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<formtemplate id="new_check"></formtemplate>
\ No newline at end of file
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,115 @@
+ad_page_contract {
+        
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date 2005-01-07
+    This page allows to add branches or actions to the question and its choices.    
+
+} {
+    assessment_id:integer
+    as_item_id:integer,optional
+    section_id:integer,optional
+    inter_item_check_id:optional
+    edit_check:optional
+    type:optional
+}
+
+set item_id ""
+set section_id_from ""
+set return_url ""
+as::assessment::data -assessment_id $assessment_id
+
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    ad_script_abort
+}
+
+set title $assessment_data(title)
+set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title Triggers"]
+
+if {![exists_and_not_null as_item_id] } {
+    set condition_sql [db_string get_item_id {}] 
+    #parse condition_sql to get item_id
+    set cond_list  [split $condition_sql "="]
+    set item_id [lindex [split [lindex $cond_list 2] " "] 0]
+    
+} else {
+    set item_id $as_item_id
+}
+
+if {[exists_and_not_null section_id]} {
+    set section_id_from $section_id
+}
+
+set as_item_id $item_id
+
+set as_item_type_id [db_string item_type_id {}]
+set choices [db_list_of_lists get_choices {} ] 
+set question_text [db_string get_question {}]
+
+if {[exists_and_not_null edit_check]} {
+    if { ![exists_and_not_null type]} {
+    set return_url "&check_id=$inter_item_check_id&edit_check=t"
+    } 
+   
+}
+ad_form -name new_check -export {assessment_id return_url} -form {
+    
+    inter_item_check_id:key
+    
+    {as_item_id:integer(hidden)
+	{value $as_item_id}
+	
+    }
+    {section_id_from:integer(hidden)
+	{value $section_id_from}
+    } 
+    {name:text(text)
+	{label "Name"}
+	{help_text "The name of the trigger."}
+    }
+    {postcheck_p:boolean(radio)
+	{label "Post Check"}
+	{options { {Yes t} {No f}}}
+    }
+    {description:text(textarea)
+	{label "Description"}
+	{html {cols 40} {rows 20}}
+	{help_text "Description of the trigger.(ie. What action will perform?)"}
+    }
+    {action_p:boolean(radio)
+	{label "Type"}
+	{options [as::assessment::check::get_types]}
+	{help_text "Type of the trigger"}
+    }
+    {condition:text(radio)
+	{label "Condition"}
+	{options $choices}
+	{after_html $question_text}
+	{help_text "The condition to branch or execute the action"}
+    }
+    
+} -new_data {
+    set user_id [ad_conn user_id]
+    set check_sql [as::assessment::check::get_sql -condition $condition -item_id $item_id]
+#   set check_sql "check_sql"
+    db_transaction {
+	set date [db_string get_date {select sysdate from dual}]
+	db_exec_plsql new_check {}
+    } 
+    
+} -edit_request {
+    db_1row get_check_properties {}
+    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 [lindex [split [lindex $cond_list 1] " "] 0]
+
+} -edit_data {
+    set check_sql [as::assessment::check::get_sql -condition $condition -item_id $item_id]
+    db_dml update_check {}
+} -after_submit {
+    set url [as::assessment::check::add_check_return_url $action_p]
+    ad_returnredirect "${url}?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&section_id=$section_id_from$return_url"
+
+}
\ No newline at end of file
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,114 @@
+ad_page_contract {
+        
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date 2005-01-07
+    This page allows to add branches or actions to the question and its choices.    
+
+} {
+    assessment_id:integer
+    as_item_id:integer,optional
+    section_id:integer,optional
+    inter_item_check_id:optional
+    edit_check:optional
+    type:optional
+}
+
+set item_id ""
+set section_id_from ""
+set return_url ""
+as::assessment::data -assessment_id $assessment_id
+
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    ad_script_abort
+}
+
+set title $assessment_data(title)
+set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title Triggers"]
+
+if {![exists_and_not_null as_item_id] } {
+    set condition_sql [db_string get_item_id {}] 
+    #parse condition_sql to get item_id
+    set cond_list  [split $condition_sql "="]
+    set item_id [lindex [split [lindex $cond_list 2] " "] 0]
+    
+} else {
+    set item_id $as_item_id
+}
+
+if {[exists_and_not_null section_id]} {
+    set section_id_from $section_id
+}
+
+set as_item_id $item_id
+
+set as_item_type_id [db_string item_type_id {}]
+set choices [db_list_of_lists get_choices {} ] 
+set question_text [db_string get_question {}]
+
+if {[exists_and_not_null edit_check]} {
+    if { ![exists_and_not_null type]} {
+    set return_url "&check_id=$inter_item_check_id&edit_check=t"
+    } 
+   
+}
+ad_form -name new_check -export {assessment_id return_url} -form {
+    
+    inter_item_check_id:key
+    
+    {as_item_id:integer(hidden)
+	{value $as_item_id}
+	
+    }
+    {section_id_from:integer(hidden)
+	{value $section_id_from}
+    } 
+    {name:text(text)
+	{label "Name"}
+	{help_text "The name of the trigger."}
+    }
+    {postcheck_p:boolean(radio)
+	{label "Post Check"}
+	{options { {Yes t} {No f}}}
+    }
+    {description:text(textarea)
+	{label "Description"}
+	{html {cols 40} {rows 20}}
+	{help_text "Description of the trigger.(ie. What action will perform?)"}
+    }
+    {action_p:boolean(radio)
+	{label "Type"}
+	{options [as::assessment::check::get_types]}
+	{help_text "Type of the trigger"}
+    }
+    {condition:text(radio)
+	{label "Condition"}
+	{options $choices}
+	{after_html $question_text}
+	{help_text "The condition to branch or execute the action"}
+    }
+    
+} -new_data {
+    set user_id [ad_conn user_id]
+    set check_sql [as::assessment::check::get_sql -condition $condition -item_id $item_id]
+#   set check_sql "check_sql"
+    db_transaction {
+	db_exec_plsql new_check {}
+    } 
+    
+} -edit_request {
+    db_1row get_check_properties {}
+    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 [lindex [split [lindex $cond_list 1] " "] 0]
+
+} -edit_data {
+    set check_sql [as::assessment::check::get_sql -condition $condition -item_id $item_id]
+    db_dml update_check {}
+} -after_submit {
+    set url [as::assessment::check::add_check_return_url $action_p]
+    ad_returnredirect "${url}?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&section_id=$section_id_from$return_url"
+
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/add-edit-check.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/add-edit-check.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/add-edit-check.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="item_type_data">
+<querytext>
+
+    select c.title, t.increasing_p, t.allow_negative_p, t.num_correct_answers, t.num_answers,
+           max(t.as_item_type_id) as as_item_type_id
+    from as_item_type_mc t, cr_revisions c, as_item_rels r
+    where t.as_item_type_id = r.target_rev_id
+    and r.item_rev_id = :as_item_id
+    and r.rel_type = 'as_item_type_rel'
+    and c.revision_id = t.as_item_type_id
+    group by c.title, t.increasing_p, t.allow_negative_p,
+           t.num_correct_answers, t.num_answers
+</querytext>
+</fullquery>
+
+<fullquery name="item_type_id">
+<querytext>
+
+    select max(t.as_item_type_id) as as_item_type_id
+    from as_item_type_mc t, cr_revisions c, as_item_rels r
+    where t.as_item_type_id = r.target_rev_id
+    and r.item_rev_id = :as_item_id
+    and r.rel_type = 'as_item_type_rel'
+    and c.revision_id = t.as_item_type_id
+    group by c.title, t.increasing_p, t.allow_negative_p,
+    t.num_correct_answers, t.num_answers
+</querytext>
+</fullquery>
+
+<fullquery name="get_choices">
+      <querytext>
+
+    select r.title,c.choice_id 
+    from as_item_choices c, cr_revisions r
+    where r.revision_id = c.choice_id
+    and c.mc_id = :as_item_type_id
+    order by c.sort_order
+
+      </querytext>
+</fullquery>
+
+<fullquery name="get_question">
+<querytext>
+   select title 
+   from cr_revisions 
+   where revision_id = :as_item_id
+</querytext>
+</fullquery>
+
+<fullquery name="get_check_properties">
+<querytext>
+	select * from as_inter_item_checks where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+<fullquery name="update_check">
+<querytext>
+	update as_inter_item_checks set name=:name,section_id_from=:section_id_from,action_p=:action_p,postcheck_p=:postcheck_p,check_sql=:check_sql where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+<fullquery name="get_item_id">
+<querytext>
+	select check_sql from as_inter_item_checks where inter_item_check_id = :inter_item_check_id
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-master.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/admin-master.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,39 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+<master>
+  <property name="link_all">1</property>
+  <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
+  <if @context@ not nil><property name="context">@context;noquote@</property></if>
+    <else><if @context_bar@ not nil><property name="context">@context_bar;noquote@</property></if></else>
+  <if @doc_type@ not nil><property
+  name="doc_type">@doc_type;noquote@</property></if>
+  <if @title@ not nil><property name="title">@title;noquote@</property></if>
+  <property name="header_stuff">
+<style type="text/css">
+/* Re-enable the breadcrumb bar -- useful for site-wide admins */
+#breadcrumbs {
+  display: inline;
+}
+</style>
+  </property>
+
+<slave>
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/admin-request.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,52 @@
+<master src="admin-master">
+<property name="title">Waiting List</property>
+
+
+<script language="JavaScript">
+
+function get_interval() {
+        interval=document.interval.date.value; 
+        destination = "admin-request?assessment=@d_assessment@&state=@d_state@&interval="+interval;
+        if (destination) location.href = destination;
+      
+}
+
+function get_assessment() {
+        assessment=document.assessments.assessment.value; 
+        destination = "admin-request?interval=@d_interval@&date=@d_date@&state=@d_state@&assessment="+assessment;
+        if (destination) location.href = destination;
+      
+}
+
+function get_state() {
+        state=document.assessments.state.value; 
+        destination = "admin-request?interval=@d_interval@&date=@d_date@&assessment=@d_assessment@&state="+state;
+        if (destination) location.href = destination;
+      
+}
+
+function get_specific_date() {
+        date=document.specific_date.specific_date.value; 
+        destination = "admin-request?state=@d_state@&assessment=@d_assessment@&date="+date;
+        if (destination) location.href = destination;
+      
+}
+
+</script>
+      <table bgcolor="#cccccc" cellpadding="5" width="95%">
+	<tr bgcolor="#eeeeee">
+       	  <th align="left" width="50%">
+           <formtemplate id="assessments"></formtemplate>
+          </th>
+          <th>
+           <formtemplate id="interval"></formtemplate>
+           <formtemplate id="specific_date"></formtemplate>
+          </th>
+        </tr>
+      </table>
+      
+<listtemplate name="actions_log"></listtemplate>
+<br>
+
+
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/admin-request.adp~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,44 @@
+<master src="admin-master">
+<property name="title">Waiting List</property>
+<script language="JavaScript">
+
+function get_interval() {
+        interval=document.interval.date.value; 
+        destination = "admin-request?assessment=@d_assessment@&date=@&state=@d_state@&interval="+interval;
+        if (destination) location.href = destination;
+      
+}
+
+function get_assessment() {
+        assessment=document.assessments.assessment_id.value; 
+        destination = "admin-request?interval=@d_interval@&date=@d_date@&state=@d_state@&assessment="+assessment;
+        if (destination) location.href = destination;
+      
+}
+
+function get_state() {
+        state=document.assessments.approved_p.value; 
+        destination = "admin-request?interval=@d_interval@&date=@d_date@&assessment=@d_assessment@&state="+state;
+        if (destination) location.href = destination;
+      
+}
+
+
+</script>
+      <table bgcolor="#cccccc" cellpadding="5" width="95%">
+	<tr bgcolor="#eeeeee">
+       	  <th align="left" width="50%">
+           <formtemplate id="assessments"></formtemplate>
+          </th>
+          <th>
+           <formtemplate id="interval"></formtemplate>
+           <formtemplate id="specific_date"></formtemplate>
+          </th>
+        </tr>
+      </table>
+      
+<listtemplate name="actions_log"></listtemplate>
+<br>
+
+
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/admin-request.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,156 @@
+ad_page_contract {
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @creation_date 2005-01-17
+    
+} {
+    {assessment:optional}
+    {interval:optional}
+    {date:optional}
+    {state:optional}
+    
+} -properties {
+    context
+}
+
+# shows not approved requests as default
+
+
+# set options
+set approved_options [as::assessment::check::state_options]
+set assessment_list [as::assessment::check::get_assessments]
+set intervals [as::assessment::check::intervals]
+
+
+# set default values
+
+set d_state "f"
+set d_assessment [lindex [lindex $assessment_list 0] 1]
+set d_interval [lindex [lindex $intervals 0] 1]
+set d_date ""
+set date_query ""
+set interval_query ""
+set assessment_query ""
+set state_query ""
+
+if {[exists_and_not_null assessment] && $assessment!="all"} {
+    set d_assessment $assessment
+    set new_assessment_revision [db_string get_assessment_id {}]
+    
+    set assessment_query "and c.section_id_from in (select s.section_id from as_sections s, cr_revisions cr, cr_items ci, as_assessment_section_map asm  where ci.item_id = cr.item_id  and cr.revision_id = s.section_id and s.section_id = asm.section_id and asm.assessment_id = :new_assessment_revision)"
+} 
+
+if {[exists_and_not_null state]} {
+    set d_state $state 
+} 
+if {[exists_and_not_null interval] && $interval!="all"} {
+    set d_interval $interval
+    set interval_query "and to_date(al.date_requested,'YYYY-MM-DD') >= to_date('$interval','YYYY-MM-DD') and to_date(al.date_requested,'YYYY-MM-DD') <=to_date(now(),'YYYY-MM-DD') "
+    set date_query ""
+}
+
+if {[exists_and_not_null date]} {
+    set d_date $date
+    set date_query "and to_date(al.date_requested,'YYYY-MM-DD') = to_date('$date','YYYY-MM-DD')"
+    set interval_query ""
+}
+
+if { $d_state == "ae"} {
+    set state_query "and al.failed_p='f' and al.approved_p='t'"
+} else {
+    set state_query "and al.failed_p='t'and al.approved_p=:d_state"
+}
+
+ad_form -name assessments -form {
+    {assessment:text(select)
+	{label "Assessment"}
+	{options $assessment_list}
+	{html { onChange "get_assessment()"}}
+	{value $d_assessment}
+    }
+    
+    {state:text(select)
+	{label ""}
+	{options $approved_options}
+	{html { onChange "get_state()"}}
+	{value $d_state}
+    }
+    
+} -has_submit 1
+
+
+ad_form -name interval  -form {
+    {date:text(select)
+	{label "Date request since ..."}
+	{options $intervals}
+	{value $d_interval}
+	{html { onChange "get_interval()"}}
+    }
+} -has_submit 1
+
+
+ad_form -name  specific_date  -form {
+    {assessment:text(hidden)
+	{value $d_assessment}
+    }
+    
+    {state:text(hidden)
+    	{value $d_state}
+    }
+    
+    {specific_date:text(text)
+	{label "" }
+	{html {id sel2}}
+	{after_html {<input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');"><b>YYYY-MM-DD</b>}}
+	{value $d_date}
+    }
+    
+    {submit:text(submit)
+	{label "Specific Date"}
+    }
+} -on_submit {
+    ad_returnredirect "admin-request?state=$state&assessment=$assessment&date=$specific_date"
+}
+
+
+set query "select al.failed_p,c.inter_item_check_id,c.name,al.action_log_id,a.name as action_name,a.action_id,(select p.first_names || ' ' || p.last_name as name from persons p where p.person_id = (select subject_id from as_sessions where session_id=al.session_id))as user_name,al.session_id,c.description,al.date_requested from as_actions a, as_actions_log al, as_inter_item_checks c where al.inter_item_check_id=c.inter_item_check_id $assessment_query and c.action_p='t' $state_query  and a.action_id=al.action_id $interval_query $date_query"
+
+db_multirow actions_log actions_log $query
+template::list::create \
+    -name actions_log \
+    -multirow actions_log \
+    -key action_log_id\
+    -bulk_actions {
+	"Approve" "approve-check" "Approve Actions"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	action_log_id
+    }\
+    -row_pretty_plural "actions log" \
+    -elements {
+	inter_item_check_id {
+	    label "Trigger"
+	    display_col name
+	    
+	}
+	action_id {
+	    label "Action"
+	    display_col action_name
+	}
+	description {
+	    label "Description"
+	}
+	
+	user_name {
+	    label "User"
+	}
+	date_requested {
+	    label "Date"
+	}
+	failed_p {
+	    label "Performed"
+	}
+
+	
+    }
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/admin-request.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,156 @@
+ad_page_contract {
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @creation_date 2005-01-17
+    
+} {
+    {assessment:optional}
+    {interval:optional}
+    {date:optional}
+    {state:optional}
+    
+} -properties {
+    context
+}
+
+# shows not approved requests as default
+
+
+# set options
+set approved_options [as::assessment::check::state_options]
+set assessment_list [as::assessment::check::get_assessments]
+set intervals [as::assessment::check::intervals]
+
+
+# set default values
+
+set d_state "f"
+set d_assessment [lindex [lindex $assessment_list 0] 1]
+set d_interval [lindex [lindex $intervals 0] 1]
+set d_date ""
+set date_query ""
+set interval_query ""
+set assessment_query ""
+set state_query ""
+
+if {[exists_and_not_null assessment] && $assessment!="all"} {
+    set d_assessment $assessment
+    set new_assessment_revision [db_string get_assessment_id {}]
+    
+    set assessment_query "and c.section_id_from in (select s.section_id from as_sections s, cr_revisions cr, cr_items ci, as_assessment_section_map asm  where ci.item_id = cr.item_id  and cr.revision_id = s.section_id and s.section_id = asm.section_id and asm.assessment_id = :new_assessment_revision)"
+} 
+
+if {[exists_and_not_null state]} {
+    set d_state $state 
+} 
+if {[exists_and_not_null interval] && $interval!="all"} {
+    set d_interval $interval
+    set interval_query "and to_date(al.date_requested,'YYYY-MM-DD') >= to_date('$interval','YYYY-MM-DD') and to_date(al.date_requested,'YYYY-MM-DD') <=to_date(now(),'YYYY-MM-DD') "
+    set date_query ""
+}
+
+if {[exists_and_not_null date]} {
+    set d_date $date
+    set date_query "and to_date(al.date_requested,'YYYY-MM-DD') = to_date('$date','YYYY-MM-DD')"
+    set interval_query ""
+}
+
+if { $d_state == "ae"} {
+    set state_query "and al.failed_p='t' and al.approved_p='t'"
+} else {
+    set state_query "and al.approved_p=:d_state"
+}
+
+ad_form -name assessments -form {
+    {assessment:text(select)
+	{label "Assessment"}
+	{options $assessment_list}
+	{html { onChange "get_assessment()"}}
+	{value $d_assessment}
+    }
+    
+    {state:text(select)
+	{label ""}
+	{options $approved_options}
+	{html { onChange "get_state()"}}
+	{value $d_state}
+    }
+    
+} -has_submit 1
+
+
+ad_form -name interval  -form {
+    {date:text(select)
+	{label "Date request since ..."}
+	{options $intervals}
+	{value $d_interval}
+	{html { onChange "get_interval()"}}
+    }
+} -has_submit 1
+
+
+ad_form -name  specific_date  -form {
+    {assessment:text(hidden)
+	{value $d_assessment}
+    }
+    
+    {state:text(hidden)
+    	{value $d_state}
+    }
+    
+    {specific_date:text(text)
+	{label "" }
+	{html {id sel2}}
+	{after_html {<input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');"><b>YYYY-MM-DD</b>}}
+	{value $d_date}
+    }
+    
+    {submit:text(submit)
+	{label "Specific Date"}
+    }
+} -on_submit {
+    ad_returnredirect "admin-request?state=$state&assessment=$assessment&date=$specific_date"
+}
+
+
+set query "select al.failed_p,c.inter_item_check_id,c.name,al.action_log_id,a.name as action_name,a.action_id,(select p.first_names || ' ' || p.last_name as name from persons p where p.person_id = (select subject_id from as_sessions where session_id=al.session_id))as user_name,al.session_id,c.description,al.date_requested from as_actions a, as_actions_log al, as_inter_item_checks c where al.inter_item_check_id=c.inter_item_check_id $assessment_query and c.action_p='t' $state_query  and a.action_id=al.action_id $interval_query $date_query"
+
+db_multirow actions_log actions_log $query
+template::list::create \
+    -name actions_log \
+    -multirow actions_log \
+    -key action_log_id\
+    -bulk_actions {
+	"Approve" "approve-check" "Approve Actions"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	action_log_id
+    }\
+    -row_pretty_plural "actions log" \
+    -elements {
+	inter_item_check_id {
+	    label "Trigger"
+	    display_col name
+	    
+	}
+	action_id {
+	    label "Action"
+	    display_col action_name
+	}
+	description {
+	    label "Description"
+	}
+	
+	user_name {
+	    label "User"
+	}
+	date_requested {
+	    label "Date"
+	}
+	failed_p {
+	    label "Performed"
+	}
+
+	
+    }
+
Index: openacs-4/packages/assessment/www/admin/admin-request.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/admin-request.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_assessment_id">
+<querytext>
+	select max(revision_id) from cr_revisions where item_id=:d_assessment
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/admin-request.xql~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request.xql~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/admin-request.xql~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_sections">
+<querytext>
+    select cr.title,s.section_id
+    from as_sections s, cr_revisions cr, cr_items ci, as_assessment_section_map asm
+    where ci.item_id = cr.item_id
+    and cr.revision_id = s.section_id
+    and s.section_id = asm.section_id and s.section_id <> :section_id and
+    asm.sort_order > (select sort_order from as_assessment_section_map where
+    assessment_id = :new_assessment_revision and section_id = :section_id)
+    and asm.assessment_id = :new_assessment_revision 
+    order by asm.sort_order
+
+</querytext>
+</fullquery>
+
+<fullquery name="update_check">
+<querytext>
+	update as_inter_item_checks set section_id_to =:section_id_to where
+	inter_item_check_id = :inter_item_check_id
+</querytext>
+</fullquery>
+
+<fullquery name="get_section">
+<querytext>
+	select section_id_to from as_inter_item_checks where inter_item_check_id=:inter_item_check_id
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/approve-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/approve-check.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/approve-check.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,19 @@
+ad_page_contract {
+    This page deletes checks
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks
+    @date 2005-01-17
+} {
+    action_log_id:multiple
+  }
+
+set count [llength $action_log_id]
+
+for { set i 0} { $i< $count } {incr i} {
+    set log_id [lindex $action_log_id $i]
+    set inter_item_check_id [db_string  get_check_id {select inter_item_check_id from as_actions_log where action_log_id=:log_id}]
+    set session_id [db_string  get_session_id {select session_id from as_actions_log where action_log_id=:log_id}]
+    
+
+    as::assessment::check::manual_action_exec -inter_item_check_id $inter_item_check_id -session_id $session_id -action_log_id $log_id
+}
+ad_returnredirect "admin-request"
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/approve-check.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/approve-check.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/approve-check.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,16 @@
+ad_page_contract {
+    This page deletes checks
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks
+    @date 2005-01-17
+} {
+    action_log_id:multiple
+  }
+
+set count [llength $action_log_id]
+
+for { set i 0} { $i< $count } {incr i} {
+    set log_id [lindex $action_log_id $i]
+    set action_info  [db_1row  get_check_id {select inter_item_check_id from as_actions_log where action_log_id=:log_id}]
+    set as::assessment::check::action_exec -inter_item_check_id $inter_item_check_id -session_id $session_id
+}
+ad_returnredirect "admin-request"
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+<property name="title">#assessment.action_admin#</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+<listtemplate name="actions"></listtemplate><br>
+<a href=asm-action-new> Add new Action </a>
+</blockquote>
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,39 @@
+ad_page_contract {
+    This page admin the new actions to be used on the checks
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+   
+}
+set context_bar [ ad_context_bar Actions]
+
+#See the params we already have
+template::list::create \
+    -name actions \
+    -elements {
+	name {
+	    label "Name"
+	}	    
+	description {
+	    label "Description"
+	}
+	edit_url {
+	    label {[_ assessment.action_edit]}
+	    display_template {
+
+		<a href=asm-action-new?action_id=@actions.action_id@>Edit</a>
+		| <a href=asm-action-delete?action_id=@actions.action_id@>Delete</a>
+	    }
+	}
+    }
+
+
+
+db_multirow -extend { edit_url } actions action_select {}
+
+
+ 
+
+
+
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-admin.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,38 @@
+ad_page_contract {
+    This page admin the new actions to be used on the checks
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+   
+}
+set context_bar [ ad_context_bar Actions]
+
+#See the params we already have
+template::list::create \
+    -name actions \
+    -elements {
+	name {
+	    label "Name"
+	}	    
+	description {
+	    label "Description"
+	}
+	edit_url {
+	    label {[_ assessment.action_edit]}
+	    display_template {
+
+		<a href=asm-action-new?action_id=@actions.action_id@>Edit</a>
+	    }
+	}
+    }
+
+
+
+db_multirow -extend { edit_url } actions action_select {}
+
+
+ 
+
+
+
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-admin.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_action_info">
+<querytext>
+	select name,description,tcl_code 
+	from as_actions
+	where action_id = :action_id
+
+</querytext>
+</fullquery>
+
+<fullquery name="insert_action">
+<querytext>
+	insert into as_actions (action_id,name,description,tcl_code) 
+			 values(:action_id,:name,:description,:tcl_code)
+
+</querytext>
+</fullquery>
+
+<fullquery name="action_select">
+<querytext>
+    select action_id, name,description from as_actions
+
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/asm-action-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-delete.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-delete.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+<property name="title">Action Delete</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+  <formtemplate id="action_delete"></formtemplate>
+</blockquote>
Index: openacs-4/packages/assessment/www/admin/asm-action-delete.adp~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-delete.adp~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-delete.adp~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+<property name="title">Action Delete</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+  <formtemplate id="parameter_delete"></formtemplate>
+</blockquote>
Index: openacs-4/packages/assessment/www/admin/asm-action-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-delete.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-delete.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,32 @@
+ad_page_contract {
+    This page delete the action
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+    action_id:integer
+}
+
+set page_title [_ assessment.delete]
+set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ]  $page_title]
+db_1row select_action_info {select name,description,tcl_code 
+	from as_actions
+    where action_id = :action_id}
+ad_form -name action_delete -form {
+    {action_id:text(hidden) {value $action_id} }
+    {name:text(inform) {label "[_ assessment.action_name]"} {value $name} }
+    {description:text(inform) {label "[_ assessment.action_description]"} {value $description}}
+    {tcl_code:text(inform) {label "[_ assessment.action_tcl_code]"} {value $tcl_code}}
+    {submit:text(submit) {label "delete"}}
+    {back:text(submit) {label "back"}}
+}  -on_submit {
+    if { $back == "back" } {
+	ad_returnredirect "asm-action-admin"
+    } else {
+	as::actionparam::actiondelete $action_id
+	ad_returnredirect "asm-action-admin"	
+
+
+    }
+
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/asm-action-delete.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-delete.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-delete.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,32 @@
+ad_page_contract {
+    This page delete the action
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+    action_id:integer
+}
+
+set page_title [_ assessment.delete]
+set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ]  $page_title]
+db_1row select_action_info {select name,description,tcl_code 
+	from as_actions
+    where action_id = :action_id}
+ad_form -name action_delete -form {
+    {action_id:text(hidden) {value $action_id} }
+    {name:text(inform) {label "[_ assessment.action_name]"} {value $name} }
+    {description:text(inform) {label "[_ assessment.action_description]"} {value $description}}
+    {tcl_code:text(inform) {label "[_ assessment.action_tcl_code]"} {value $tcl_code}}
+    {submit:text(submit) {label "delete"}}
+    {back:text(submit) {label "back"}}
+}  -on_submit {
+    if { $back == "back" } {
+	ad_returnredirect "asm-action-admin"
+    } else {
+	as::assessment::ap::adelete $action_id
+	ad_returnredirect "asm-action-admin"	
+
+
+    }
+
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/asm-action-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-new.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,12 @@
+<master>
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+  <formtemplate id="action_admin"></formtemplate>
+
+<if @parameter_exist@ eq "y">
+	<include src=asm-action-param-list action_id=@action_id@>
+</if>
+</blockquote>
+
Index: openacs-4/packages/assessment/www/admin/asm-action-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-new.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,54 @@
+ad_page_contract {
+    This page admin the new actions to be used on the checks
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+    action_id:optional
+}
+
+if { ![ad_form_new_p -key action_id] } {
+    set page_title [_ assessment.Edit_Assessment]
+      set parameter_exist "y"
+    db_0or1row get_action_info {}
+} else {
+    set page_title [_ assessment.New_Assessment2]
+       set parameter_exist "n"
+}
+
+set page_title "Add new Action"
+set context_bar [ad_context_bar [list [export_vars -base asm-action-admin ] [_ assessment.action_admin]] $page_title]
+
+ad_form -name action_admin -form {
+    action_id:key
+    {name:text {label "[_ assessment.action_name]"} 
+	{html {size 30 maxlength 40}} 
+	{help_text "[_ assessment.as_action_help]"}
+    }
+    {description:text(textarea) {label "[_ assessment.action_description]"} 
+	{html {rows 5 cols 80}}
+	{help_text "[_ assessment.as_action_description_help]"}
+	}
+    {tcl_code:text(textarea) {label "[_ assessment.action_tcl_code]"}
+	{html {rows 5 cols 80}}
+        {help_text "[_ assessment.as_action_tcl_code_help]"}
+    }
+
+} -validate {
+    {tcl_code {![empty_string_p $tcl_code]} "[_ assessment.error_enter_tcl_code]"}
+
+} -select_query {
+    	select name,description,tcl_code 
+	from as_actions
+	where action_id = :action_id
+
+} -new_data {
+    db_dml insert_action {}
+} -edit_data {
+    db_dml edit_action {}
+} -on_submit {
+  ad_returnredirect "asm-action-new?action_id=$action_id"
+}
+
+
+
Index: openacs-4/packages/assessment/www/admin/asm-action-new.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-new.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_action_info">
+<querytext>
+	select name,description,tcl_code 
+	from as_actions
+	where action_id = :action_id
+
+</querytext>
+</fullquery>
+
+<fullquery name="insert_action">
+<querytext>
+	insert into as_actions (action_id,name,description,tcl_code) 
+			 values(:action_id,:name,:description,:tcl_code)
+
+</querytext>
+</fullquery>
+
+<fullquery name="edit_action">
+<querytext>
+	update as_actions set
+	name=:name,description=:description,tcl_code=:tcl_code
+	where action_id = :action_id
+	
+
+</querytext>
+</fullquery>
+
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,12 @@
+<master>
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+  <formtemplate id="parameter_admin"></formtemplate>
+</blockquote>
+
+
+<include src=asm-action-param-list action_id=@action_id@> &nbsp;
+
+<a href=/assessment/admin> Return </a>
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-param-admin.adp~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,12 @@
+<master>
+<property name="title">Actions Admin</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+  <formtemplate id="parameter_admin"></formtemplate>
+</blockquote>
+
+
+<include src=asm-action-param-list action_id=@action_id@> &nbsp;
+
+<a href=/assessment/admin> Return </a>
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,73 @@
+ad_page_contract {
+    This page admin the parameters that receive the tcl code defined in the action
+    @author vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+    action_id
+    parameter_id:optional
+}
+
+if { ![ad_form_new_p -key parameter_id] } {
+    set page_title [_ assessment.edit_parameter]
+    db_0or1row get_param_info {}
+} else {
+    set page_title [_ assessment.new_parameter]
+}
+
+
+set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ]  $page_title]
+
+
+set type_options [list [list "[_ assessment.query]" q] [list "[_ assessment.var ]" n]]
+
+
+ad_form -name parameter_admin -form {
+    parameter_id:key
+    {varname:text {label "[_ assessment.parameter_varname]"} 
+	{html {size 30 maxlength 40}} 
+	{help_text "[_ assessment.as_parameter_help]"}
+    }
+    {description:text(textarea) {label "[_ assessment.parameter_description]"} 
+	{html {rows 2 cols 50}}
+	{help_text "[_ assessment.as_parameter_description_help]"}
+	}
+    {type:text(select) {label "[_ assessment.parameter_type]"}
+	{options $type_options }
+        {help_text "[_ assessment.as_parameter_type_help]"}
+    }
+
+    {query:text(textarea),optional {label "[_ assessment.parameter_query]"}
+	{html {rows 5 cols 80}}
+	{help_text "[_ assessment.as_parameter_query_help]"}
+	}
+    {action_id:text(hidden) {value $action_id}}
+
+} -select_query_name {get_param_info} -new_data {
+    if { $type == "q" } {
+	set count_query_record [db_1row get_records "" ]
+	if { $count_query_record != 0 } {
+	        db_dml insert_param {}
+	} else {
+	    ad_script_abort
+	}
+    } else {
+	db_dml insert_param {}
+    }
+} -edit_data {
+
+    if { $type == "q" } {
+	set count_query_record [db_1row get_records "" ]
+	if { $count_query_record != 0 } {
+	        db_dml edit_param {}
+	} else {
+	    ad_script_abort
+	}
+    } else {
+	db_dml edit_param {}
+    }
+
+
+} -on_submit {
+    ad_returnredirect "asm-action-param-admin?action_id=$action_id"
+}
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-param-admin.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,76 @@
+ad_page_contract {
+    This page admin the parameters that receive the tcl code defined in the action
+    @author vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+    action_id
+    parameter_id:optional
+}
+
+if { ![ad_form_new_p -key parameter_id] } {
+    set page_title [_ assessment.edit_parameter]
+    db_0or1row get_param_info {}
+} else {
+    set page_title [_ assessment.new_parameter]
+}
+
+
+set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ]  $page_title]
+
+
+set type_options [list [list "[_ assessment.query]" q] [list "[_ assessment.var ]" n]]
+
+
+ad_form -name parameter_admin -form {
+    parameter_id:key
+    {varname:text {label "[_ assessment.parameter_varname]"} 
+	{html {size 30 maxlength 40}} 
+	{help_text "[_ assessment.as_parameter_help]"}
+    }
+    {description:text(textarea) {label "[_ assessment.parameter_description]"} 
+	{html {rows 2 cols 50}}
+	{help_text "[_ assessment.as_parameter_description_help]"}
+	}
+    {type:text(select) {label "[_ assessment.parameter_type]"}
+	{options $type_options }
+        {help_text "[_ assessment.as_parameter_type_help]"}
+    }
+
+    {query:text(textarea),optional {label "[_ assessment.parameter_query]"}
+	{html {rows 5 cols 80}}
+	{help_text "[_ assessment.as_parameter_query_help]"}
+	}
+    {action_id:text(hidden) {value $action_id}}
+} -select_query_name {get_param_info} -new_data {
+    if { $type == "q" } {
+	set count_query_record [db_1row get_records "" ]
+	if { $count_query_record != 0 } {
+	        db_dml insert_param {}
+	} else {
+	    ad_script_abort
+	}
+    } else {
+	db_dml insert_param {}
+    }
+} -edit_data {
+
+    if { $type == "q" } {
+	set count_query_record [db_1row get_records "" ]
+	if { $count_query_record != 0 } {
+	        db_dml edit_param {}
+	} else {
+	    ad_script_abort
+	}
+    } else {
+	db_dml edit_param {}
+    }
+
+
+} -on_submit {
+
+   
+
+
+    ad_returnredirect "asm-action-param-admin?action_id=$action_id"
+}
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_param_info">
+<querytext>
+
+	select type,varname,description,query 
+	from as_action_params 
+	where parameter_id = :parameter_id
+
+</querytext>
+</fullquery>
+
+<fullquery name="insert_param">
+<querytext>
+	insert into as_action_params (parameter_id,action_id,type,varname,description,query) 
+			 values(:parameter_id,:action_id, :type,:varname,:description,:query)
+
+
+</querytext>
+</fullquery>
+
+<fullquery name="edit_param">
+<querytext>
+	update as_action_params set
+	varname=:varname,description=:description,query=:query,type=:type
+	where parameter_id = :parameter_id
+	
+</querytext>
+</fullquery>
+
+<fullquery name="get_records">
+<querytext>
+    select count(*) from ($query) as query
+
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-param-admin.xql~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.xql~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_param_info">
+<querytext>
+
+	select type,varname,description,query 
+	from as_action_params 
+	where parameter_id = :parameter_id
+
+</querytext>
+</fullquery>
+
+<fullquery name="insert_param">
+<querytext>
+	insert into as_action_params (parameter_id,action_id,type,varname,description,query) 
+			 values(:parameter_id,:action_id, :type,:varname,:description,:query)
+
+
+</querytext>
+</fullquery>
+
+<fullquery name="edit_param">
+<querytext>
+	update as_action_params set
+	varname=:varname,description=:description,query=:query
+	where parameter_id = :parameter_id
+	
+</querytext>
+</fullquery>
+
+<fullquery name="get_records">
+<querytext>
+    select count(*) from ($query) as query
+
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+<property name="title">Param Delete</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+  <formtemplate id="parameter_delete"></formtemplate>
+</blockquote>
+
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-param-delete.adp~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.adp~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+<property name="title">Actions Admin</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<blockquote>
+  <formtemplate id="parameter_delete"></formtemplate>
+</blockquote>
+
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,33 @@
+ad_page_contract {
+    This page display the parameters that receive the actions
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+    parameter_id:integer
+    action_id:integer
+}
+
+set page_title [_ assessment.delete_parameter]
+set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ]  $page_title]
+db_1row select_param_info {select type,varname,description,query 
+	from as_action_params 
+    where parameter_id = :parameter_id}
+ad_form -name parameter_delete -form {
+    {parameter_id:text(hidden) {value $parameter_id} }
+    {action_id:text(hidden) {value $action_id} }
+    {varname:text(inform) {label "[_ assessment.parameter_varname]"} {value $varname} }
+    {description:text(inform) {label "[_ assessment.parameter_description]"} {value $description}}
+    {query:text(inform) {label "[_ assessment.parameter_query]"} {value $query}}
+    {submit:text(submit) {label "delete"}}
+    {back:text(submit) {label "back"}}
+}  -on_submit {
+    if { $back == "back" } {
+	ad_returnredirect "asm-action-new?action_id=$action_id"
+    } else {
+
+	as::actionparam::paramdelete $parameter_id
+	ad_returnredirect "asm-action-new?action_id=$action_id"
+    }
+
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-param-delete.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,32 @@
+ad_page_contract {
+    This page display the parameters that receive the actions
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+    parameter_id:integer
+    action_id:integer
+}
+
+set page_title [_ assessment.delete_parameter]
+set context_bar [ad_context_bar [list [export_vars -base asm-action-new {action_id} ] [_ assessment.action_admin] ]  $page_title]
+db_1row select_param_info {select type,varname,description,query 
+	from as_action_params 
+    where parameter_id = :parameter_id}
+ad_form -name parameter_delete -form {
+    {parameter_id:text(hidden) {value $parameter_id} }
+    {action_id:text(hidden) {value $action_id} }
+    {varname:text(inform) {label "[_ assessment.parameter_varname]"} {value $varname} }
+    {description:text(inform) {label "[_ assessment.parameter_description]"} {value $description}}
+    {query:text(inform) {label "[_ assessment.parameter_query]"} {value $query}}
+    {submit:text(submit) {label "delete"}}
+    {back:text(submit) {label "back"}}
+}  -on_submit {
+    if { $back == "back" } {
+	ad_returnredirect "asm-action-new?action_id=$action_id"
+    } else {
+	as::assessment::param::delete $parameter_id
+	ad_returnredirect "asm-action-new?action_id=$action_id"
+    }
+
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/asm-action-param-delete.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-delete.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-delete.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_param_info">
+<querytext>
+
+	select type,varname,description,query 
+	from as_action_params 
+	where parameter_id = :parameter_id
+
+</querytext>
+</fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/asm-action-param-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-list.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-list.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,2 @@
+<listtemplate name="parameter_list"></listtemplate>
+<a href= asm-action-param-admin?action_id=@action_id@> Add parameter </a>
Index: openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,38 @@
+ad_page_contract {
+    This page display the parameters that receive the actions
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+
+}
+
+
+
+template::list::create \
+    -name parameter_list \
+    -elements {
+	varname {
+	    label "Name"
+	}	    
+	description {
+	    label "Description"
+	}
+	type {
+	    label "Type"
+	}
+
+	query {
+	    label "Query"
+	}
+
+	edit_url {
+	    label {[_ assessment.action_edit]}
+	    display_template {
+		<a href=asm-action-param-admin?parameter_id=@parameter_list.parameter_id@&action_id=@parameter_list.action_id@>Edit</a> | <a href=asm-action-param-delete?parameter_id=@parameter_list.parameter_id@&action_id=@parameter_list.action_id@ >Delete</a>
+	    }
+	}
+	
+    }
+
+db_multirow parameter_list param_select {}
Index: openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/asm-action-param-list.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,38 @@
+ad_page_contract {
+    This page display the parameters that receive the actions
+    @authos vivian@viaro.net Viaro Networks (www.viaro.net)
+    @date 07-01-2005
+    @cvs-id $Id:
+} {
+
+}
+
+
+
+template::list::create \
+    -name parameter_list \
+    -elements {
+	varname {
+	    label "Name"
+	}	    
+	description {
+	    label "Description"
+	}
+	type {
+	    label "Type"
+	}
+
+	query {
+	    label "Query"
+	}
+
+	edit_url {
+	    label {[_ assessment.action_edit]}
+	    display_template {
+		<a href=asm-action-param-admin?parameter_id=@parameter_list.parameter_id@&action_id=@parameter_list.action_id@>Edit</a>
+	    }
+	}
+
+    }
+
+db_multirow parameter_list param_select {}
Index: openacs-4/packages/assessment/www/admin/asm-action-param-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-list.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/asm-action-param-list.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="param_select">
+<querytext>
+
+select parameter_id,action_id, varname,description,query,type from as_action_params where action_id=:action_id
+
+</querytext>
+</fullquery>
+</queryset>
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-admin.adp	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,17 @@
+<master>
+<property name="title">@title@ Administration</property>
+<br>
+<b>After this Assessment:</b>
+<br>
+<listtemplate name="aa_checks"></listtemplate>
+<br>
+<b>Immediately</b>
+<listtemplate name="i_checks"></listtemplate>
+<br>
+<b>Manually</b>
+<listtemplate name="m_checks"></listtemplate>
+<br>
+
+<b>Branches</b>
+<listtemplate name="branches"></listtemplate>
+<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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-admin.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,171 @@
+ad_page_contract {
+    
+    This page allows to add branches or actions to the question and its choices.    
+   
+    @author Anny Flore (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date 2005-01-07
+} {
+    assessment_id:integer
+    section_id
+}
+
+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}]
+
+
+
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    ad_script_abort
+}
+
+set title "$assessment_data(title) Triggers"
+set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title Triggers"]
+
+db_multirow aa_checks get_aa_checks {} 
+
+template::list::create \
+    -name aa_checks \
+    -multirow aa_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check t}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @aa_checks.name@
+	    }
+	}
+	action_name {
+	    label "Action To Perform"
+	}
+	counter {
+	    display_template {    
+		<if @aa_checks.order_by@ lt @aa_checks:rowcount@>
+		<a href="swap-actions?assessment_id=$assessment_id&check_id=@aa_checks.inter_item_check_id@&order_by=@aa_checks.order_by@&section_id=@aa_checks.section_id_from@&action_perform=@aa_checks.action_perform@&direction=d"><img src="../graphics/down" border="0" alt="#assessment.Move_Down#"></a>
+		</if>
+		<if @aa_checks.order_by@ gt 1>
+		<a href="swap-actions?assessment_id=$assessment_id&check_id=@aa_checks.inter_item_check_id@&order_by=@aa_checks.order_by@&section_id=@aa_checks.section_id_from@&action_perform=@aa_checks.action_perform@&direction=u"><img src="../graphics/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+		</if>
+		<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@aa_checks.inter_item_check_id@&section_id=$section_id>Notify user </a>
+		
+	    }
+	    
+	}
+    }
+
+
+db_multirow i_checks  get_i_checks {}
+template::list::create \
+    -name i_checks \
+    -multirow i_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check t}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @i_checks.name@
+	    }
+	}
+	action_name {
+	    label "Action To Perform"
+	}
+	inter_item_check_id {
+	    display_template {    
+		<if @i_checks.order_by@ lt @i_checks:rowcount@>
+		<a href="swap-actions?assessment_id=$assessment_id&check_id=@i_checks.inter_item_check_id@&order_by=@i_checks.order_by@&section_id=@i_checks.section_id_from@&action_perform=@i_checks.action_perform@&direction=d"><img src="../graphics/down" border="0" alt="#assessment.Move_Down#"></a>
+		</if>
+		<if @i_checks.order_by@ gt 1>
+		    <a href="swap-actions?assessment_id=$assessment_id&check_id=@i_checks.inter_item_check_id@&order_by=@i_checks.order_by@&section_id=@i_checks.section_id_from@&action_perform=@i_checks.action_perform@&direction=u"><img src="../graphics/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+		</if>
+		<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@i_checks.inter_item_check_id@&section_id=$section_id>Notify user </a>
+	    }
+	}
+    }
+
+
+
+db_multirow m_checks  get_m_checks {}
+template::list::create \
+    -name m_checks \
+    -multirow m_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check t}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @m_checks.name@
+	    }
+	}
+	action_name {
+	    label "Action To Perform"
+	}
+	inter_item_check_id {
+	    display_template {
+		<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@m_checks.inter_item_check_id@&section_id=$section_id>Notify user </a>
+	    }
+	}
+    }
+
+db_multirow branches  get_branches {}
+template::list::create \
+    -name branches \
+    -multirow branches \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check f}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @branches.name@
+	    }
+	}
+	section_id_to {
+	    label "Goes to section"
+	    display_col sname
+	}
+	
+    }
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-admin.tcl~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,171 @@
+ad_page_contract {
+    
+    This page allows to add branches or actions to the question and its choices.    
+   
+   @author Anny Flore (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+   @date 2005-01-07
+} {
+    assessment_id:integer
+    section_id
+}
+
+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}]
+	
+
+
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    ad_script_abort
+}
+
+set title "$assessment_data(title) Triggers"
+set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title Triggers"]
+
+db_multirow aa_checks get_aa_checks {} 
+
+template::list::create \
+    -name aa_checks \
+    -multirow aa_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check t}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @aa_checks.name@
+	    }
+	}
+	action_name {
+	    label "Action To Perform"
+	}
+	counter {
+	    display_template {    
+	<if @aa_checks.order_by@ lt @aa_checks:rowcount@>
+	    <a href="swap-actions?assessment_id=$assessment_id&check_id=@aa_checks.inter_item_check_id@&order_by=@aa_checks.order_by@&section_id=@aa_checks.section_id_from@&action_perform=@aa_checks.action_perform@&direction=d"><img src="../graphics/down" border="0" alt="#assessment.Move_Down#"></a>
+	    </if>
+	<if @aa_checks.order_by@ gt 1>
+	    <a href="swap-actions?assessment_id=$assessment_id&check_id=@aa_checks.inter_item_check_id@&order_by=@aa_checks.order_by@&section_id=@aa_checks.section_id_from@&action_perform=@aa_checks.action_perform@&direction=u"><img src="../graphics/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+	    </if>
+	<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@aa_checks.inter_item_check_id@&section_id=$section_id>Notify user </a>
+		
+	    }
+	    
+	}
+    }
+
+
+db_multirow i_checks  get_i_checks {}
+template::list::create \
+    -name i_checks \
+    -multirow i_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check t}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @i_checks.name@
+	    }
+	}
+	action_name {
+	    label "Action To Perform"
+	}
+	inter_item_check_id {
+	    display_template {    
+	<if @i_checks.order_by@ lt @i_checks:rowcount@>
+	    <a href="swap-actions?assessment_id=$assessment_id&check_id=@i_checks.inter_item_check_id@&order_by=@i_checks.order_by@&section_id=@i_checks.section_id_from@&action_perform=@i_checks.action_perform@&direction=d"><img src="../graphics/down" border="0" alt="#assessment.Move_Down#"></a>
+	    </if>
+	<if @i_checks.order_by@ gt 1>
+		    <a href="swap-actions?assessment_id=$assessment_id&check_id=@i_checks.inter_item_check_id@&order_by=@i_checks.order_by@&section_id=@i_checks.section_id_from@&action_perform=@i_checks.action_perform@&direction=u"><img src="../graphics/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+	</if>
+	<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@i_checks.inter_item_check_id@&section_id=$section_id>Notify user </a>
+	    }
+	}
+    }
+	
+	
+
+db_multirow m_checks  get_m_checks {}
+template::list::create \
+    -name m_checks \
+    -multirow m_checks \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check t}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @m_checks.name@
+	    }
+	}
+	action_name {
+	    label "Action To Perform"
+	}
+	inter_item_check_id {
+	    display_template {
+	<a href=request-notification?assessment_id=$assessment_id&inter_item_check_id=@m_checks.inter_item_check_id@&section_id=$section_id>Notify user </a>
+	    }
+	}
+    }
+
+db_multirow branches  get_branches {}
+template::list::create \
+    -name branches \
+    -multirow branches \
+    -key inter_item_check_id \
+    -bulk_actions {
+	"Delete" "confirm-delete" "Delete checked items"
+    }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	inter_item_check_id
+	assessment_id
+	section_id
+	{type_check f}
+    }\
+    -row_pretty_plural "assessment triggers" \
+    -elements {
+	name {
+	    label "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><img border=0 src=images/Edit16.gif></a>  @branches.name@
+	    }
+	}
+	section_id_to {
+	    label "Goes to section"
+	    display_col sname
+	}
+	
+    }
+
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-admin.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<queryset>
+
+<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
+</querytext>			
+</fullquery>
+
+<fullquery name="get_i_checks">
+<querytext>		
+	select am.action_perform,am.order_by, c.inter_item_check_id,c.name,a.name as action_name,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 = 'i' and c.action_p
+	= 't' order by order_by
+</querytext>			
+</fullquery>
+
+<fullquery name="get_m_checks">
+<querytext>		
+	select am.action_perform,am.order_by, c.inter_item_check_id,c.name,a.name as action_name,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 = 'm' and c.action_p
+	= 't' 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
+</querytext>			
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/checks-delete-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-delete-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-delete-oracle.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="delete_check">
+<querytext>
+	begin
+	as_inter_item_check.delete(:check_id);
+	end;
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/checks-delete-oracle.xql~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-delete-oracle.xql~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-delete-oracle.xql~	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="delete_check">
+<querytext>
+	select as_inter_item_check__delete (:check_id) 
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/checks-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-delete-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-delete-postgresql.xql	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="delete_check">
+<querytext>
+	select as_inter_item_check__delete (:check_id) 
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/assessment/www/admin/checks-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-delete.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/checks-delete.tcl	24 Jan 2005 17:45:56 -0000	1.1
@@ -0,0 +1,18 @@
+ad_page_contract {
+    This page deletes checks
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks
+    @date 2005-01-17
+} {
+    inter_item_check_id:multiple
+    section_id
+    assessment_id
+  }
+set count [llength $inter_item_check_id]
+
+for { set i 0} { $i< $count } {incr i} {
+    set check_id [lindex $inter_item_check_id $i]
+    db_transaction {
+	db_exec_plsql delete_check {}
+    }
+}
+ad_returnredirect "checks-admin?assessment_id=$assessment_id&section_id=$section_id"
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/swap-actions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/swap-actions.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/swap-actions.tcl	24 Jan 2005 17:53:32 -0000	1.1
@@ -0,0 +1,18 @@
+ad_page_contract {
+    
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @date-created 2005-01-13
+    
+    This page allows to swap action up and down
+} {
+    section_id:integer
+    check_id:integer
+    action_perform
+    order_by:integer
+    direction
+    assessment_id:integer
+}
+as::assessment::check::swap_actions -check_id $check_id -action_perform $action_perform -section_id $section_id -direction $direction -order_by $order_by
+
+
+ad_returnredirect "checks-admin?assessment_id=$assessment_id&section_id=$section_id"
\ No newline at end of file
Index: openacs-4/packages/assessment/www/admin/unsubscribe.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/unsubscribe.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/unsubscribe.tcl	24 Jan 2005 17:53:32 -0000	1.1
@@ -0,0 +1,22 @@
+ad_page_contract {
+
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @creation_date 2005-01-19
+    
+} {
+    inter_item_check_id:notnull
+    request_id:multiple
+    type_id     
+    assessment_id
+    section_id
+} 
+
+set request_count [llength $request_id]
+for { set i 0} { $i < $request_count } { incr i } {
+    db_transaction {
+	set r_id [lindex $request_id $i]
+	db_dml remove_notify { *SQL* }
+    }
+}
+
+ad_returnredirect "request-notification?inter_item_check_id=$inter_item_check_id&type_id=$type_id&assessment_id=$assessment_id&section_id=$section_id"
Index: openacs-4/packages/assessment/www/admin/unsubscribe.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/unsubscribe.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/unsubscribe.tcl~	24 Jan 2005 17:53:32 -0000	1.1
@@ -0,0 +1,22 @@
+ad_page_contract {
+
+    @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+    @creation_date 2005-01-19
+
+} {
+inter_item_check_id:notnull
+request_id:multiple
+type_id     
+assessment_id
+section_id
+} 
+
+    set request_count [llength $request_id]
+    for { set i 0} { $i < $request_count } { incr i } {
+	db_transaction {
+            set r_id [lindex $request_id $i]
+	    db_dml remove_notify { *SQL* }
+	}
+     }
+
+    ad_returnredirect "request-notification?inter_item_check_id=$inter_item_check_id&type_id=$type_id&assessment_id=$assessment_id&section_id=$section_id"
Index: openacs-4/packages/assessment/www/admin/unsubscribe.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/unsubscribe.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/unsubscribe.xql	24 Jan 2005 17:53:32 -0000	1.1
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+      
+<queryset>
+	<fullquery name="remove_notify"> 
+		   <querytext>
+			delete from notification_requests where request_id=:r_id 
+		   </querytext>
+	</fullquery>
+</queryset>
Index: openacs-4/packages/assessment/www/admin/unsubscribe.xql~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/unsubscribe.xql~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/admin/unsubscribe.xql~	24 Jan 2005 17:53:32 -0000	1.1
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<queryset>
+	<fullquery name="remove_notify"> 
+		   <querytext>
+			delete from notification_requests where request_id=:r_id 
+		   </querytext>
+	</fullquery>
+</queryset>