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.4 -r1.5
--- openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	31 May 2004 17:04:57 -0000	1.4
+++ openacs-4/packages/evaluation/sql/postgresql/evaluation-create.sql	7 Jun 2004 16:04:53 -0000	1.5
@@ -7,6 +7,7 @@
 				constraint evaluation_grades_id_fk
 				references cr_revisions(revision_id),
 	grade_name	varchar(100),
+	grade_plural_name varchar(100),
 	comments	text,
 	-- percentage of this grade type in the class
 	weight		numeric
@@ -70,23 +71,6 @@
 	null		-- name_method
 );
 
-
--- We need a way to group tasks because there may be the case when a professor/TA
--- would want to assign a task to more than one class, and the task must be
--- associated with the tasks of the other classes.
-
-
-create table evaluation_tasks_class_map (
-	package_id  		integer
-				constraint evaluations_tasks_cmap_cid_fk
-				references apm_packages,
-	revision_id		integer
-				constraint evaluations_tasks_cmap_fid_fk
-				references cr_revisions,
-	constraint evaluaition_tasks_cmap_pk
-				primary key (package_id, revision_id)
-);
-
 create table evaluation_tasks_sols (
 	solution_id	integer
 				primary key,
@@ -313,22 +297,23 @@
 -- GRADES
 ---------------------------------------
 
-create function evaluation__new_grade (integer, integer, varchar, numeric, varchar, timestamptz, integer, varchar, varchar, varchar, timestamptz, varchar, varchar)
+create function evaluation__new_grade (integer, integer, varchar, varchar, numeric, varchar, timestamptz, integer, varchar, varchar, varchar, timestamptz, varchar, varchar)
 returns integer as '
 declare
 	p_item_id			alias for $1;
 	p_revision_id		alias for $2;
 	p_grade_name 		alias for $3;
-	p_weight			alias for $4;
-	p_object_type		alias for $5;
-	p_creation_date		alias for $6;
-	p_creation_user 	alias for $7;
-	p_creation_ip		alias for $8;
-	p_title				alias for $9; -- default null
-	p_description		alias for $10; -- default null
-	p_publish_date		alias for $11;
-	p_nls_language   	alias for $12; -- default null
-	p_mime_type   		alias for $13; -- default null
+	p_grade_plural_name  	alias for $4;
+	p_weight			alias for $5;
+	p_object_type		alias for $6;
+	p_creation_date		alias for $7;
+	p_creation_user 	alias for $8;
+	p_creation_ip		alias for $9;
+	p_title				alias for $10; -- default null
+	p_description		alias for $11; -- default null
+	p_publish_date		alias for $12;
+	p_nls_language   	alias for $13; -- default null
+	p_mime_type   		alias for $14; -- default null
 
 	v_revision_id		integer;
 
@@ -351,12 +336,14 @@
 
 	insert into evaluation_grades
 			(grade_id, 
-			grade_name, 
+			grade_name,
+			grade_plural_name, 
 			comments, 
 			weight)
 	values
 			(v_revision_id, 
 			p_grade_name, 
+			p_grade_plural_name,
 			p_description,
 			p_weight);