Index: openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml	6 Feb 2006 19:22:20 -0000	1.6
+++ openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml	8 Feb 2006 15:43:14 -0000	1.7
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="ae-portlet" package_version="0.2d2" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="ae-portlet" package_version="0.2d3" locale="en_US" charset="ISO-8859-1">
 
   <msg key="ae_admin">Course Evaluation Admin</msg>
   <msg key="Anonymous">Anonymous?</msg>
@@ -11,10 +11,12 @@
   <msg key="lt_No_evaluations_presen">No evaluations presently available</msg>
   <msg key="lt_No_unpublished_evalua">No unpublished evaluations</msg>
   <msg key="lt_NOTE_This_is_an_admin">#NOTE: This is an admin only section for unpublished evaluations</msg>
+  <msg key="lt_Sorry_this_evaluation">Sorry, this evaluation is over</msg>
   <msg key="New_Evaluation">New Evaluation</msg>
   <msg key="Publish">Publish</msg>
   <msg key="Results">Results</msg>
   <msg key="Take_Evaluation">Take Evaluation</msg>
+  <msg key="Test_Evaluation">Test Evaluation</msg>
   <msg key="title">Title</msg>
   <msg key="Unpublish">Unpublish</msg>
   <msg key="view_results">Results</msg>
Index: openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl	6 Feb 2006 19:22:20 -0000	1.5
+++ openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl	8 Feb 2006 15:43:14 -0000	1.6
@@ -44,21 +44,42 @@
     -elements {
 	title {
 	    label ""
-	    link_url_col assessment_url
+	    display_template {
+		<if @assessments.session_id@ ne "" or @assessments.over_p@>
+		@assessments.title@
+		</if>
+		<else>
+		<a href="@assessments.assessment_url;noquote@">@assessments.title@</a>
+		</else>		    		
+	    }
 	}
 	actions {
 	    label ""
 	    display_template {
 		<if @assessments.session_id@ ne "">
+
 		<if @assessments.completed_datetime@ eq "">
 		<a href="@assessments.assessment_url;noquote@">#ae-portlet.Finish_Evaluation#</a>
 		</if>
 		<else>
 		<a href="@assessments.edit_response_url;noquote@"><img border=0 src=/resources/Edit16.gif> #ae-portlet.Edit_Your_Response#</a> | <a href="@assessments.view_url;noquote@"><img border=0 src=/resources/Zoom16.gif> #ae-portlet.View_Your_Response#</a>
 		</else>
+
 		</if>
 		<else>
+		
+		<if @assessments.package_admin_p@ ne 1>
+		<if @assessments.over_p@>
+		[_ ae-portlet.lt_Sorry_this_evaluation]
+		</if>
+		<else>
 		<a href="@assessments.assessment_url;noquote@">#ae-portlet.Take_Evaluation#</a>
+		</else>
+		</if>
+		<else>
+		<a href="@assessments.assessment_url;noquote@">[_ ae-portlet.Test_Evaluation]</a>
+		</else>
+
 		</else>		    
 		<br />#ae-portlet.Anonymous# <if @assessments.package_admin_p@><if @assessments.anonymous_p@ eq "f"><a href="@assessments.anonymous_url;noquote@">#assessment.yes#</a>/<b>#assessment.no#</b></if><else><b>#assessment.yes#</b>/<a href="@assessments.anonymous_url;noquote@">#assessment.no#</a></else>
 		</if><else><if @assessments.anonymous_p@ eq "f"><b>#assessment.no#</b></if><else><b>#assessment.yes#</b></else></else>
@@ -71,7 +92,7 @@
     -groupby $groupby_list
 
 set status_clause "and not ci.live_revision is null"
-db_multirow -extend { edit_response_url view_url edit_url assessment_url status_url anonymous_url edit_url results_url package_admin_p } assessments answered_assessments {} {
+db_multirow -extend { edit_response_url view_url edit_url assessment_url status_url anonymous_url edit_url results_url package_admin_p over_p } assessments answered_assessments {} {
 
     set base_url [site_node::get_url_from_object_id -object_id $package_id]
     set package_admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege "admin"]
@@ -84,6 +105,12 @@
 
     set edit_url [export_vars -base ${base_url}asm-admin/assessment-form { assessment_id }]
     set results_url [export_vars -base ${base_url}sessions { assessment_id }]
+
+    if {(![empty_string_p $start_time] && $start_time > $cur_time) || (![empty_string_p $end_time] && $end_time < $cur_time)} {
+	set over_p 1
+    } else {
+	set over_p 0
+    }
 }
 
 if { $community_id ne "" } {
Index: openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql	6 Feb 2006 16:01:07 -0000	1.2
+++ openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql	8 Feb 2006 15:43:14 -0000	1.3
@@ -7,10 +7,15 @@
 	       cf.package_id, p.instance_name as community_name,
 	       sc.node_id as comm_node_id, sa.node_id as as_node_id,
 	       s.session_id, s.completed_datetime, a.anonymous_p, 
-	       a.assessment_id as assessment_rev_id
-	from as_assessments a 
+	       a.assessment_id as assessment_rev_id,
+	       to_char(a.start_time, 'YYYY-MM-DD HH24:MI:SS') as start_time,
+	       to_char(a.end_time, 'YYYY-MM-DD HH24:MI:SS') as end_time,
+	       to_char(now(), 'YYYY-MM-DD HH24:MI:SS') as cur_time
+	from as_assessmentsi a 
 	left join as_sessions s
-	on (a.assessment_id = s.assessment_id
+	on (a.item_id = (select item_id
+			 from cr_revisions 
+			 where revision_id = s.assessment_id)
 	    and s.subject_id = :user_id
 	    and not s.subject_id in (select grantee_id 
 		 		     from acs_permissions_all