Index: openacs-4/packages/evaluation/evaluation.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/evaluation/evaluation.info	14 May 2004 23:42:27 -0000	1.5
+++ openacs-4/packages/evaluation/evaluation.info	22 May 2004 01:20:24 -0000	1.6
@@ -16,10 +16,10 @@
         <requires url="notifications" version="5.0.0b4"/>
 
         <callbacks>
-            <callback type="after-instantiate"  proc="evaluation::apm_callbacks::package_instantiate"/>
-            <callback type="before-uninstantiate"  proc="evaluation::apm_callbacks::package_uninstantiate"/>
-            <callback type="before-uninstall"  proc="evaluation::apm_callbacks::package_uninstall"/>
-            <callback type="before-install"  proc="evaluation::apm_callbacks::package_install"/>
+            <callback type="before-uninstall"  proc="evaluation::apm::package_uninstall"/>
+            <callback type="before-uninstantiate"  proc="evaluation::apm::package_uninstantiate"/>
+            <callback type="before-install"  proc="evaluation::apm::package_install"/>
+            <callback type="after-instantiate"  proc="evaluation::apm::package_instantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxNumberOfBytes"  default="5000" description="Maximun number of bytes allowed for the files in this package. (tasks, tasks sols, student answers, grades sheets, ect)"/>
Index: openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	12 May 2004 02:07:44 -0000	1.2
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	22 May 2004 01:20:24 -0000	1.3
@@ -1048,13 +1048,8 @@
         p_description, -- description
 		p_parent_id      -- parent_id
     );
-	-- associate content types with the folder
+	-- associate content types witQh the folder
     PERFORM content_folder__register_content_type (
-        v_folder_id, -- folder_id
-        ''evaluation_grades'',    -- content_type
-        ''t''        -- include_subtypes
-    );
-    PERFORM content_folder__register_content_type (
         v_folder_id,          -- folder_id
         p_content_type, -- content_type
         ''t''                 -- include_subtypes
Index: openacs-4/packages/evaluation/www/task-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/task-view-postgresql.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/task-view-postgresql.xql	22 May 2004 01:20:24 -0000	1.2
@@ -14,7 +14,8 @@
                et.data as task_data,
                ets.title as solution_title,
                ets.data as solution_data,
-               eg.grade_name, eg.weight as grade_weight
+               eg.grade_name, eg.weight as grade_weight,
+	       ets.revision_id
         from evaluation_grades eg, evaluation_tasksi et 
                left outer join evaluation_tasks_solsi ets on (ets.task_id = et.task_id and content_revision__is_live(ets.solution_id) = true) 
         where et.task_id = :task_id
Index: openacs-4/packages/evaluation/www/task-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/task-view.adp	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/task-view.adp	22 May 2004 01:20:24 -0000	1.2
@@ -47,4 +47,7 @@
 
 </table>
 
+<if @return_url@ ne "">
+  <p><a href=@return_url@>Go Back</a></p>
+</if>
 
Index: openacs-4/packages/evaluation/www/task-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/task-view.tcl	19 May 2004 17:33:08 -0000	1.2
+++ openacs-4/packages/evaluation/www/task-view.tcl	22 May 2004 01:20:24 -0000	1.3
@@ -10,7 +10,7 @@
     grade_id:integer,notnull
     task_id:integer,notnull,optional
     item_id:integer,notnull,optional
-    {return_url "/"}
+    {return_url ""}
 }
 
 set package_id [ad_conn package_id]
