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.10 -r1.11
--- openacs-4/packages/dotlrn-ecommerce/www/home.adp	6 Sep 2005 01:12:11 -0000	1.10
+++ openacs-4/packages/dotlrn-ecommerce/www/home.adp	17 Oct 2005 13:03:32 -0000	1.11
@@ -11,6 +11,13 @@
 	<h2>#acs-subsite.Basic_Information#</h2>
 
 	<include src="/packages/dotlrn-ecommerce/lib/user-info" cancel="@cancel@" add_url="home" return_url="home" />
+	<if @edit_reg_url@ defined>
+	<p />
+	  <ul class="action-links">
+	    <li>#dotlrn-ecommerce.lt_Registration_assessme# [<a href="@edit_reg_url;noquote@">#acs-kernel.common_Edit#</a>]</li>
+	  </ul>
+	</if>
+
 	<p><a href="@community_member_url@">#acs-subsite.lt_What_other_people_see#</a></p>
 
 	<list name="fragments">
@@ -85,66 +92,68 @@
 	  </if>
 	  <else>
 	    <li>#dotlrn-ecommerce.You_have_no_orders#</li>
-	</else>
+	  </else>
 	</ul>
-<if @applications_p@>
-	<h2>#dotlrn-ecommerce.Your_Applications#</h2>
-</if>
-<else>
-	<h2>#dotlrn-ecommerce.Your_Prereq_Waiver_Requests#</h2>
-</else>
+	<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">
-	
-		<if @admin_p@ eq 1>
-		  <li> <a href="@sessions.asm_url;noquote@">@sessions.pretty_name@</a> <if @user_id@ ne @sessions.participant_id@>(@sessions.name@)</if>
-		</if>
-		<else>
-		  <li> @sessions.pretty_name@ <if @user_id@ ne @sessions.participant_id@>(@sessions.name@)</if>
-		</else>    
-		<if @sessions.member_state@ eq "request approved">
+	      
+	      <if @admin_p@ eq 1>
+		<li> <a href="@sessions.asm_url;noquote@">@sessions.pretty_name@</a> <if @user_id@ ne @sessions.participant_id@>(@sessions.name@)</if>
+	      </if>
+	      <else>
+		<li> @sessions.pretty_name@ <if @user_id@ ne @sessions.participant_id@>(@sessions.name@)</if>
+	      </else>    
+	      <if @sessions.member_state@ eq "request approved">
 		
 		- Request approved <br/>
 		<a href="@sessions.register_url@" class="button">#dotlrn-ecommerce.lt_Continue_Registration#</a>
-		</if>
-	
+	      </if>
+	      
 
