Index: openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	26 Jul 2004 18:01:43 -0000	1.11
+++ openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql	27 Jul 2004 03:02:11 -0000	1.12
@@ -246,11 +246,11 @@
 			:revision_id,	
 			:task_id,
 			'evaluation_tasks_sols',	
-			now(), --creation date	
+			:creation_date, --creation date	
 			:creation_user, 
 			:creation_ip,	
 			:title,			
-			now(),  --publish date
+			:publish_date,  --publish date
 			null,  -- nls_language
 			:mime_type --mime_type
 			);
@@ -302,11 +302,11 @@
 			:task_id,
 		    :party_id,
 			'evaluation_answers',	
-			now(), --creation date	
+			:creation_date, --creation date	
 			:creation_user, 
 			:creation_ip,	
 			:title,			
-			now(),  --publish date
+			:publish_date,  --publish date
 			null,  -- nls_language
 			:mime_type --mime_type
 			);
@@ -361,11 +361,11 @@
 			:show_student_p,
 			:description,
 			'evaluation_student_evals',	
-			now(), --creation date	
+			:creation_date, --creation date	
 			:creation_user, 
 			:creation_ip,	
 			:item_name,		    --title
-			now(),  --publish date
+			:publish_date,  --publish date
 			null,  -- nls_language
 			:mime_type --mime_type
 			);
@@ -380,7 +380,7 @@
 													  :group_id,
 													  :group_name,
 													  'closed',
-													  now(),
+													  :creation_date,
 													  :creation_user,
 													  :creation_ip,
 													  :context,
@@ -430,11 +430,11 @@
 			:revision_id,	
 			:task_id,
 			'evaluation_grades_sheets',	
-			now(), --creation date	
+			:creation_date, --creation date	
 			:creation_user, 
 			:creation_ip,	
 			:title,			
-			now(),  --publish date
+			:publish_date,  --publish date
 			null,  -- nls_language
 			:mime_type --mime_type
 			);
Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	26 Jul 2004 18:01:43 -0000	1.11
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl	27 Jul 2004 03:02:12 -0000	1.12
@@ -242,7 +242,7 @@
     Cone a task
 
     @param item_id The item to create.
-    @param from_task_id Task to clon.
+    @param from_task_id Task to clone.
     @param to_grade_id Grade that will "own" the task
 } {
 
@@ -325,17 +325,35 @@
 	return $revision_id
 } 
 