@@ -52,7 +52,7 @@
 	set solution_url "<a href=\"$solution_data\">$solution_data</a>"
 } else {
 	# we assume it's a file
-	set solution_url "<a href=\"../view/$solution_title\">$solution_title</a>"
+    set solution_url "<a href=\"[export_vars -base "view/$solution_title" { revision_id }]\">$solution_title</a>"
 }
 
 ad_return_template
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	19 May 2004 17:33:09 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	22 May 2004 01:20:25 -0000	1.4
@@ -126,7 +126,7 @@
 }
 
 if { ![empty_string_p $tmp_filename] } {
-    
+
     set tmp_filename "${tmp_filename}_grades_sheet"
 
     db_transaction {
@@ -141,17 +141,11 @@
 	evaluation::set_live -revision_id $revision_id
 
 	# create the new item
-	db_dml lob_content " 		update cr_revisions	
-			set lob = [set __lob_id [db_string get_lob_id "select empty_lob()"]]
-			where revision_id = :revision_id
-		" -blob_files [list $tmp_filename]
+	db_dml lob_content { *SQL* } -blob_files [list $tmp_filename]
 	
 	set content_length [file size $tmp_filename]
 	# Unfortunately, we can only calculate the file size after the lob is uploaded 
-	db_dml lob_size { 	update cr_revisions
-	    set content_length = :content_length
-	    where revision_id = :revision_id
-	}
+	db_dml lob_size { *SQL* }
 	
 	foreach party_id [array names grades_gs] {
 	    if { ![info exists comments_gs($party_id)] } {
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl	19 May 2004 17:33:09 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl	22 May 2004 01:20:25 -0000	1.3
@@ -97,11 +97,11 @@
 		set comments [string trim [lindex $evaluation 3]]
 		
 		# removing the first and last " that comes from the csv format
-		regsub  ^\" $comments "" see_comments
-		regsub  \"\$ $comments "" see_comments
+		regsub  ^\" $comments "" comments
+		regsub  \"\$ $comments "" comments
 		
 		if { [empty_string_p $party_id] && [empty_string_p $grade] && [empty_string_p $comments] } { 
-			# "blank" line, jump it
+			# "blank" line, skip it
 			continue 
 		} 
 		
@@ -123,9 +123,9 @@
 			} 
 
 			# editing without reason
-			if { [string compare [db_string check_evaluated { *SQL* } -default $grade] $grade] && [empty_string_p $comments] } { 
+			if { ![string eq [format %.2f [db_string check_evaluated { *SQL* } -default $grade]] [format %.2f $grade]] && [empty_string_p $comments] } { 
 				incr errors
-				append errors_text "<li> There must be an edit reason if you want to edit the grade on party_id ${party_id}.</li>"
+			    append errors_text "<li> (ahora $grade, antes [db_string check_evaluated { *SQL* } -default $grade] There must be an edit reason if you want to edit the grade on party_id ${party_id}.</li>"
 			} 
 			
 			if { $errors } { 
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql	22 May 2004 01:20:25 -0000	1.2
@@ -37,6 +37,17 @@
       </querytext>
 </fullquery>
 
+<fullquery name="count_evaluated_students">      
+      <querytext>
+
+		select count(*) 
+		from evaluation_student_evals 
+		where task_id = :task_id 
+		and content_revision__is_live(evaluation_id) = true
+	
+      </querytext>
+</fullquery>
+
 <partialquery name="processed_clause">
 	  <querytext>         
 
@@ -49,7 +60,7 @@
       <querytext>
 
 	select evaluation__party_name(ea.party_id, ea.task_id) as party_name,
-    ea.party_id,
+        ea.party_id,
 	ea.data as answer_data,
 	ea.title as answer_title,
 	ea.revision_id,
@@ -59,10 +70,10 @@
 	from evaluation_answersi ea, 
 	     evaluation_tasks et
 	where ea.task_id = et.task_id
-      and et.task_id = :task_id
-      and ea.data is not null
+          and et.task_id = :task_id
+          and ea.data is not null
 	  and content_revision__is_live(ea.answer_id) = true
-    $processed_clause
+        $processed_clause
 	
       </querytext>
 </fullquery>
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.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	19 May 2004 17:33:09 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	22 May 2004 01:20:25 -0000	1.4
@@ -239,15 +239,25 @@
 	set not_in_clause ""
     }
     set not_evaluated_with_no_answer [db_string count_not_eval_na { *SQL* }]
-    set sql_query [db_map sql_query_one]
+    set sql_query [db_map sql_query_groups]
 } else {
+    set community_id [dotlrn_community::get_community_id]
     if { [llength $done_students] > 0 } {
 	set not_in_clause [db_map not_yet_in_clause]
     } else {
-	set not_in_clause ""
+	set not_in_clause "where p.member_state = 'approved'"
     }
-    set not_evaluated_with_no_answer [db_string get_not_evaluated_left { *SQL* }]
-    set sql_query [db_map sql_query_two]
+
+    # if this page is called from within a community (dotlrn) we have to show only the students
+
+    if { [empty_string_p $community_id] } {
+	set not_evaluated_with_no_answer [db_string get_not_evaluated_left { *SQL* }]
+	set sql_query [db_map sql_query_individual]
+    } else {
+	set not_evaluated_with_no_answer [db_string get_community_not_evaluated_left { *SQL* }]
+	set sql_query [db_map sql_query_community_individual]
+    }
+
 }
 
 db_multirow not_evaluated_na get_not_evaluated_na_students { *SQL* } {
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql	22 May 2004 01:20:25 -0000	1.2
@@ -21,14 +21,6 @@
       </querytext>
 </fullquery>
 
-<fullquery name="count_evaluated_students">      
-      <querytext>
-
-		select count(*) from evaluation_student_evals where task_id = :task_id
-	
-      </querytext>
-</fullquery>
-
 <fullquery name="get_not_evaluated_na">      
       <querytext>
 
@@ -67,7 +59,23 @@
       </querytext>
 </fullquery>
 
-<partialquery name="sql_query_one">
+<fullquery name="get_community_not_evaluated_left">      
+      <querytext>
+
+		select count(*) 
+		from cc_users p,
+		registered_users ru,
+                dotlrn_member_rels_approved app
+		$not_in_clause
+	        and app.community_id = :community_id
+                and app.user_id = ru.user_id
+	        and app.user_id = p.person_id
+	        and app.role = 'student'
+	
+      </querytext>
+</fullquery>
+
+<partialquery name="sql_query_groups">
 	  <querytext>         
 		select acs_group__name(etg.group_id) as party_name,
 		etg.group_id as party_id
@@ -78,7 +86,7 @@
 	  </querytext>
 </partialquery>
 
-<partialquery name="sql_query_two">
+<partialquery name="sql_query_individual">
 	  <querytext>         
 		select p.person_id as party_id,
 		p.last_name||', '||p.first_names as party_name
@@ -88,6 +96,22 @@
 	  </querytext>
 </partialquery>
 
+<partialquery name="sql_query_community_individual">
+	  <querytext>         
+            select app.user_id as party_id,
+  		   p.last_name||', '||p.first_names as party_name
+            from registered_users ru,
+                 dotlrn_member_rels_approved app,
+		 cc_users p
+            $not_in_clause
+	      and app.community_id = :community_id
+              and app.user_id = ru.user_id
+	      and app.user_id = p.person_id
+	      and app.role = 'student'
+	      $orderby_na
+	  </querytext>
+</partialquery>
+
 <fullquery name="get_not_evaluated_na_students">      
       <querytext>
 
Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql	22 May 2004 01:20:25 -0000	1.2
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.4</version></rdbms>
 
 <fullquery name="get_evaluation_groups">      
       <querytext>
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/one-task.adp	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.adp	22 May 2004 01:20:25 -0000	1.2
@@ -2,7 +2,7 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<if @students_without_group:rowcount@ gt 0>
+<if @@query_name@:rowcount@ gt 0>
 	<table width="100%">
 		<tr>
 		<td align=right>@reuse_link;noquote@</td>
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/one-task.tcl	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.tcl	22 May 2004 01:20:25 -0000	1.2
@@ -24,9 +24,20 @@
 set page_title "Groups for task $task_name"
 set context [list "Task Groups"]
 
+# we have to decide if we are going to show all the users in the system
+# or only the students of a given class (community in dotrln)
+# in order to create the groups
+
+set community_id [dotlrn_community::get_community_id]
+if { [empty_string_p $community_id] } {
+    set query_name students_without_group
+} else {
+    set query_name community_students_without_group
+}
+
 set elements [list associate \
 				  [list label "" \
-				   display_template { <input type=checkbox name=student_ids.@students_without_group.student_id@ value=@students_without_group.student_id@> } \
+				   display_template { <input type=checkbox name=student_ids.@query_name@.student_id@ value=@@query_name@.student_id@> } \
 				   ] \
 				  student_name \
 				  [list label "Name" \
@@ -38,13 +49,12 @@
 					   link_html { title "Associate to group..." }] \
 				  ]
 
-
 template::list::create \
     -name students_without_group \
-    -multirow students_without_group \
-	-key student_id \
-	-pass_properties { return_url student_id } \
-	-filters { task_id {} } \
+    -multirow $query_name \
+    -key student_id \
+    -pass_properties { return_url student_id query_name } \
+    -filters { task_id {} } \
     -elements $elements 
 
 
@@ -54,7 +64,7 @@
     set orderby " order by student_name asc"
 }
 
-db_multirow -extend { associate_to_group_url associate_to_group } students_without_group get_students_without_group { *SQL* } {
+db_multirow -extend { associate_to_group_url associate_to_group } $query_name get_$query_name { *SQL* } {
 	set associate_to_group_url [export_vars -base "group-member-add" -url { task_id student_id }]
 	set associate_to_group "Associate to group..."
 }
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/groups/one-task.xql	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.xql	22 May 2004 01:20:25 -0000	1.2
@@ -35,6 +35,28 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_community_students_without_group">      
+      <querytext>
+
+		select p.last_name ||', '|| p.first_names as student_name,
+		p.person_id as student_id
+		from cc_users p,
+		registered_users ru,
+                dotlrn_member_rels_approved app
+		where p.person_id not in (select map.object_id_two from acs_rels map, evaluation_task_groups etg 
+							  where map.object_id_two = p.person_id
+							  and map.object_id_one = etg.group_id
+							  and etg.task_id = :task_id
+							  and map.rel_type = 'evaluation_task_group_rel')
+	        and app.community_id = :community_id
+                and app.user_id = ru.user_id
+	        and app.user_id = p.person_id
+	        and app.role = 'student'		
+		$orderby
+	
+      </querytext>
+</fullquery>
+
 <fullquery name="get_task_groups">      
       <querytext>
 
@@ -65,7 +87,8 @@
 <fullquery name="get_groups_for_task">      
       <querytext>
 
-		select count(*) from evaluation_task_groups where task_id = :task_id
+		select count(*) from evaluation_task_groups 
+		where task_id = :task_id
 	
       </querytext>
 </fullquery>
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit-postgresql.xql	22 May 2004 01:20:25 -0000	1.2
@@ -9,7 +9,8 @@
 		select content_revision__get_content(ets.solution_id) as content, 
 		crr.title,
 		crr.item_id,
-		cri.storage_type
+		cri.storage_type,
+		crr.revision_id
 		from evaluation_tasks_sols ets, cr_items cri, cr_revisions crr
 		where ets.solution_id = :solution_id
 		  and ets.solution_id = crr.revision_id
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	19 May 2004 17:33:09 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	22 May 2004 01:20:25 -0000	1.3
@@ -65,7 +65,7 @@
 					{label "File"} 
 					{html "size 30"}
 					{value "[return $title]"}
-					{after_html "<a href=../view/$title>$title</a>"}
+				    {after_html "<a href=\"[export_vars -base \"../../view/$title\" { revision_id }]\">$title</a>"}
 				}
 				{unattach_p:text(hidden)
 				}
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.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	19 May 2004 17:33:09 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	22 May 2004 01:20:25 -0000	1.4
@@ -7,13 +7,13 @@
     @creation-date Mar 2004
     @cvs-id $Id$
 } {
-	grade_id:integer,notnull
-	task_id:integer,notnull,optional
-	item_id:integer,notnull,optional
+    grade_id:integer,notnull
+    task_id:integer,notnull,optional
+    item_id:integer,notnull,optional
     upload_file:trim,optional
     upload_file.tmpfile:tmpfile,optional
-	{mode "edit"}
-	return_url
+    {mode "edit"}
+    return_url
 }
 
 set package_id [ad_conn package_id]
@@ -268,7 +268,7 @@
 	if { [ad_form_new_p -key task_id] } {
 	    set item_id $task_id
 	} 
-	
+
 	set revision_id [evaluation::new_task -new_item_p [ad_form_new_p -key grade_id] -item_id $item_id -content_type evaluation_tasks \
 			     -content_table evaluation_tasks -content_id task_id -name $task_name -description $description -weight $weight \
 			     -grade_id $grade_id -number_of_members $number_of_members -online_p $online_p -storage_type $storage_type \
Index: openacs-4/packages/evaluation/www/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/index.vuh,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/view/index.vuh	28 Apr 2004 11:09:54 -0000	1.1
+++ openacs-4/packages/evaluation/www/view/index.vuh	22 May 2004 01:20:26 -0000	1.2
@@ -15,14 +15,9 @@
 set package_id [ad_conn package_id]
 
 # Get the IDs
-set content_type [db_string get_content_type "select cri.content_type
-                                              from cr_items cri, cr_revisions crr
-                                              where cri.item_id = crr.item_id 
- 											    and crr.revision_id = :revision_id"]
+set content_type [db_string get_content_type { *SQL* }]
 
-set content_root [db_string get_folder_id "select crf.folder_id 
-										   from cr_folders crf
-										   where crf.label = :content_type||'_'||:package_id"]
+set content_root [db_string get_folder_id { *SQL* }]
 
 set template_root ""