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 -N -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"\