Index: openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql	25 Oct 2004 18:33:14 -0000	1.1
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet-postgresql.xql	8 Jan 2005 16:30:07 -0000	1.2
@@ -1,21 +1,24 @@
-<?xml version="1.0"?>
-
-<queryset>
-<rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="get_grades">      
-      <querytext>
-
-		select eg.grade_plural_name,
-		eg.grade_id,
-		eg.grade_item_id
-   	 	from evaluation_grades eg, acs_objects ao, cr_items cri
-		where cri.live_revision = eg.grade_id
-	          and eg.grade_item_id = ao.object_id	
-   		  and ao.context_id in  ([join $list_of_package_ids ,])
-		order by grade_plural_name desc
-	
-      </querytext>
-</fullquery>
-
-</queryset>
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="assessments">
+        <querytext>
+	   select cri.item_id as assessment_id, 
+            crr.title, 
+	    crr.description,
+	    acs_object__name(apm_package__parent_id(crf.package_id)) as parent_name,
+            (select site_node__url(site_nodes.node_id)
+              from site_nodes
+             where site_nodes.object_id = crf.package_id) as url
+	   from as_assessments asa, cr_items cri, cr_revisions crr, cr_folders crf
+	   where crr.revision_id = asa.assessment_id
+	     and crr.revision_id = cri.latest_revision
+	     and cri.parent_id = crf.folder_id
+	     and crf.package_id in ([join $list_of_package_ids ", "])
+	   order by lower(crr.title)
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/assessment-portlet/www/assessment-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.adp	25 Nov 2004 11:19:08 -0000	1.3
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.adp	8 Jan 2005 16:30:07 -0000	1.4
@@ -1,13 +1,21 @@
-  <if @shaded_p@ ne "t">
-      <if @one_instance_p@ true>
-          <include src="/packages/assessment/lib/user-assessment" package_id="@list_of_package_ids@" />
-      </if>
-      <else>
-          <list name="list_of_package_ids">
-              <include src="/packages/assessment/lib/user-assessment" package_id="@list_of_package_ids:item@" />
-          </list>
-      </else>
-  </if>
-  <else>
-  &nbsp;
-  </else>
+<if @assessments:rowcount@>
+<if @shaded_p@ false>
+
+<multiple name="assessments">
+
+  <if @one_instance_p@ false>@assessments.parent_name@</if>
+
+    <ul>
+    <group column="package_id">
+      <li>
+       <a href="@assessments.url@assessment?assessment_id=@assessments.assessment_id@">@assessments.title@</a>
+      </li>
+     </group>
+    </ul>
+
+</multiple>
+</if>
+</if>
+<else>
+  &nbsp;  
+</else>
Index: openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl	25 Nov 2004 11:19:08 -0000	1.5
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl	8 Jan 2005 16:30:07 -0000	1.6
@@ -18,22 +18,12 @@
 
 set list_of_package_ids $config(package_id)
 set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
-ns_log notice " ----- [join $list_of_package_ids ","] \n\n\n\n"
 
-foreach package_id $config(package_id) {
-    db_1row as_package_id {SELECT package_id AS as_package_id FROM apm_packages WHERE package_key = 'assessment' AND package_id = :package_id}
-} 
 
-set admin_p 0
-array set package_admin_p [list]
-foreach package_id $config(package_id) {
-    set package_admin_p($package_id) [permission::permission_p -object_id $package_id -privilege admin]
-    if { $package_admin_p($package_id) } {
-        set admin_p 1
-    }
-}
+set user_id [ad_conn user_id]
 
-ad_return_template
+db_multirow assessments assessments {}
 
 
 
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/assessment-portlet/www/assessment-portlet.xql'.
Fisheye: No comparison available.  Pass `N' to diff?