From 8eafc93dfc03b2671a99921f61f0779ec61a623c Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 28 Aug 2013 13:04:14 +0200
Subject: [PATCH] My Account: fetch info from manifold db and display

---
 portal/templates/my_account.html |  8 +++----
 portal/views.py                  | 41 ++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/portal/templates/my_account.html b/portal/templates/my_account.html
index 3284fdb4..2970c425 100644
--- a/portal/templates/my_account.html
+++ b/portal/templates/my_account.html
@@ -64,13 +64,13 @@
                                 <tr class="even">
                                             <td class="key">Full Name</td>
                                             <td class="value">
-                                                    <span id="nameval" class="value" >{{ users }} </span>
+                                                    <span id="nameval" class="value" >{{ fullname }} </span>
                                                     <span class="hide_this" id="span_name">
                                                             <button type="button" class="cancel" title="Cancel" id="cancel_name_change"> Cancel </button>
                                                             
                                                                 <div style='display:none;'><input type='hidden'  name='nameform'  /></div>
-                                                                    <input id="fname" type="text" name="fname" class="required"  maxlength="200" value="" />
-                                                                    <input id="lname" type="text" name="lname" class="required"  maxlength="200" value="" />
+                                                                    <input id="fname" type="text" name="fname" class="required"  maxlength="200" value="{{firstname}}" />
+                                                                    <input id="lname" type="text" name="lname" class="required"  maxlength="200" value="{{lastname}}" />
                                                                     <input type="submit" name="submit_name" value="Save"/>
                                                     </span>
                                                     <button class="edit" type="button"title="Full Name" id="edit_name">Edit</button>
@@ -80,7 +80,7 @@
                                 <tr class="odd">
                                             <td class="key">Affiliation</td>
                                             <td class="value">
-                                                    <span id="affval" class="value">UPMC</span>
+                                                    <span id="affval" class="value">{{ affiliation }}</span>
                                                     <img class="logo" src="{{STATIC_URL}}/img/ques_icon.png" onclick="affAlert()"  title="To change your affiliation please contact the administrator" style="height: 20px; width: 20px; position: absolute; left: 625px; left: 900px; ">
                                             </td>
                                     </tr>
diff --git a/portal/views.py b/portal/views.py
index a29beaed..d4fa22ea 100644
--- a/portal/views.py
+++ b/portal/views.py
@@ -607,25 +607,36 @@ class AccountView(TemplateView):
 
 
     def get_context_data(self, **kwargs):
-        page = Page(self.request)
+        #page = Page(self.request)
 
-        #network_query  = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform','platform_longname','gateway_type')
-        network_query  = Query().get('local:user').select('user_id','email','config')
-        page.enqueue_query(network_query)
+        user_query  = Query().get('local:user').select('config')
+        user_accounts = execute_query(self.request, user_query)
+        
+        for user_account in user_accounts:
+            config = json.loads(user_account['config'])
 
-        page.expose_js_metadata()
-        page.expose_queries()
+        #print "THis is a test"
+        #print config['firstname'] 
+        
+        #page.enqueue_query(network_query)
 
-        userlist = SimpleList(
-            title = None,
-            page  = page,
-            key   = 'user_id',
-            query = network_query,
-        )
+        #page.expose_js_metadata()
+        #page.expose_queries()
+
+        #userlist = SimpleList(
+        #    title = None,
+        #    page  = page,
+        #    key   = 'user_id',
+        #    query = network_query,
+        #)
 
         context = super(AccountView, self).get_context_data(**kwargs)
         context['person']   = self.request.user
-        context['users'] = userlist.render(self.request)
+        context ['fullname'] = config['firstname'] +' '+ config['lastname']    
+        context ['firstname'] = config['firstname']
+        context ['lastname'] = config['lastname']
+        context ['affiliation'] = config['affiliation']
+        #context['users'] = userlist.render(self.request)
         
         # XXX This is repeated in all pages
         # more general variables expected in the template
@@ -634,8 +645,8 @@ class AccountView(TemplateView):
         context['topmenu_items'] = topmenu_items('My Account', self.request)
         # so we can sho who is logged
         context['username'] = the_user(self.request)
-
-        context.update(page.prelude_env())
+        context ['firstname'] = config['firstname']
+        #context.update(page.prelude_env())
         return context
 
 
-- 
2.43.0