Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml	18 Nov 2004 00:19:02 -0000	1.5.2.1
+++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml	8 Jun 2005 22:35:40 -0000	1.5.2.2
@@ -4,51 +4,80 @@
   <msg key="Add_grade_name_">Add %grade_name% </msg>
   <msg key="Addedit_answer_">Add/edit answer </msg>
   <msg key="Addedit_solution_">Add/edit solution </msg>
-  <msg key="Assignments_">Assignments </msg>
+  <msg key="admin_help">Create, change or delete a course assignment type.</msg>
+  <msg key="Assignments">Assignments</msg>
+  <msg key="Assignments_">Gradebook </msg>
   <msg key="Audit_Info_">Audit Info. </msg>
   <msg key="Audit_info_">Audit info </msg>
-  <msg key="Comments_">Comments </msg>
+  <msg key="class_total">&lt;center&gt;&lt;text class=&quot;blue&quot;&gt;Your total grade in this class is: &lt;b&gt;%total_class_grade%/%max_possible_grade% &lt;/b&gt;&lt;/text&gt;&lt;/center&gt;</msg>
+  <msg key="Comments_">&lt;center&gt;COMMENTS
+&lt;/center&gt;</msg>
+  <msg key="delete">Delete</msg>
   <msg key="Delete_task_">Delete task </msg>
-  <msg key="Due_date_">Due date </msg>
+  <msg key="Due_date_">&lt;center&gt;DUE DATE&lt;/center&gt;</msg>
+  <msg key="edit">Edit</msg>
+  <msg key="edit_grade_scale">Edit Grading Scale</msg>
   <msg key="Edit_task_">Edit task </msg>
-  <msg key="Evaluations_">Evaluations </msg>
-  <msg key="Grade_over_100_">Grade over 100 </msg>
+  <msg key="email_notif">&lt;text class=&quot;blue&quot;&gt;Email Notification?&lt;/text&gt;</msg>
+  <msg key="evaluate">Evaluate</msg>
+  <msg key="Evaluations_">Evaluations</msg>
+  <msg key="full_version">Full Version: Assignments and Evaluations Portlet</msg>
+  <msg key="grade">GRADE</msg>
+  <msg key="Grade_over_100_">&lt;center&gt;GRADE % &lt;br&gt;(OF 100%) &lt;/center&gt;</msg>
   <msg key="Grades">Report</msg>
   <msg key="Groups_Admin_">Groups Admin. </msg>
-  <msg key="lt_Admin_my_Assignment_T">Admin my Assignment Types</msg>
+  <msg key="lt_Admin_my_Assignment_T">Modify Assignment Types</msg>
   <msg key="lt_Administer_Evaluation">Administer Evaluation</msg>
-  <msg key="lt_Edit_grades_distribut">Edit grades distribution of %grade_plural_name% </msg>
+  <msg key="lt_Edit_grades_distribut">Edit grades distribution of %low_name% </msg>
   <msg key="lt_Evaluation_Admin_Port">Evaluation Admin Portlet </msg>
   <msg key="lt_Evaluation_Administra">Evaluation Administration </msg>
   <msg key="lt_Evaluation_Assignment">Evaluation Assignments Portlet </msg>
   <msg key="lt_Evaluation_Evaluation">Evaluation Evaluations Portlet </msg>
   <msg key="lt_Groups_administration">Groups administration </msg>
   <msg key="lt_smallTotal_points_in_">&lt;small&gt;Total points in this category: %total_grade%/%max_grade%&lt;br /&gt;
-                     This grade category represents the %grade_weight%% of the 100% of the class&lt;/small&gt; </msg>
-  <msg key="lt_smallWeight_used_in_g">&lt;small&gt;Weight used in %grade_plural_name%: %category_weight%% (over 100% of %grade_plural_name%) &lt;br /&gt;
-                      %grade_plural_name% represents %grade_weight%% of the 100% of the class&lt;/small&gt; </msg>
+                     This grade category represents the %grade_weight%% of the 100% of the class
+&lt;small&gt;</msg>
+  <msg key="lt_smallTotal_points_in__1">&lt;text class=&quot;blue&quot;&gt;%grade_plural_name%  TOTAL:&lt;/text&gt;</msg>
+  <msg key="lt_smallWeight_used_in_g">&lt;text class=&quot;blue&quot;&gt;&lt;b&gt;%grade_plural_name% TOTALS:&lt;/text&gt;</msg>
   <msg key="lt_submit_answer_style_f">submit answer &lt;style font-color:red&gt;late&lt;/style&gt; </msg>
   <msg key="lt_submit_answer_style_f_1">submit answer &lt;style font-color:red&gt;late&lt;/style&gt; again </msg>
   <msg key="lt_There_are_no_tasks_fo">There are no tasks for this package.</msg>
   <msg key="lt_There_are_no_tasks_to">There are no tasks to evaluate for this package.</msg>
   <msg key="lt_There_should_be_only_">There should be only one instance of evaluation for admin purposes </msg>
   <msg key="lt_View_evaluation_comme">View evaluation comments </msg>
-  <msg key="lt_View_evaluation_detai">View evaluation details \</msg>
+  <msg key="lt_View_evaluation_detai">View comments</msg>
   <msg key="lt_Your_total_grade_in_t">Your total grade in this class is:</msg>
