Index: openacs-4/packages/dotlrn-ecommerce/www/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/home.adp	28 Jul 2005 23:43:43 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/home.adp	14 Aug 2005 18:07:07 -0000	1.7
@@ -87,19 +87,36 @@
 	    <li>#dotlrn-ecommerce.You_have_no_orders#</li>
 	</else>
 	</ul>
-
+<if @applications_p@>
 	<h2>#dotlrn-ecommerce.Your_Applications#</h2>
+</if>
+<else>
+	<h2>#dotlrn-ecommerce.Your_Prereq_Waiver_Requests#</h2>
+</else>
 	<ul class="action-links">
 	  <if @sessions_with_applications@ gt 0>
 	    <multiple name="sessions">
-	      <li><a href="@sessions.asm_url;noquote@">@sessions.pretty_name@</a> [<a href="@sessions.edit_asm_url;noquote@">#dotlrn-ecommerce.Edit_My_Application#</a>]</li>
+	      <li><a href="@sessions.asm_url;noquote@">@sessions.pretty_name@</a> <if @user_id@ ne @sessions.participant@>(@sessions.name@)</if> [<a href="@sessions.edit_asm_url;noquote@">#acs-kernel.common_Edit#</a>]</li>
 	    </multiple>
 	  </if>
 	  <else>
 	    <li>#dotlrn-ecommerce.lt_You_have_no_applicati#</li>
 	  </else>
 	</ul>
-
+</if>
+	<h2>#dotlrn-ecommerce.Your_Waiting_Lists#</h2>
+	
+<if @waiting_lists:rowcount@ gt 0>
+	<ul class="action-links">
+	<multiple name="waiting_lists">
+	<li>@waiting_lists.pretty_name@ <if @user_id@ ne @waiting_lists.participant@>(@waiting_lists.name@)</if></li>
+	</li>
+        </multiple>
+	</ul>
+</if>
+<else>
+No waiting lists
+</else>
       </td>
     </tr>
   </table>
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/home.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/home.tcl	11 Aug 2005 01:56:47 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/home.tcl	14 Aug 2005 18:07:07 -0000	1.7
@@ -100,42 +100,66 @@
     set confirmed_date [util_AnsiDatetoPrettyDate $confirmed_date]
 }
 
+set applications_p [parameter::get -parameter EnableCourseApplicationsP -default 0]
+
 set sessions_with_applications 0
-db_multirow -extend { asm_url edit_asm_url } sessions sessions {
-    select c.community_id, c.pretty_name
-    from dotlrn_member_rels_full r, dotlrn_communities c
-    where r.community_id = c.community_id
-    and r.member_state = 'awaiting payment'
-    and r.user_id = :user_id
-} {
-    if { [db_0or1row assessment {
-	select ss.session_id, c.assessment_id
-	
-	from dotlrn_ecommerce_section s,
-	(select c.*
-	 from dotlrn_catalogi c,
-	 cr_items i
-	 where c.course_id = i.live_revision) c,
-	(select a.*
-	 from as_assessmentsi a,
-	 cr_items i
-	 where a.assessment_id = i.latest_revision) a,
-	as_sessions ss
-	
-	where s.community_id = :community_id
-	and s.course_id = c.item_id
-	and c.assessment_id = a.item_id
-	and a.assessment_id = ss.assessment_id
-	and ss.subject_id = :user_id
-	
-	order by creation_datetime desc
-	
-	limit 1
-    }] } {
-	set asm_url [export_vars -base /assessment/session { session_id }]
-	set edit_asm_url [export_vars -base /assessment/assessment { assessment_id }]
-	incr sessions_with_applications
+# check for patron rels as well
+    db_multirow -extend { asm_url edit_asm_url } sessions sessions {
+	select c.community_id, c.pretty_name,r.user_id as participant,
+	acs_object__name(r.user_id) as name
+	from 
+	dotlrn_communities c,
+	dotlrn_member_rels_full r
+	left join acs_rels ar on r.user_id=ar.object_id_two
+	where r.community_id = c.community_id
+--	and r.member_state = 'awaiting payment'
+	and ar.rel_type='patron_rel'
+	and (r.user_id = :user_id or ar.object_id_one=:user_id)
+    } {
+	append notice "community_id '${community_id}' participant = '${participant}' <br />"
+	if { [db_0or1row assessment {
+	    select ss.session_id, c.assessment_id
+	    
+	    from dotlrn_ecommerce_section s,
+	    (select c.*
+	     from dotlrn_catalogi c,
+	     cr_items i
+	     where c.course_id = i.live_revision) c,
+	    (select a.*
+	     from as_assessmentsi a,
+	     cr_items i
+	     where a.assessment_id = i.latest_revision) a,
+	    as_sessions ss
+	    
+	    where s.community_id = :community_id
+	    and s.course_id = c.item_id
+	    and a.item_id = coalesce(case when c.assessment_id=-1 then null else c.item_id end,57657)
+	    and a.assessment_id = ss.assessment_id
+	    and ss.subject_id = :user_id
+	    
+	    order by creation_datetime desc
+	    
+	    limit 1
+	}] } {
+	    set asm_url [export_vars -base /assessment/session { session_id }]
+	    set edit_asm_url [export_vars -base /assessment/assessment { assessment_id }]
+	    incr sessions_with_applications
+	}
     }
-}
 
+# get waiting list requests
+    db_multirow waiting_lists waiting_lists {
+	select c.community_id, c.pretty_name,r.user_id as participant,
+	acs_object__name(r.user_id) as name
+	from 
+	dotlrn_communities c,
+	dotlrn_member_rels_full r
+	left join acs_rels ar on r.user_id=ar.object_id_two
+	where r.community_id = c.community_id
+	and r.member_state = 'needs approval'
+	and ar.rel_type='patron_rel'
+	and (r.user_id = :user_id or ar.object_id_one=:user_id)
+    }
+
+#ad_return_complaint 1 $notice
 set catalog_url [ad_conn package_url]
\ No newline at end of file