Index: openacs-4/packages/assessment/tcl/as-checks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/assessment/tcl/as-checks-procs.tcl	1 Feb 2005 22:13:44 -0000	1.10
+++ openacs-4/packages/assessment/tcl/as-checks-procs.tcl	4 Feb 2005 18:08:41 -0000	1.11
@@ -19,6 +19,10 @@
     
 } {
     set package_id [ad_conn package_id]
+    set user_id [ad_conn user_id]
+    set permission ""
+    if {[permission::permission_p -object_id $package_id -party_id $user_id -privilege admin] == 0} {
+	set permission "and ci.item_id in (select object_id from acs_permissions where grantee_id=:user_id and privilege='admin')"}
     set assessment_list [list [list "[_ assessment.all]" "all"]]
     set assessments [db_list_of_lists assessment {}]
     foreach  assessment $assessments {
Index: openacs-4/packages/assessment/tcl/as-checks-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/assessment/tcl/as-checks-procs.xql	1 Feb 2005 22:13:44 -0000	1.8
+++ openacs-4/packages/assessment/tcl/as-checks-procs.xql	4 Feb 2005 18:08:41 -0000	1.9
@@ -3,7 +3,7 @@
 
 <fullquery name="as::assessment::check::get_assessments.assessment">
       <querytext>
-      select cr.title ,ci.item_id as assessment_id from cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and ci.parent_id = cf.folder_id and cf.package_id = :package_id order by cr.title
+      select cr.title ,ci.item_id as assessment_id from cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a where cr.revision_id = ci.latest_revision and a.assessment_id = cr.revision_id and ci.parent_id = cf.folder_id and cf.package_id = :package_id $permission  order by cr.title
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/assessment/www/actions-results.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/Attic/actions-results.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/actions-results.adp	31 Jan 2005 22:23:13 -0000	1.2
+++ openacs-4/packages/assessment/www/actions-results.adp	4 Feb 2005 18:08:05 -0000	1.3
@@ -1,7 +1,7 @@
 <h2>Actions Performed:</h2>
 <multiple name="actions">
  @actions.user_message@
-<if @actions.error_txt@ ne  >
+<if @actions.error_txt@ ne nil>
 	<font color=red>@actions.error_txt@</font>
 </if>
 </multiple>
\ No newline at end of file
Index: openacs-4/packages/assessment/www/assessment-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/Attic/assessment-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/assessment-postgresql.xql	24 Jan 2005 14:54:30 -0000	1.11
+++ openacs-4/packages/assessment/www/assessment-postgresql.xql	4 Feb 2005 18:08:05 -0000	1.12
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
-	<rdbms><type>postgresql</type><version>7.4</version></rdbms>
+	<rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="session_time">
 	<querytext>
Index: openacs-4/packages/assessment/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/index-postgresql.xql	23 Jan 2005 18:10:49 -0000	1.1
+++ openacs-4/packages/assessment/www/index-postgresql.xql	4 Feb 2005 18:08:05 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
-	<rdbms><type>postgresql</type><version>7.4</version></rdbms>
+	<rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="asssessment_id_name_definition">
 	<querytext>
Index: openacs-4/packages/assessment/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/assessment/www/index.tcl	24 Jan 2005 14:54:31 -0000	1.10
+++ openacs-4/packages/assessment/www/index.tcl	4 Feb 2005 18:08:05 -0000	1.11
@@ -43,6 +43,6 @@
     }
 }
 
-set admin_p [ad_permission_p $package_id admin]
+set admin_p [ad_permission_p $package_id create]
 
 ad_return_template
Index: openacs-4/packages/assessment/www/admin/admin-request-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/admin/admin-request-postgresql.xql	2 Feb 2005 17:00:20 -0000	1.1
+++ openacs-4/packages/assessment/www/admin/admin-request-postgresql.xql	4 Feb 2005 18:08:06 -0000	1.2
@@ -3,7 +3,7 @@
 
 <fullquery name="sysdate">
 <querytext>
-	select to_date (now(),'YYYY-MM-DD')
+	select to_char(now(),'YYYY-MM-DD')
 </querytext>
 </fullquery>
 </queryset>
Index: openacs-4/packages/assessment/www/admin/admin-request.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/www/admin/admin-request.tcl	2 Feb 2005 23:17:44 -0000	1.7
+++ openacs-4/packages/assessment/www/admin/admin-request.tcl	4 Feb 2005 18:08:06 -0000	1.8
@@ -46,10 +46,9 @@
 
 } 
 
-set today [db_string sysdate {}]
 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($today,'YYYY-MM-DD') "
+    set interval_query "and to_date(al.date_requested,'YYYY-MM-DD') >= to_date('$interval','YYYY-MM-DD')"
     set date_query ""
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl	2 Feb 2005 23:09:05 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl	4 Feb 2005 18:07:08 -0000	1.5
@@ -23,6 +23,7 @@
 set item_id_check ""
 
 if {[exists_and_not_null item_id]} {
+    set show_p 0
     set by_item_p 1
     set item_p "&item_id=$item_id"
     set item_id_check $item_id
Index: openacs-4/packages/assessment/www/asm-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/index.adp	2 Feb 2005 19:04:46 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/index.adp	4 Feb 2005 18:07:08 -0000	1.3
@@ -5,10 +5,11 @@
 <if @admin_p@ eq 1>
 <a
 href="@categories_url@cadmin/one-object?object_id=@package_id@">#assessment.admin_categories#</a>
-| <a href=../admin/asm-action-admin>#assessment.admin_actions#</a> | <a href=../admin/admin-request>#assessment.admin_requests#</a> | <a href="permissions?object_id=@package_id@">#assessment.permissions#</a>
+| <a href=../admin/asm-action-admin>#assessment.admin_actions#</a> | <a href=../asm-admin/admin-request>#assessment.admin_requests#</a> | <a href="permissions?object_id=@package_id@">#assessment.permissions#</a>
+</if> <else>
+<a href=../asm-admin/admin-request>#assessment.admin_requests#</a>
+</else>
 
-</if>
-
 <p>
 
 <formtemplate id="form_upload_file"></formtemplate>
Index: openacs-4/packages/assessment/www/asm-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/index.tcl	2 Feb 2005 21:31:15 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/index.tcl	4 Feb 2005 18:07:08 -0000	1.4
@@ -41,9 +41,10 @@
 }
 
 #get all assessments order by title
-db_multirow -extend { export permissions} assessments $m_name {} {
+db_multirow -extend { export permissions admin_request} assessments $m_name {} {
     set export "[_ assessment.Export]"
     set permissions "[_ assessment.permissions]"
+    set admin_request "[_ assessment.Request] [_ assessment.Administration]"
 }
 
 #list all assessments
@@ -64,6 +65,11 @@
 	    label "[_ assessment.permissions]"
 	    link_url_eval "[export_vars -base permissions { {object_id $assessment_id} }]"
 	}
+	admin_request {
+	    label "[_ assessment.Request] [_ assessment.Administration]"
+	    link_url_eval "[export_vars -base admin-request { {assessment $assessment_id} }]"
+	}
+
 	
     } -actions $actions