+ad_proc -public evaluation::clone_task_references {
+    -item_id:required
+    -from_task_id:required
+    -to_task_id:required
+} {
+    Cone a task
 
+    @param item_id The item to create.
+    @param from_task_id Task to clone.
+    @param to_task_id Target.
+} {
+    
+    db_transaction {
+	
+    }
+}
+
 ad_proc -public evaluation::new_solution {
-	-item_id:required
-	-content_type:required
-	-content_table:required
-	-content_id:required
-	-new_item_p:required
-	-task_id:required
-	-storage_type:required
-	-title:required
-	{-mime_type "text/plain"}
+    -item_id:required
+    -content_type:required
+    -content_table:required
+    -content_id:required
+    -new_item_p:required
+    -task_id:required
+    -storage_type:required
+    -title:required
+    {-mime_type "text/plain"}
+    {-publish_date ""}
+    {-creation_date ""}
 } {
 
 	Build a new content revision of a task solution.  If new_item_p is
@@ -360,6 +378,14 @@
 
 	set revision_id [db_nextval acs_object_id_seq]
 
+	if { [empty_string_p $publish_date] } {
+	    set publish_date [db_string get_publish_date "select now()"]
+	}
+
+	if { [empty_string_p $creation_date] } {
+	    set creation_date [db_string get_creation_date "select now()"]
+	}
+
 	if { $new_item_p } {
 		db_exec_plsql content_item_new { *SQL* }
 	}
@@ -373,16 +399,18 @@
 
 
 ad_proc -public evaluation::new_answer {
-	-item_id:required
-	-content_type:required
-	-content_table:required
-	-content_id:required
-	-new_item_p:required
-	-task_id:required
-	-storage_type:required
-	-title:required
-	-party_id:required
-	{-mime_type "text/plain"}
+    -item_id:required
+    -content_type:required
+    -content_table:required
+    -content_id:required
+    -new_item_p:required
+    -task_id:required
+    -storage_type:required
+    -title:required
+    -party_id:required
+    {-mime_type "text/plain"}
+    {-publish_date ""}
+    {-creation_date ""}
 } {
 
 	Build a new content revision of an answer.  If new_item_p is
@@ -407,6 +435,14 @@
 
 	set revision_id [db_nextval acs_object_id_seq]
 
+	if { [empty_string_p $publish_date] } {
+	    set publish_date [db_string get_publish_date "select now()"]
+	}
+
+	if { [empty_string_p $creation_date] } {
+	    set creation_date [db_string get_creation_date "select now()"]
+	}
+
 	if { $new_item_p } {
 		db_exec_plsql content_item_new { *SQL* }
 	}
@@ -419,19 +455,21 @@
 } 
 
 ad_proc -public evaluation::new_evaluation {
-	-item_id:required
-	-content_type:required
-	-content_table:required
-	-content_id:required
-	-new_item_p:required
-	-party_id:required
-	-task_id:required
-	-grade:required
-	{-title "evaluation"}
-	{-show_student_p "t"}
-	{-storage_type "text"}
-	{-description ""}
-	{-mime_type "text/plain"}
+    -item_id:required
+    -content_type:required
+    -content_table:required
+    -content_id:required
+    -new_item_p:required
+    -party_id:required
+    -task_id:required
+    -grade:required
+    {-title "evaluation"}
+    {-show_student_p "t"}
+    {-storage_type "text"}
+    {-description ""}
+    {-mime_type "text/plain"}
+    {-publish_date ""}
+    {-creation_date ""}
 } {
 	
 	Build a new content revision of an evaluation.  If new_item_p is
@@ -459,6 +497,14 @@
 
 	set revision_id [db_nextval acs_object_id_seq]
 
+	if { [empty_string_p $publish_date] } {
+	    set publish_date [db_string get_publish_date "select now()"]
+	}
+
+	if { [empty_string_p $creation_date] } {
+	    set creation_date [db_string get_creation_date "select now()"]
+	}
+
 	if { $new_item_p } {
 		db_exec_plsql content_item_new { *SQL* }
 	}
@@ -468,10 +514,11 @@
 } 
 
 ad_proc -public evaluation::new_evaluation_group {
-	-group_id:required
-	-group_name:required
-	-task_id:required
-	{-context ""}
+    -group_id:required
+    -group_name:required
+    -task_id:required
+    {-context ""}
+    {-creation_date ""}
 } {
 
 	Build a new group of type evlaution_groups for the tasks.
@@ -492,6 +539,10 @@
 	set creation_user [ad_verify_and_get_user_id]
 	set creation_ip [ad_conn peeraddr]
 
+	if { [empty_string_p $creation_date] } {
+	    set creation_date [db_string get_creation_date "select now()"]
+	}
+
 	db_exec_plsql evaluation_group_new { *SQL* }
 	
 	return $group_id
@@ -510,15 +561,17 @@
 } 
 
 ad_proc -public evaluation::new_grades_sheet {
-	-item_id:required
-	-content_type:required
-	-content_table:required
-	-content_id:required
-	-new_item_p:required
-	-task_id:required
-	-storage_type:required
-	-title:required
-	-mime_type:required
+    -item_id:required
+    -content_type:required
+    -content_table:required
+    -content_id:required
+    -new_item_p:required
+    -task_id:required
+    -storage_type:required
+    -title:required
+    -mime_type:required
+    {-creation_date ""}
+    {-publish_date ""}
 } {
 
 	Build a new content revision of a grades sheet.  If new_item_p is
@@ -544,6 +597,14 @@
 
 	set revision_id [db_nextval acs_object_id_seq]
 
+	if { [empty_string_p $publish_date] } {
+	    set publish_date [db_string get_publish_date "select now()"]
+	}
+
+	if { [empty_string_p $creation_date] } {
+	    set creation_date [db_string get_creation_date "select now()"]
+	}
+
 	if { $new_item_p } {
 		db_exec_plsql content_item_new { *SQL* }
 	}
Index: openacs-4/packages/evaluation/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/index.tcl	26 Jul 2004 18:01:43 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/index.tcl	27 Jul 2004 03:02:12 -0000	1.9
@@ -39,4 +39,5 @@
 							-url [ad_conn url] \
 						   ]
 
+set uno $dos
 ad_return_template
\ No newline at end of file
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	7 Jul 2004 17:26:44 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp	27 Jul 2004 03:02:13 -0000	1.5
@@ -25,20 +25,20 @@
         <input type=submit value="#evaluation.Grade_1#" > <input type=button value="#evaluation.Go#" onClick="history.go(-1)"> 
    </form> 
 </if> 
-<if %evaluations_na:rowcount% gt 0> 
+<if @evaluations_na:rowcount@ gt 0> 
   <form action="evaluate-students-2" method="post"> 
   @export_vars;noquote@ 
-  <input type=hidden name=task_id value="%task_id%"> 
-  <input type=hidden name=max_grade value="%max_grade%"> 
+  <input type=hidden name=task_id value="@task_id@"> 
+  <input type=hidden name=max_grade value="@max_grade@"> 
   <blockquote> 
     <table> 
 	<multiple name="evaluations_na"> 
-	<if %evaluations_na.rownum% odd> <table bgcolor="#EAF2FF"> </if> 
+	<if @evaluations_na.rownum@ odd> <table bgcolor="#EAF2FF"> </if> 
 	<else><table bgcolor="white"></else> 
-	 <tr><th align="right">#evaluation.Name#</th><td>%evaluations_na.party_name%</td></tr>
-	 <tr><th align="right">#evaluation.Grade#</th><td>%evaluations_na.grade% / %max_grade%</td></tr>
-	 <tr><th align="right">#evaluation.Comments#</th><td>%evaluations_na.comment%</td></tr>
-	 <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>%evaluations_na.show_student%</td></tr>
+	 <tr><th align="right">#evaluation.Name#</th><td>@evaluations_na.party_name@</td></tr>
+	 <tr><th align="right">#evaluation.Grade#</th><td>@evaluations_na.grade@ / @max_grade@</td></tr>
+	 <tr><th align="right">#evaluation.Comments#</th><td>@evaluations_na.comment@</td></tr>
+	 <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_na.show_student@</td></tr>
 	 </tr> 
         </table> 
        </multiple> 
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	14 Jul 2004 17:42:07 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	27 Jul 2004 03:02:13 -0000	1.9
@@ -260,7 +260,7 @@
 	]
 lappend elements show_answer \
     [list label "[_ evaluation.lt_Allow_the_students_br]" \
-	 display_template { <pre>[_ evaluation.Yes_]<input checked type=radio name="show_student_na.@not_evaluated_na.party_id@" value=t> [_ evaluation.No_]<input type=radio name="show_student_na.@not_evaluated_na.party_id@" value=f></pre> } \
+	 display_template { <pre>[_ evaluation.Yes_]<input checked type=radio name="show_student_na.@not_evaluated_na.party_id@" value=t> @not_evaluated_na.party_id@ [_ evaluation.No_]<input type=radio name="show_student_na.@not_evaluated_na.party_id@" value=f></pre> } \
 	]
 
 template::list::create \
@@ -290,7 +290,9 @@
     if { [llength $done_students] > 0 } {
 	set not_in_clause [db_map not_yet_in_clause]
     } else {
-	set not_in_clause "where p.member_state = 'approved'"
+	set not_in_clause ", cc_users cu 
+                           where p.person_id = cu.person_id 
+                             and cu.member_state = 'approved'"
     }
 
     # if this page is called from within a community (dotlrn) we have to show only the students
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	14 Jul 2004 17:42:07 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	27 Jul 2004 03:02:13 -0000	1.10
@@ -324,7 +324,12 @@
 			     -mime_type $mime_type]
 	
 	evaluation::set_live -revision_id $revision_id
+
 	
+	if { ![ad_form_new_p -key task_id] } {
+	    evaluation::clone_task_references -from_task_id $task_id -to_task_id $revision_id
+	} 
+	
 	if { ![empty_string_p $upload_file] }  {
 	    
 	    set tmp_file [template::util::file::get_property tmp_filename $upload_file]