Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list-oracle.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list-oracle.xql	18 Apr 2005 07:47:34 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list-oracle.xql	4 Oct 2005 17:56:17 -0000	1.2.2.1
@@ -9,12 +9,13 @@
 	select ev.party_id,
 	evaluation.party_name(ev.party_id,et.task_id) as party_name,
 	round(ev.grade,2) as grade,
-	to_char(ev.last_modified,'YYYY-MM-DD HH24:MI:SS') as evaluation_date_ansi,
 	ev.last_modified as evaluation_date,
 	to_char(ev.last_modified, 'YYYY-MM-DD HH24:MI:SS') as evaluation_date_ansi,
 	et.online_p,
 	et.due_date,
-	ev.evaluation_id
+	ev.evaluation_id,
+	et.forums_related_p,
+	(select description from evaluation_student_evalsx where evaluation_id=ev.evaluation_id) as comments
 	from evaluation_tasks et,
 	     evaluation_student_evalsi ev,
 	     $roles_table	
Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql	7 Apr 2005 11:26:30 -0000	1.3
+++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql	4 Oct 2005 18:00:36 -0000	1.3.2.1
@@ -36,5 +36,76 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_tasks_admin">      
+      <querytext>
+	select et.task_name, 
+	round(et.weight,2) as task_weight,
+        et.task_id, nvl(perfect_score,0) as perfect_score, online_p
+	from evaluation_tasksi et, cr_items cri
+	where grade_item_id = :grade_item_id
+	  and cri.live_revision = et.task_id
+      $evaluations_orderby
+      </querytext>
+</fullquery>
 
+<fullquery name="get_grade_tasks">      
+      <querytext>
+
+	select et.task_name, 
+	et.task_item_id,
+	et.weight as t_weight,
+	eg.weight as g_weight,
+	round((et.weight*eg.weight)/100,2) as task_weight,
+	et.number_of_members, 
+	et.online_p,
+	et.due_date,
+	et.late_submit_p,
+        et.task_id, nvl(perfect_score,0) as perfect_score
+	from evaluation_grades eg,
+	evaluation_tasksi et,
+	cr_items cri
+	where eg.grade_id = :grade_id
+	and eg.grade_item_id = et.grade_item_id
+	and cri.live_revision = et.task_id
+	$evaluations_orderby
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="compare_due_date">      
+      <querytext>
+	select 1 from dual where :due_date > sysdate
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="answer_info">      
+      <querytext>
+
+      select ea.answer_id
+      from evaluation_answers ea, cr_items cri
+      where ea.task_item_id = :task_item_id 
+      and cri.live_revision = ea.answer_id
+      and ea.party_id = 
+	( select 
+	CASE  
+	  WHEN et3.number_of_members = 1 THEN 
+	  (select user_id from users where user_id=:user_id)
+	  ELSE  
+	(select etg2.group_id from evaluation_task_groups etg2, 
+                                                      evaluation_tasks et2, 
+                                                      acs_rels map 
+                                                      where map.object_id_one = etg2.group_id 
+                                                        and map.object_id_two = :user_id 
+                                                        and etg2.task_item_id = et2.task_item_id 
+                                                        and et2.task_id = :task_id) 
+	END as nom 
+               from evaluation_tasks et3 
+              where et3.task_id = :task_id 
+	) 
+
+      </querytext>
+</fullquery>
+
+
 </queryset>
Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql	31 May 2005 23:13:21 -0000	1.3.2.1
+++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.xql	4 Oct 2005 18:00:36 -0000	1.3.2.2
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
 
 <fullquery name="get_grade_info">      
       <querytext>
@@ -11,4 +10,16 @@
       </querytext>
 </fullquery>
 
+<fullquery name="solution_info">      
+      <querytext>
+
+	    select ets.solution_id
+	    from evaluation_tasks_sols ets, cr_items cri
+	    where ets.task_item_id = (select task_item_id from evaluation_tasks where task_id=:task_id)
+	    and cri.live_revision = ets.solution_id
+	
+      </querytext>
+</fullquery>
+
+
 </queryset>
Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql	7 Apr 2005 18:57:35 -0000	1.2
+++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql	4 Oct 2005 18:01:49 -0000	1.2.2.1
@@ -27,4 +27,13 @@
       </querytext>
 </fullquery>
  
+<fullquery name="evaluation_evaluations_portlet::get_package_id_from_key.get_package_id">      
+      <querytext>
+	select dca.package_id 
+	from dotlrn_community_applets dca,apm_packages ap 
+	where community_id=:community_id 
+	and ap.package_id=dca.package_id and ap.package_key=:package_key
+      </querytext>
+</fullquery>
+
 </queryset>