MyAcc: Complete separation btn Principal acc and reference account

diff --git a/portal/accountview.py b/portal/accountview.py
index c52484f..25eb15a 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -42,8 +42,12 @@ class AccountView(LoginRequiredAutoLogoutView):
         account_type = ''
         account_usr_hrn = ''
         account_pub_key = ''
+        account_reference = ''
         platform_name_list = []
+        platform_name_secondary_list = []
         account_type_list = []
+        account_type_secondary_list = []
+        account_reference_list = []
         delegation_type_list = []
         usr_hrn_list = []
         pub_key_list = []          
@@ -51,40 +55,48 @@ class AccountView(LoginRequiredAutoLogoutView):
             for platform_detail in platform_details:
                 if platform_detail['platform_id'] == account_detail['platform_id']:
                     platform_name = platform_detail['platform']
+                    account_config = json.loads(account_detail['config'])
+                    # a bit more pythonic
+                    account_usr_hrn = account_config.get('user_hrn','N/A')
+                    account_pub_key = account_config.get('user_public_key','N/A')
+                    account_reference = account_config.get ('reference_platform','N/A')
+
                     if 'reference' in account_detail['auth_type']:
                         account_type = 'Reference'
                         delegation = 'N/A'
+                        platform_name_secondary_list.append(platform_name)
+                        account_type_secondary_list.append(account_type)
+                        account_reference_list.append(account_reference)
+                        secondary_list = [{'platform_name': t[0], 'account_type': t[1], 'account_reference': t[2]} 
+                            for t in zip(platform_name_secondary_list, account_type_secondary_list, account_reference_list)]
+                       
                     elif 'managed' in account_detail['auth_type']:
                         account_type = 'Principal'
                         delegation = 'Automatic'
                     else:
                         account_type = 'Principal'
                         delegation = 'Manual'
-                    account_config = json.loads(account_detail['config'])
-                    # a bit more pythonic
-                    account_usr_hrn = account_config.get('user_hrn','N/A')
-                    account_pub_key = account_config.get('user_public_key','N/A')
-                    
-                    platform_name_list.append(platform_name)
-                    account_type_list.append(account_type)
-                    delegation_type_list.append(delegation)
-                    usr_hrn_list.append(account_usr_hrn)
-                    pub_key_list.append(account_pub_key)
-            
-                # to hide private key row if it doesn't exist    
+ 
+                    if 'reference' not in account_detail['auth_type']:
+                        platform_name_list.append(platform_name)
+                        account_type_list.append(account_type)
+                        delegation_type_list.append(delegation)
+                        usr_hrn_list.append(account_usr_hrn)
+                        pub_key_list.append(account_pub_key)
+                        # combining 5 lists into 1 [to render in the template] 
+                        lst = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4]} 
+                            for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list)]
+                    # to hide private key row if it doesn't exist    
                     if 'myslice' in platform_detail['platform']:
                         account_config = json.loads(account_detail['config'])
                         account_priv_key = account_config.get('user_private_key','N/A')
-                        print "testing"
-                        print account_priv_key
-                    #break
-        
-        # combining 5 lists into 1 [to render in the template] 
-        lst = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4]} 
-               for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list)]
+
+                    
+                        
 
         context = super(AccountView, self).get_context_data(**kwargs)
         context['data'] = lst
+        context ['ref_acc'] = secondary_list
         context['person']   = self.request.user
         context ['firstname'] = config.get('firstname',"?")
         context ['lastname'] = config.get('lastname',"?")

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index b28658c..5ef1350 100644 (file)
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -10,7 +10,7 @@
 
 {% block unfold_main %}
 
-<h2>MySlice  Account</h2>
+<h2>User Details</h2>
 
 {% if messages %}
 <ul class="messages">
@@ -28,7 +28,7 @@
                        <table class="profile">          
                        <tr class="odd">
                                <td colspan="2">
-                                               <div id="info">Personal Details</div>
+                                               <div id="info">Platform: Myslice</div>
                                </td>
                        </tr>
                        <tr class="even">
@@ -132,7 +132,8 @@
        </div>
 </div>
 
-<h2>Platform Access</h2>
+<h2>Account Information</h2>
+<h3>Principal Accounts</h3>
 <div id="middle" align="center">
        <div class="well">
                <table class="mytable"> 
@@ -156,6 +157,27 @@
        </div>
 </div>
 
+<h3>Secondary Accounts</h3>
+<div id="middle" align="center">
+    <div class="well">
+        <table class="mytable"> 
+            <tr class="odd"> 
+                <th>Platform</th> 
+                <th>Account Type</th>
+                               <th>Reference to</th>
+            </tr>   
+            {% for row in ref_acc %}         
+            <tr class="border_bottom">
+                <td class="odd"> {{ row.platform_name }} </td>
+                <td class="even"> {{ row.account_type }} </td>
+                               <td class="even"> {{ row.account_reference }} </td>
+            </tr> 
+            {%endfor%}               
+        </table>
+    </div>
+</div>
+
+
 
 
 {% endblock %}