-	<if @use_embedded_application_view_p@ ne 1> 
-	 [<a href="@sessions.edit_asm_url;noquote@">#acs-kernel.common_Edit#</a>]
-	</if>
-	</li>
+	      <if @use_embedded_application_view_p@ ne 1> 
+		[<a href="@sessions.edit_asm_url;noquote@">#acs-kernel.common_Edit#</a>]
+	      </if>
+	    </li>
 	    </multiple>
 	  </if>
 	  <else>
 	    <li>#dotlrn-ecommerce.lt_You_have_no_applicati#</li>
 	  </else>
 	</ul>
-</if>
+      </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_id@>(@waiting_lists.name@) </if> 
+	<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_id@>(@waiting_lists.name@) </if> 
 
 	  	<if @waiting_lists.member_state@ eq "needs approval">
-			- <font color=red>number @waiting_lists.waiting_list_number@ on waiting list</font>
+		  - <font color=red>#dotlrn-ecommerce.lt_number_waiting_listsw#</font>
 		</if>
 		<else>
-		A place is available.<br/>		
-		<a href="@waiting_lists.register_url@" class="button">#dotlrn-ecommerce.lt_Continue_Registration#</a>
-		
+		  #dotlrn-ecommerce.A_place_is_available#<br/>		
+		  <a href="@waiting_lists.register_url@" class="button">#dotlrn-ecommerce.lt_Continue_Registration#</a>
+		  
 		</else>
 
-	</li>
-        </multiple>
-	</ul>
-</if>
-<else>
-No waiting lists
-</else>
+	      </li>
+	    </multiple>
+	  </ul>
+	</if>
+	<else>
+	  <ul class="action-links">
+	    <li>#dotlrn-ecommerce.No_waiting_lists#</li>
+	  </ul>
+	</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.14 -r1.15
--- openacs-4/packages/dotlrn-ecommerce/www/home.tcl	6 Sep 2005 07:05:59 -0000	1.14
+++ openacs-4/packages/dotlrn-ecommerce/www/home.tcl	17 Oct 2005 13:03:32 -0000	1.15
@@ -114,53 +114,41 @@
     db_multirow -extend { asm_url edit_asm_url register_url } sessions sessions {
 	select c.community_id, c.pretty_name,r.user_id as participant_id,
 	acs_object__name(r.user_id) as name, r.member_state, 
-	r.rel_id, s.product_id
+	r.rel_id, s.product_id, m.session_id
+
 	from 
 	dotlrn_communities c, dotlrn_ecommerce_section s,
-	dotlrn_member_rels_full r,
+	dotlrn_member_rels_full r
+	left join dotlrn_ecommerce_application_assessment_map m
+	on (r.rel_id = m.rel_id),
 	acs_objects o
+
 	where r.community_id = c.community_id
 	and s.community_id = c.community_id
 	and o.object_id = r.rel_id
-	and r.member_state in ('request approval', 'request approved')
+	and r.member_state in ('request approval', 'request approved', 'awaiting payment', 'payment received')
 	and (r.user_id = :user_id or o.creation_user=:user_id)
     } {
 	append notice "community_id '${community_id}' participant = '${participant_id}' <br />"
-	if { [db_0or1row assessment {
-	    select ss.session_id, coalesce(case when c.assessment_id=-1 then null else a.assessment_id end,:default_assessment_id) as 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
+
+	set assessment_id [db_string get_assessment_id {
+	    select a.item_id
+	    from as_sessions s, as_assessmentsi a
+	    where s.assessment_id = a.assessment_id
+	    and session_id = :session_id
+	}]
+
+	if {$use_embedded_application_view_p == 1} {
+	    set asm_url "admin/application-view?session_id=$session_id"
 	    
-	    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,:default_assessment_id)
-	    and a.assessment_id = ss.assessment_id
-	    and ss.subject_id = :user_id
+	} else {
 	    
-	    order by creation_datetime desc
+	    set asm_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/results-session" { session_id }]
 	    
-	    limit 1
-	}] } {
-	    if {$use_embedded_application_view_p == 1} {
-		set asm_url "admin/application-view?session_id=$session_id"
-		
-	    } else {
-		
-		set asm_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/results-session" { session_id }]
-		
-	    }
+	}
 
-	    set edit_asm_url [export_vars -base /assessment/assessment { assessment_id }]
+	set edit_asm_url [export_vars -base /assessment/assessment { session_id assessment_id }]
 	   
-	}
 	set register_url [export_vars -base ecommerce/shopping-cart-add { user_id product_id participant_id}]
 	incr sessions_with_applications
     }
@@ -188,4 +176,20 @@
 #ad_return_complaint 1 $notice
 set catalog_url [ad_conn package_url]
 set cc_package_id [apm_package_id_from_key "dotlrn-ecommerce"]
-set admin_p [permission::permission_p -object_id $cc_package_id -privilege "admin"]
\ No newline at end of file
+set admin_p [permission::permission_p -object_id $cc_package_id -privilege "admin"]
+
+set reg_asm_id [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id] -default ""]
+if { ! [empty_string_p $reg_asm_id] } {
+    if { [db_0or1row get_reg_session {
+	select assessment_id, session_id
+	from as_sessions
+	where assessment_id in (select assessment_id
+				from as_assessmentsi
+				where item_id = :reg_asm_id)
+	and subject_id = :user_id
+	and not completed_datetime is null
+	limit 1
+    }] } {
+	set edit_reg_url [export_vars -base [apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]assessment { {assessment_id $reg_asm_id} session_id }]
+    }
+}
\ No newline at end of file