X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Finstitution.html;h=812b2e54bb2d7fe6a5b1c8f0fb9417e78334a573;hb=de9cba4dc7bb98a579cf5df1f9900e9328544871;hp=a0f651045cf5dfb5978e0d818f235de9d914e516;hpb=bd812185717e3554a02f4d405c377c68bc3cdef9;p=myslice.git
diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index a0f65104..812b2e54 100644
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -10,32 +10,19 @@
Affiliation to an Institution
-
-
-
-
Membership: Governor
-
-
-
-
-
authority: onelab.upmc
-
-
Université Pierre et Marie Curie
-
-
Address: 4 Place Jussieu, 75005 Paris
-
-
Country: France
-
-
-
Contacts
-
Legal: Président Jean Chambaz
-
-
Scientific: Dr Timur Friedman, Prof Serge Fdida
+
+
+
+
+
+
+
+
-
Users: onelab.upmc
+
Users: {{user_details.parent_authority}}
@@ -55,7 +42,7 @@
-
Slices: onelab.upmc
+
Slices: {{user_details.parent_authority}}
@@ -92,7 +79,63 @@
*/
});
{% if person %}
- $.post("/rest/slice/",{'filters':{'parent_authority':'ple.upmc'}}, function( data ) {
+ {% if user_details.parent_authority %}
+ $.post("/rest/authority/",{'filters':{'authority_hrn':'{{user_details.parent_authority}}'}}, function( data ) {
+ var authority_data = [];
+ var onelab_data = [];
+ /* 'city','enabled','legal','longitude','onelab_membership','address','parent_authority','slice','user','country',
+ 'tech','abbreviated_name','url','postcode','description','scientific','authority_hrn','latitude','name' */
+ $.each( data, function( key, val ) {
+ authority_row = "
";
+ authority_row += "
";
+ authority_row += "authority: "+val.authority_hrn+"
";
+ authority_row += "
";
+ authority_row += ""+val.name+"
";
+ authority_row += "
";
+ authority_row += "Address: "+val.address+"
";
+ authority_row += "City: "+val.postcode+" "+val.city+"
";
+ authority_row += "
";
+ authority_row += "Country: "+val.country+"
";
+ authority_row += "
";
+ authority_row += "
";
+ authority_row += "Contacts
";
+ authority_row += "Legal: ";
+ /*
+
+ TODO: find a way to express JSON correctly given the constrains: CSV / JSON
+
+ legal = jQuery.parseJSON(val.legal);
+ if($.isArray(legal)){
+ $.each(legal, function(k,v){
+ authority_row += k+" "+v+"
";
+ });
+ }else{
+ */
+ authority_row += val.legal+"
";
+ //}
+ authority_row += "
";
+ authority_row += "Scientific: ";
+ /*
+ scientific = jQuery.parseJSON(val.scientific);
+ if($.isArray(scientific)){
+ $.each(scientific, function(v){
+ authority_row += v+", ";
+ });
+ }else{
+ */
+ authority_row += val.scientific+"
";
+ //}
+ onelab_membership = "Membership: "+val.onelab_membership;
+ onelab_data.push(onelab_membership);
+ authority_data.push(authority_row);
+ });
+ $("div#authority-data").html(authority_data.join( "" ));
+ $("div#onelab-data").html(onelab_data.join( "" ));
+ $("div#authority-tab-loaded").css("display","block");
+ $("div#authority-tab-loading").css("display","none");
+ });
+
+ $.post("/rest/slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
var list_slices = [];
var table_slices = [];
/* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "user", "slice_urn", "slice_expires" */
@@ -123,6 +166,7 @@
slice_row += ""+slice_url+" | ";
slice_row += ""+nodes_length+" | ";
slice_row += ""+val.slice_expires+" | ";
+ slice_row += "";
table_slices.push(slice_row);
});
@@ -131,10 +175,9 @@
$("table#slice-tab tr:last").after(table_slices.join( "" ));
$("div#slice-tab-loaded").css("display","block");
$("div#slice-tab-loading").css("display","none");
- });
- {% endif %}
- {% if person %}
- $.getJSON("/rest/user/",{'filters':{'parent_authority':'ple.upmc'}}, function( data ) {
+ });
+
+ $.post("/rest/user/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
var list_users = [];
var table_users = [];
/*
@@ -142,24 +185,23 @@
*/
$.each( data, function( key, val ) {
list_users.push( "" + val.user_email + "" );
-
- user_row = "";
+ user_row = "
";
user_row += " | ";
user_row += ""+val.user_email+" | ";
user_row += ""+val.user_hrn+" | ";
user_row += ""+val.user_first_name+" | ";
user_row += ""+val.user_last_name+" | ";
user_row += ""+val.enabled+" | ";
+ user_row += "
";
table_users.push(user_row);
});
-
- /* $("div#slice-list").html($( "", { html: list_slices.join( "" ) })); */
$("table#user-tab tr:last").after(table_users.join( "" ));
$("div#user-tab-loaded").css("display","block");
$("div#user-tab-loading").css("display","none");
});
{% endif %}
+ {% endif %}
});
{% endblock unfold_main %}