Index: openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml	19 Jul 2005 18:50:40 -0000	1.9
+++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml	20 Jul 2005 16:40:07 -0000	1.10
@@ -26,6 +26,7 @@
   <msg key="delete">delete</msg>
   <msg key="E-mail_address">E-mail address:</msg>
   <msg key="edit">edit</msg>
+  <msg key="Edit_My_Application">Edit My Application</msg>
   <msg key="Expense_Tracking">Expense Tracking</msg>
   <msg key="Gift_Certificate">Gift Certificate:</msg>
   <msg key="Grade">Grade</msg>
@@ -131,5 +132,7 @@
   <msg key="view_applications">view applications</msg>
   <msg key="view_bio">view bio</msg>
   <msg key="view_bios">view bios</msg>
+  <msg key="Your_Applications">Your Applications</msg>
+  <msg key="Your_Order_History">Your Order History</msg>
   <msg key="Your_Relationship">Your Relationship</msg>
 </message_catalog>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/www/home.adp	20 Jul 2005 16:40:07 -0000	1.1
@@ -0,0 +1,83 @@
+<master>
+  <property name=title>@page_title@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="focus">user_info.first_names</property>
+  <property name="displayed_object_id">@user_id@</property>
+
+  <h2>#acs-subsite.Basic_Information#</h2>
+
+  <include src="/packages/acs-subsite/lib/user-info" />
+  <p><a href="@community_member_url@">#acs-subsite.lt_What_other_people_see#</a></p>
+
+  <list name="fragments">
+    @fragments:item;noquote@
+  </list>
+
+  <if @account_status@ eq "closed">
+    #acs-subsite.Account_closed_workspace_msg#
+  </if>
+
+  <h2>#acs-kernel.common_Actions#</h2>
+  <ul class="action-links">
+    <li><a href="../user/email-privacy-level">#acs-subsite.Change_my_email_P#</a></li>
+    <li><a href="../user/password-update">#acs-subsite.Change_my_Password#</a></li>
+
+    <if @change_locale_url@ not nil>
+      <li><a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a></li>
+    </if>
+
+    <if @notifications_url@ not nil>
+      <li><a href="@notifications_url@">#acs-subsite.Manage_your_notifications#</a></li>
+    </if>
+
+    <if @account_status@ ne "closed">
+      <li><a href="unsubscribe">#acs-subsite.Close_your_account#</a></li>
+    </if>
+
+  </ul>
+
+  <if @portrait_state@ eq upload>
+    <h2>#acs-subsite.Your_Portrait#</h2>
+    <p>
+      #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
+    </p>
+  </if>
+
+  <if @portrait_state@ eq show>
+    <h2>#acs-subsite.Your_Portrait#</h2>
+    <p>
+      #acs-subsite.lt_On_portrait_publish_d#.
+    </p>
+  </if>
+
+  <h2>#acs-subsite.Whos_Online_title#</h2>
+  <ul class="action-links">
+    <li><a href="@whos_online_url@">#acs-subsite.Whos_Online_link_label#</a></li>
+  </ul>
+
+  <if @invisible_p@ true>
+    #acs-subsite.Currently_invisible_msg#
+    <ul class="action-links">
+      <li><a href="@make_visible_url@">#acs-subsite.Make_yourself_visible_label#</a></li>
+    </ul>
+  </if>
+  <else>
+    #acs-subsite.Currently_visible_msg#
+    <ul class="action-links">
+      <li><a href="@make_invisible_url@">#acs-subsite.Make_yourself_invisible_label#</a></li>
+    </ul>
+  </else>
+
+  <h2>#dotlrn-ecommerce.Your_Order_History#</h2>
+  <ul>
+    <multiple name="orders">
+      <li><a href="@orders.order_url;noquote@">@orders.order_id@</a>; @orders.confirmed_date@</li>
+    </multiple>
+  </ul>
+
+  <h2>#dotlrn-ecommerce.Your_Applications#</h2>
+  <ul>
+    <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>
+    </multiple>
+  </ul>
\ 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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/www/home.tcl	20 Jul 2005 16:40:07 -0000	1.1
@@ -0,0 +1,129 @@
+# /pvt/home.tcl
+
+ad_page_contract {
+    user's workspace page
+    @cvs-id $Id: home.tcl,v 1.1 2005/07/20 16:40:07 roelc Exp $
+} -properties {
+    system_name:onevalue
+    context:onevalue
+    full_name:onevalue
+    email:onevalue
+    url:onevalue
+    screen_name:onevalue
+    bio:onevalue
+    portrait_state:onevalue
+    portrait_publish_date:onevalue
+    portrait_title:onevalue
+    export_user_id:onevalue
+    ad_url:onevalue
+    member_link:onevalue
+    pvt_home_url:onevalue
+}
+
+set user_id [auth::require_login -account_status closed]
+
+acs_user::get -array user -include_bio -user_id $user_id
+
+set account_status [ad_conn account_status]
+set login_url [ad_get_login_url]
+set subsite_url [ad_conn vhost_subsite_url]
+
+set page_title [ad_pvt_home_name]
+
+set pvt_home_url [ad_pvt_home]
+
+set context [list $page_title]
+
+set fragments [callback -catch user::workspace -user_id $user_id]
+
+set ad_url [ad_url]
+
+set community_member_url [acs_community_member_url -user_id $user_id]
+
+set notifications_url [lindex [site_node::get_children -node_id [subsite::get_element -element node_id] -package_key "notifications"] 0]
+
+set system_name [ad_system_name]
+
+set portrait_upload_url [export_vars -base "../user/portrait/upload" { { return_url [ad_return_url] } }]
+
+if { [llength [lang::system::get_locales]] > 1 } { 
+    set change_locale_url [apm_package_url_from_key "acs-lang"]
+}
+
+
+
+if [ad_parameter SolicitPortraitP "user-info" 0] {
+    # we have portraits for some users 
+    if ![db_0or1row get_portrait_info "
+    select cr.publish_date, nvl(cr.title,'your portrait') as portrait_title
+    from cr_revisions cr, cr_items ci, acs_rels a
+    where cr.revision_id = ci.live_revision
+    and  ci.item_id = a.object_id_two
+    and a.object_id_one = :user_id
+    and a.rel_type = 'user_portrait_rel'
+    "] {
+	set portrait_state "upload"
+    } else {
+        if { [empty_string_p $portrait_title] } {
+            set portrait_title "[_ acs-subsite.no_portrait_title_message]"
+        }
+
+	set portrait_state "show"
+	set portrait_publish_date [lc_time_fmt $publish_date "%q"]
+    }
+} else {
+    set portrait_state "none"
+}
+
+
+set whos_online_url "[subsite::get_element -element url]shared/whos-online"
+set make_visible_url "[subsite::get_element -element url]shared/make-visible"
+set make_invisible_url "[subsite::get_element -element url]shared/make-invisible"
+set invisible_p [whos_online::user_invisible_p [ad_conn untrusted_user_id]]
+
+db_multirow -extend { order_url } orders get_orders {
+    select order_id, confirmed_date
+    from ec_orders
+    where user_id=:user_id
+    and order_state not in ('in_basket','void','expired')
+    order by order_id
+} {
+    set order_url [export_vars -base [apm_package_url_from_key ecommerce]order { order_id }]
+    set confirmed_date [util_AnsiDatetoPrettyDate $confirmed_date]
+}
+
+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 }]
+    }
+}
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/home.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/www/home.xql	20 Jul 2005 16:40:07 -0000	1.1
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="pvt_home_user_info">      
+      <querytext>
+      
+    select first_names, last_name, email, url, screen_name
+    from cc_users 
+    where user_id=:user_id
+
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="biography">      
+      <querytext>
+      
+select attr_value
+from acs_attribute_values
+where object_id = :user_id
+and attribute_id =
+   (select attribute_id
+    from acs_attributes
+    where object_type = 'person'
+    and attribute_name = 'bio')
+      </querytext>
+</fullquery>
+
+ 
+<fullquery name="get_portrait_info">      
+      <querytext>
+      
+    select cr.publish_date, cr.title as portrait_title
+    from cr_revisions cr, cr_items ci, acs_rels a
+    where cr.revision_id = ci.live_revision
+    and  ci.item_id = a.object_id_two
+    and a.object_id_one = :user_id
+    and a.rel_type = 'user_portrait_rel'
+    
+      </querytext>
+</fullquery>
+
+<fullquery name="email_info">      
+      <querytext>
+	    select email
+	    from cc_users 
+	    where user_iad=:user_id
+      </querytext>
+</fullquery>
+
+
+ 
+</queryset>