From 638bef2312f862f8e148c9ad5a4675316c1ca961 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Fri, 26 Jun 2015 12:46:23 +0200 Subject: [PATCH] js updated for accessing nitos nodes --- plugins/asap/static/js/asap.js | 2 +- plugins/asap/templates/asap.html | 3 ++- plugins/querytable/static/js/querytable.js | 9 +++++---- portal/static/img/testbeds/FIT NITOS Paris.png | Bin 0 -> 3184 bytes portal/static/img/testbeds/FIT NITOS R2Lab.png | Bin 0 -> 3184 bytes portal/static/js/experiment.js | 4 ++-- portal/static/js/join.js | 4 ++-- portal/templates/join_view.html | 2 +- portal/templates/slice-tab-experiment.html | 17 +++++------------ 9 files changed, 18 insertions(+), 23 deletions(-) create mode 100644 portal/static/img/testbeds/FIT NITOS Paris.png create mode 100644 portal/static/img/testbeds/FIT NITOS R2Lab.png diff --git a/plugins/asap/static/js/asap.js b/plugins/asap/static/js/asap.js index 861f0cf9..107049b7 100644 --- a/plugins/asap/static/js/asap.js +++ b/plugins/asap/static/js/asap.js @@ -50,7 +50,7 @@ var AsapDateSelected = new Date(); /* PLUGIN EVENTS */ // on_show like in querytable - remove(id) { + remove: function(id) { return (elem=document.getElementById(id)).parentNode.removeChild(elem); }, /* GUI EVENTS */ diff --git a/plugins/asap/templates/asap.html b/plugins/asap/templates/asap.html index 3da60415..f26847a7 100644 --- a/plugins/asap/templates/asap.html +++ b/plugins/asap/templates/asap.html @@ -1,6 +1,7 @@
-

Reserve resources as soon as possible

+

Reserve resources as soon as possible *

+
* This feature is only available for FIT IoT-Lab testbed at the moment
diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js index c1b19235..444fe604 100644 --- a/plugins/querytable/static/js/querytable.js +++ b/plugins/querytable/static/js/querytable.js @@ -164,7 +164,7 @@ QUERYTABLE_BGCOLOR_REMOVED = 2; $('table.dataTable').delegate('a.resource-info','click',function() { var aPos = sTable.fnGetPosition( this.parentNode ); var aData = sTable.fnGetData( aPos[0] ); - //console.log(aData); + console.log(aData); var index = {} // XXX Loic @ Hardcoded !!! Maybe a loop over all fields would be better @@ -206,16 +206,17 @@ QUERYTABLE_BGCOLOR_REMOVED = 2; } else { var logo = resourceData['testbed']; var resourceLocation = { - 'longitude' : aData[13], - 'latitude' : aData[23], + 'longitude' : aData[20], + 'latitude' : aData[17], }; var coordinates = resourceLocation['latitude']+','+resourceLocation['longitude']; + console.log(coordinates); } var modal = $('#resource-info-modal'); modal.find('.modal-title').text(resourceData['testbed'] + ': ' +resourceData['hostname']); table = modal.find('.modal-resource-info'); - table.html(''+resourceData['facility']+' - '+resourceData['testbed']+''); + table.html('
'+resourceData['facility']+' - '+resourceData['testbed']+'
'); for (var j in resourceData) { table.append('' + j + '' + resourceData[j] + ''); } diff --git a/portal/static/img/testbeds/FIT NITOS Paris.png b/portal/static/img/testbeds/FIT NITOS Paris.png new file mode 100644 index 0000000000000000000000000000000000000000..10302275d967d2b4fdc2efc8406758877b4d15ae GIT binary patch literal 3184 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 + style="width:200px" placeholder="Phone number" maxlength="20" class="form-control">
diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html index 9673ad61..1af56614 100644 --- a/portal/templates/slice-tab-experiment.html +++ b/portal/templates/slice-tab-experiment.html @@ -11,14 +11,11 @@ function is_finished(len_platforms, pf_status){ $(document).ready(function() { var platform_status = Array(); var platform_empty = Array(); - console.log('{{platforms}}'); {% for platform in platforms %} // /sfa/Describe?hrn=onelab.upmc.projectx.slicex&platform[]={{platform}}&type=slice $.post("/sfa/Describe",{'hrn':'{{slicename}}', 'type':'slice', 'platform':['{{platform}}']}, function( data ) { - console.log(data); if('parsed' in data['{{platform}}'] && 'rspec' in data['{{platform}}']['parsed']){ rspec = data['{{platform}}']['parsed']['rspec']; - console.log(rspec); if('node' in rspec){ if(rspec['node'] instanceof Array) { jQuery.each( rspec['node'], function( i, node ) { @@ -27,6 +24,8 @@ $(document).ready(function() { }else{ render_node('{{platform}}',rspec['node']); } + }else{ + platform_empty.push('{{platform}}'); } }else{ platform_empty.push('{{platform}}'); @@ -34,7 +33,7 @@ $(document).ready(function() { platform_status.push('{{platform}}'); if(is_finished({{len_platforms}},platform_status.length)){ $("#loading").hide(); - if(platform_empty.length > 0){ + if(platform_empty.length == {{len_platforms}}){ $("#warning_message").show(); } } @@ -42,7 +41,6 @@ $(document).ready(function() { {% endfor %} }); -