Index: openacs-4/packages/rules/www/add-action.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-action.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/add-action.adp	8 Dec 2004 21:21:25 -0000	1.3
+++ openacs-4/packages/rules/www/add-action.adp	9 Dec 2004 20:11:25 -0000	1.4
@@ -7,5 +7,6 @@
      if (destination) location.href = destination;
 }
 </script>
+
 <property name="context">@context@</property>
 <formtemplate id="add_action"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/rules/www/add-rule.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-rule.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/add-rule.tcl	8 Dec 2004 22:19:49 -0000	1.3
+++ openacs-4/packages/rules/www/add-rule.tcl	9 Dec 2004 20:11:25 -0000	1.4
@@ -6,6 +6,7 @@
     Add new rule related to an Assessment
 } {
    rule_id:optional
+   return_url:optional
 } -properties {
   context
 }
@@ -15,7 +16,7 @@
 set context [list "Add rule"]
 
 set assessments [rules::rule::get_assessments]
-ad_form -name  add_rule  -form {
+ad_form -name  add_rule  -export { return_url } -form {
      rule_id:key     
     { rule_name:text(text) 
 	{label "Rule Name"}
@@ -37,5 +38,6 @@
  } -edit_data {
      db_dml update_rule { update rules set rule_name=:rule_name, active_p=:active_p, asm_id=:asm_id where rule_id=:rule_id }
  } -after_submit {
-  ad_returnredirect "index"
+     
+  ad_returnredirect $return_url
 }
Index: openacs-4/packages/rules/www/add-trigger-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-trigger-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/rules/www/add-trigger-oracle.xql	3 Dec 2004 17:56:02 -0000	1.1
+++ openacs-4/packages/rules/www/add-trigger-oracle.xql	9 Dec 2004 20:11:25 -0000	1.2
@@ -4,10 +4,12 @@
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
    <fullquery name="questions">
    <querytext>
-            select question_id as qs_id, question_text as description
-            from survey_questions
-            where section_id = (select section_id from survey_sections where
-   survey_id=(select asm_id from rules where rule_id=:rule_id)) 
+            select sq.question_id as qs_id, sq.question_text as description
+            from survey_questions sq where sq.section_id in (select section_id from survey_sections where
+   survey_id = (select asm_id as survey_id from rules where rule_id=:rule_id)) and sq.question_id not
+   in (select qs_id from rules_triggers where rule_id=:rule_id)  and (select
+   count(choice_id) from survey_question_choices  where  question_id = sq.question_id) > 0 
+ 
    </querytext>
    
    </fullquery>
Index: openacs-4/packages/rules/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/rules/www/index.adp	8 Dec 2004 21:21:25 -0000	1.4
+++ openacs-4/packages/rules/www/index.adp	9 Dec 2004 20:11:25 -0000	1.5
@@ -3,8 +3,10 @@
 <table>
  <tr>
   <td>
-     <a href="add-rule" title="Add new rule" class="button">Add New Rule</a> <a
-     href="admin/admin-request" title="Waiting Lists" class="button">Waiting Lists</a>
+     <a href="add-rule?return_url=\"index\"" title="Add new rule" class="button">Add New Rule</a> <a
+     href="admin/admin-request" title="Waiting Lists" class="button">Waiting
+     Lists</a> <a
+     href="../survey/admin/survey-create" title="add questionnaire" class="button">Add new  Questionnaire</a>
   </td>
  </tr>
  <tr>
Index: openacs-4/packages/rules/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/index.tcl	8 Dec 2004 22:20:13 -0000	1.3
+++ openacs-4/packages/rules/www/index.tcl	9 Dec 2004 20:11:25 -0000	1.4
@@ -24,13 +24,13 @@
 	label "Rule Name"
         display_template
         {
-         <a href=add-rule?rule_id=@all_rules.rule_id@><img border=0 src=images/Edit16.gif></a> <a href=one-rule?rule_id=@all_rules.rule_id@>@all_rules.rule_name@</a>
+         <a href=add-rule?rule_id=@all_rules.rule_id@&return_url=index><img border=0 src=images/Edit16.gif></a> <a href=one-rule?rule_id=@all_rules.rule_id@>@all_rules.rule_name@</a>
 	}
 
 	
     }
     asm_name {
-	label "Related Questionnarie"
+	label "Related Questionnaire"
 	link_url_eval {../survey/admin/one?survey_id=$asm_id}
     }
     active_p {
@@ -47,7 +47,7 @@
         rule_id {
 	label "Notifications"
 	display_template {
-	    <a href=request-notification?object_id=@all_rules.rule_id@&type_id=[notification::type::get_type_id -short_name rule_notif]&return_url=index>Notify user</a>
+	    <a href=request-notification?object_id=@all_rules.rule_id@&type_id=[notification::type::get_type_id -short_name rule_notif]>Notify user</a>
 	  
 	}
     }
Index: openacs-4/packages/rules/www/one-rule-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/one-rule-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/rules/www/one-rule-oracle.xql	3 Dec 2004 17:57:03 -0000	1.1
+++ openacs-4/packages/rules/www/one-rule-oracle.xql	9 Dec 2004 20:11:25 -0000	1.2
@@ -23,10 +23,13 @@
    </fullquery>
    <fullquery name="questions">
    <querytext>
-            select question_id as qs_id, question_text as description
-            from survey_questions
-            where section_id = (select section_id from survey_sections where
-            survey_id=(select asm_id from rules where rule_id=:rule_id)) 
+            select sq.question_id as qs_id, sq.question_text as description
+            from survey_questions sq
+            where sq.section_id = (select section_id from survey_sections where
+	    survey_id=(select asm_id from rules where rule_id=:rule_id)) and sq.question_id not
+	    in (select qs_id from rules_triggers where rule_id=:rule_id)  and (select
+	    count(choice_id) from survey_question_choices  where  question_id =
+	    sq.question_id) > 0 
  
    </querytext>
    
Index: openacs-4/packages/rules/www/one-rule.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/one-rule.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/one-rule.adp	8 Dec 2004 22:30:56 -0000	1.3
+++ openacs-4/packages/rules/www/one-rule.adp	9 Dec 2004 20:11:25 -0000	1.4
@@ -33,7 +33,7 @@
 
 
 <br>
-<h2>@rule_name@ <a href=add-rule?rule_id=@rule_id@><img border=0 src=images/Edit16.gif></a></h2>
+<h2>@rule_name@ <a href=add-rule?rule_id=@rule_id@&return_url=one-rule?rule_id=@rule_id@><img border=0 src=images/Edit16.gif></a></h2>
 Related Questionnarie: <b>@assessment_related@</b>
 <br>
 State:<b>@state@</b>
Index: openacs-4/packages/rules/www/one-rule.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/one-rule.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/rules/www/one-rule.tcl	8 Dec 2004 22:32:01 -0000	1.5
+++ openacs-4/packages/rules/www/one-rule.tcl	9 Dec 2004 20:11:25 -0000	1.6
@@ -48,10 +48,11 @@
                    
                    <select name=edit_qs@rule_triggers.rule_def_id@  onChange=go@rule_triggers.rule_def_id@(@rule_triggers.rule_def_id@)>
                    <% set qs_id_2 @rule_triggers.qs_id@
-	    db_multirow questions question {select question_id as qs_id, question_text as description
-            from survey_questions where section_id = (select section_id from survey_sections where
-            survey_id=(select asm_id from rules where rule_id=$rule_id)) 
-} %>
+	    db_multirow questions question {select sq.question_id as qs_id, sq.question_text as description
+            from survey_questions sq where sq.section_id in (select section_id from survey_sections where
+	    survey_id=(select asm_id from rules where rule_id=$rule_id)) and sq.question_id not
+	    in (select qs_id from rules_triggers where rule_id=$rule_id)  and (select
+	    count(choice_id) from survey_question_choices  where  question_id = sq.question_id) > 0 } %>
                     <option value=@rule_triggers.qs_id@>@rule_triggers.description@
                      <multiple name="questions">
                     <option value=@questions.qs_id@>@questions.description@
@@ -64,7 +65,6 @@
 	label "Answer"
         display_template {
 
-
             <select name=edit_result@rule_triggers.rule_def_id@ onChange=result@rule_triggers.rule_def_id@(@rule_triggers.rule_def_id@)>
 	    <% set q_id @rule_triggers.qs_id@
               db_multirow answers answers {select choice_id as result_id, label as value from survey_question_choices  where  question_id = :q_id} %>
Index: openacs-4/packages/rules/www/process-response-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/process-response-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/rules/www/process-response-oracle.xql	3 Dec 2004 17:57:14 -0000	1.1
+++ openacs-4/packages/rules/www/process-response-oracle.xql	9 Dec 2004 20:11:25 -0000	1.2
@@ -3,7 +3,7 @@
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
    <fullquery name="questions">
    <querytext>
-       select * from survey_questions where section_id=(select section_id
+       select * from survey_questions where section_id in (select section_id
        from survey_sections ss where ss.survey_id=:survey_id)
    </querytext>
    </fullquery>
Index: openacs-4/packages/rules/www/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/process-response.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/process-response.tcl	8 Dec 2004 21:21:25 -0000	1.3
+++ openacs-4/packages/rules/www/process-response.tcl	9 Dec 2004 20:11:25 -0000	1.4
@@ -14,8 +14,12 @@
 set rest ""
 set message ""
 set notif_text ""
+
 db_foreach rules_related {select * from rules where asm_id=:survey_id} {
     db_foreach rule_triggers { select * from rules_triggers  where rule_id=:rule_id } {
+           #ad_return_complaint 1 "$qs_id $response_id"
+           #ad_script_abort
+        
 	set answer [db_string answer { select choice_id from survey_question_responses where question_id=:qs_id and response_id=:response_id}] 
         if { $answer == $result_id } {
             set perform_actions 1
@@ -25,15 +29,19 @@
     }
     if { $perform_actions == 1 } {
         db_foreach action { select * from rules_actions where rule_id=:rule_id} {
+ #          ad_return_complaint 1 "$action_type"
+#           ad_script_abort
             set rha_id [db_nextval rha_seq]
             set community_name [db_string name {select pretty_name from dotlrn_communities_all where community_id=:group_id} -default System]
             set today [db_string date "select to_date(sysdate,'YYYY-MM-DD') from dual"]
             set  username [db_string name {select p.first_names || ' ' || p.last_name as name  from persons p where p.person_id = :user_id}]
 
+
 	    if { $action_type == 1} {
 
                 append message "<li> You have joined the $community_name community."
                 append notif_text "The user user has joined the $community_name community." 
+
                     dotlrn_community::add_user $group_id $user_id
                   
 		db_transaction {
@@ -43,14 +51,24 @@
 	    } elseif {$action_type == 2} {
                                 append message "<li> Your request to join  $community_name  has been sent to the administrator of the group."
                                append notif_text "The user $username requested to join  $community_name  has been sent to the administrator of the group."
+
                                 set today [db_string date "select sysdate from dual"]
                  		db_transaction {
 				    db_dml add_history { insert into rule_history_actions (rha_id,group_id,user_id,rule_action_id,request_date,processing_date,approved_p) values (:rha_id,:group_id,:user_id,:rule_action_id,to_date(:today,'YYYY-MM-DD'),'','n')}
 
               
 				}
-	    } elseif {$action_type == 3 } {
-                set user_info [db_string student_id {select number_answer from survey_question_responses where question_id = (:qs_id+1) and response_id = :response_id}]
+	    } elseif { $action_type == 3 } {
+                set s_id ""
+                db_foreach questions { *SQL* } {
+		    if { $question_text == "student_id"} {
+                      set s_id $question_id
+		    }
+		} 
+#           ad_return_complaint 1 "$s_id"
+#          ad_script_abort
+  
+                set user_info [db_string student_id {select number_answer from survey_question_responses where question_id = :s_id and response_id = :response_id}]
 
 		array set user_new_info [auth::create_user -username $user_info -email $user_info@viaro.net  -first_names $user_info -last_name $user_info -password $user_info]
                 
@@ -71,6 +89,7 @@
 		}
 
 		  }
+
     }
 
 }
Index: openacs-4/packages/rules/www/admin/admin-request.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/admin/Attic/admin-request.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/admin/admin-request.adp	8 Dec 2004 21:21:25 -0000	1.3
+++ openacs-4/packages/rules/www/admin/admin-request.adp	9 Dec 2004 20:11:25 -0000	1.4
@@ -4,31 +4,41 @@
 
 function get_interval() {
         interval=document.interval.date.value; 
-        destination = "admin-request?community=@default_community@&state=@default_state@&interval="+interval;
+        destination = "admin-request?community=@default_community@&state=@default_state@&rule=@default_rule@&interval="+interval;
         if (destination) location.href = destination;
       
 }
 </script>
 <script language="JavaScript">
 function get_specific_date() {
         date=document.specific_date.specific_date.value; 
-        destination = "admin-request?community=@default_community@&state=@default_state@&interval=@default_interval@&specific_date="+date;
+        destination ="admin-request?community=@default_community@&state=@default_state@&rule=@default_rule@&interval=@default_interval@&specific_date="+date;
+         alert (destination);
         if (destination) location.href = destination;
       
 }
 </script>
 <script language="JavaScript">
 function get_community() {
         community=document.communities.community_id.value;
-        destination = "admin-request?state=@default_state@&interval=@default_interval@&specific_date=@default_specific_date@&community="+community;
+        destination = "admin-request?state=@default_state@&interval=@default_interval@&rule=@default_rule@&specific_date=@default_specific_date@&community="+community;
         if (destination) location.href = destination;
       
 }
 </script>
 <script language="JavaScript">
+function get_rule() {
+        rule=document.rules.rule_id.value;
+        destination = "admin-request?state=@default_state@&interval=@default_interval@&specific_date=@default_specific_date@&community=@default_community@&rule="+rule;
+        if (destination) location.href = destination;
+      
+}
+</script>
+
+<script language="JavaScript">
 function get_state() {
         state=document.communities.approved_p.value; 
-        destination = "admin-request?community=@default_community@&interval=@default_interval@&specific_date=@default_specific_date@&state="+state;
+        destination = "admin-request?community=@default_community@&interval=@default_interval@&specific_date=@default_specific_date@&rule=@default_rule@&state="+state;
          if (destination) location.href = destination;
       
 }
@@ -37,6 +47,7 @@
 	<tr bgcolor="#eeeeee">
        	  <th align="left" width="50%">
            <formtemplate id="communities"></formtemplate>
+           <formtemplate id="rules"></formtemplate>
           </th>
           <th>
            <formtemplate id="interval"></formtemplate>
@@ -46,4 +57,5 @@
       </table>
 <br>
 
-<listtemplate name="requests"></listtemplate>
\ No newline at end of file
+<listtemplate name="requests"></listtemplate>
+
Index: openacs-4/packages/rules/www/admin/admin-request.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/admin/Attic/admin-request.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/rules/www/admin/admin-request.tcl	7 Dec 2004 16:48:08 -0000	1.2
+++ openacs-4/packages/rules/www/admin/admin-request.tcl	9 Dec 2004 20:11:25 -0000	1.3
@@ -8,16 +8,21 @@
     specific_date:optional
     state:optional
     community:optional
+    rule:optional
 }
 
 set communities_list [list]
-
+set rules_list [list]
 lappend communities_list [list "All" "all"]
 lappend communities_list [list "System" "-1"]
+lappend rules_list [list "All" "all"]
 
 db_foreach  community {select community_id,pretty_name from dotlrn_communities_all} {
     lappend communities_list [list $pretty_name $community_id]
 }
+db_foreach rules { select * from rules } {
+    lappend rules_list [list $rule_name $rule_id]
+}
 
 set approved_options [list [list "Not Approved" n] [list "Approved" y]]
 
@@ -31,16 +36,24 @@
 set default_specific_date  ""
 set default_community "all"
 set default_state "n"
+set default_rule "all"
 
 set date_options [list [list "All" "all"] [list "Today" $today] [list "Yesterday" $yesterday] [list "Two days ago" $two_days] [list "Last Week" $last_week] [list "Last Month" $last_month]]
   
 set community_query ""
+set rule_query ""
 
 if {[exists_and_not_null community] && $community != "all" } {
    set default_community $community
    set community_query " and r.group_id= $default_community"
 
 }
+if {[exists_and_not_null rule] && $rule != "all" } {
+   set default_rule $rule
+   set rule_query " and r.rule_action_id= (select rule_action_id from rules_actions where rule_id = $default_rule)"
+
+}
+
 if {[exists_and_not_null state]} {
     set default_state $state;
 } 
@@ -60,7 +73,7 @@
    set specific_date_query "and to_char(request_date,'YYYY-MM-DD') = '$default_specific_date'"
 } 
 
- set query "select r.rha_id,r.user_id,(select p.first_names || ' ' || p.last_name as name from persons p where p.person_id = r.user_id) as user_name, (select pretty_name from dotlrn_communities_all where community_id=r.group_id) as group_name, r.group_id,r.rule_action_id,to_date(r.request_date,'YYYY-MM-DD') as request_date ,r.approved_p from rule_history_actions r where approved_p='$default_state' $community_query $interval_query $specific_date_query"
+ set query "select r.rha_id,r.user_id,(select p.first_names || ' ' || p.last_name as name from persons p where p.person_id = r.user_id) as user_name, (select pretty_name from dotlrn_communities_all where community_id=r.group_id) as group_name, r.group_id,r.rule_action_id,to_date(r.request_date,'YYYY-MM-DD') as request_date ,r.approved_p from rule_history_actions r where approved_p='$default_state' $community_query $interval_query $specific_date_query $rule_query"
 
 
 
@@ -91,9 +104,22 @@
       -value $default_interval
 
 form create specific_date -has_submit 1
+element create specific_date community \
+    -datatype text\
+    -widget hidden\
+    -value $default_community
+element create specific_date state \
+    -datatype text\
+    -widget hidden\
+    -value $default_state
+element create specific_date rule \
+    -datatype text\
+    -widget hidden\
+    -value $default_rule
+
 element create specific_date specific_date \
     -label "" \
-    -datatype text \
+    -datatype text\
     -widget text \
     -optional\
     -value $default_specific_date\
@@ -105,6 +131,15 @@
       -label "Specific Date"\
       -html { onClick "get_specific_date()"}
 
+form create rules -has_submit
+element create rules rule_id\
+      -datatype text\
+      -widget select\
+      -label "Rule Name"\
+      -options $rules_list\
+      -html { onChange "get_rule()"}\
+      -value $default_rule
+
 template::list::create -name requests\
 -multirow requests\
 -key rha_id\
@@ -113,7 +148,11 @@
   "Approve" "approve-users" "Approve users requests"
 }\
 -bulk_action_method post -bulk_action_export_vars {
-  
+    {interval $default_interval}
+    {rule $default_rule}
+    {community $default_community}
+    {specific_date $default_specific_date}
+    {state $default_state}
 }\
 -no_data "There are no requests"\
 -row_pretty_plural "requests"\
Index: openacs-4/packages/rules/www/admin/approve-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/admin/Attic/approve-users.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/rules/www/admin/approve-users.tcl	8 Dec 2004 21:24:35 -0000	1.1
+++ openacs-4/packages/rules/www/admin/approve-users.tcl	9 Dec 2004 20:11:25 -0000	1.2
@@ -2,13 +2,20 @@
     Delete  rules
 } {
     rha_id:integer,notnull,multiple
+    interval
+    specific_date
+    state
+    community
+    rule
+
     
 }
  
     set rules_count [llength $rha_id]
     for { set i 0} { $i < $rules_count } { incr i } {
         set r_id [lindex $rha_id $i]
         set group_id [db_string community { select group_id from rule_history_actions where rha_id=:r_id}] 
+        if { $group_id != -1 } {
         set user_id  [db_string user { select user_id from rule_history_actions where rha_id=:r_id}] 
         set today [db_string today { select to_date (sysdate,'YYYY-MM-DD') from dual}]
         dotlrn_community::add_user $group_id $user_id
@@ -17,7 +24,8 @@
                  
 	    db_dml add_history { update rule_history_actions set processing_date=:today, approved_p='y' where rha_id=:r_id} 
 		}
+	}
 
      }
 
-    ad_returnredirect "admin-request?interval=all&specific_date=today"
+    ad_returnredirect "admin-request?interval=$interval&community=$community&specific_date=$specific_date&rule=$rule&state=$state"