-  <msg key="Name_">Name </msg>
+  <msg key="maximum">(maximum)</msg>
+  <msg key="Name_">NAME</msg>
   <msg key="Net_Value_">Net Value </msg>
   <msg key="No_assignments_">No assignments </msg>
   <msg key="No_group_for_task_">No group for task </msg>
   <msg key="Not_available_">Not available </msg>
   <msg key="Not_evaluated_">Not evaluated </msg>
+  <msg key="notif_help">Text for notifications</msg>
+  <msg key="point_value">POINT VALUE</msg>
+  <msg key="Points">&lt;center&gt;POINTS MADE&lt;/center&gt;</msg>
+  <msg key="points_value">POINTS VALUE</msg>
+  <msg key="select_version">Select Portlet Version</msg>
+  <msg key="simple_version">Simple Version: Evaluations Portlet</msg>
+  <msg key="solution">SOLUTION</msg>
   <msg key="submit_answer_">submit answer </msg>
   <msg key="submit_answer_again_">submit answer again </msg>
+  <msg key="Submitted">SUBMITTED</msg>
   <msg key="task_name_No_data_">%task_name% (No data) </msg>
   <msg key="task_name_URL_">%task_name% (URL) </msg>
+  <msg key="total_grade">of Total Grade</msg>
+  <msg key="Total_Points">&lt;center&gt;TOTAL POINTS
+&lt;/center&gt;</msg>
   <msg key="Upload_Solution_">Upload Solution </msg>
+  <msg key="version_label">Choose your portlet version:</msg>
   <msg key="View_comments_">View comments </msg>
+  <msg key="view_grades_help">View students grades across all assignments and evaluations.</msg>
   <msg key="View_my_answer_">View my answer </msg>
+  <msg key="view_students_grades">View Students Grades</msg>
   <msg key="View_task_">View task </msg>
   <msg key="ViewEdit_Solution_">View/Edit Solution </msg>
-  <msg key="Weight_">Weight </msg>
+  <msg key="Weight_">ITEM WEIGHT</msg>
+  <msg key="weight_possible_of_grade_">&lt;text class=&quot;blue&quot;&gt;(of a possible 100% of &lt;/text&gt;</msg>
+  <msg key="weight_possible_of_grade_p">&lt;text class=&quot;blue&quot;&gt;(of a possible 100% of %grade_plural_name%)</msg>
 </message_catalog>
Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/lib/tasks-chunk-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/lib/tasks-chunk.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl	18 Nov 2004 00:19:04 -0000	1.5.2.1
+++ openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl	8 Jun 2005 22:35:43 -0000	1.5.2.2
@@ -6,6 +6,7 @@
     @creation-date May 2004
     @author jopez@galileo.edu
     @cvs-id $Id$
+
 }
 
 namespace eval evaluation_portlet {}
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql	18 Nov 2004 00:19:04 -0000	1.1.2.1
+++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs-postgresql.xql	8 Jun 2005 22:35:43 -0000	1.1.2.2
@@ -26,5 +26,16 @@
     
       </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>
Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl,v
diff -u -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl	26 Apr 2005 21:45:56 -0000	1.5.2.3
+++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl	8 Jun 2005 22:35:43 -0000	1.5.2.4
@@ -6,6 +6,7 @@
     @author jopez@galileo.edu
     @cvs_id $Id$
 
+
 }
 
 namespace eval evaluation_assignments_portlet {}
@@ -146,6 +147,7 @@
     
     @return element_id The new element's id
 } {
+
     return [portal::add_element_parameters \
                 -portal_id $portal_id \
                 -portlet_name [get_my_name] \
@@ -608,3 +610,15 @@
         -contract_name "portal_datasource" \
         -impl_name "evaluation_admin_portlet"
 }
+ad_proc -private evaluation_evaluations_portlet::get_package_id_from_key {
+    {-package_key:required}
+} {
+    Gets the package_id of the evaluation instance related to the evaluation portlet for this community
+} {
+    set community_id [dotlrn_community::get_community_id]
+    set package_id  [db_string get_package_id {} -default 0]
+    return $package_id
+}
+
+
+
Index: openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl	8 Jun 2005 22:23:37 -0000	1.3.2.2
+++ openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl	8 Jun 2005 22:36:14 -0000	1.3.2.3
@@ -6,6 +6,7 @@
     @author jopez@galileo.edu
     @creation-date May 2004
     @cvs_id $Id$
+
 } -properties {
     
 }
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl	18 Nov 2004 00:19:04 -0000	1.6.2.1
+++ openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl	8 Jun 2005 22:36:14 -0000	1.6.2.2
@@ -6,6 +6,7 @@
     @author jopez@galileo.edu
     @creation-date May 2004
     @cvs_id $Id$
+
 } {
     item_id:integer,notnull,optional,multiple
     {assignments_orderby ""}
Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl,v
diff -u -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl	8 Jun 2005 22:23:37 -0000	1.6.2.2
+++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl	8 Jun 2005 22:36:14 -0000	1.6.2.3
@@ -6,6 +6,7 @@
     @author jopez@galileo.edu
     @creation-date May 2004
     @cvs_id $Id$
+
 } {
     item_id:integer,notnull,optional,multiple
     {evaluations_orderby ""}
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.xql'.
Fisheye: No comparison available.  Pass `N' to diff?