X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fquerytable%2Fstatic%2Fjs%2Fquerytable.js;h=c22dbd2cbd175e6cce8173f8da6fc617f514e0df;hb=e283fe2eb8fc83942da4c7e5055f0d3969fefa22;hp=c1b19235c993ad11179f7cc84129661d9dd0ab14;hpb=6eb98c83dccb555e576740d8000d6fad8044763f;p=myslice.git diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js index c1b19235..c22dbd2c 100644 --- a/plugins/querytable/static/js/querytable.js +++ b/plugins/querytable/static/js/querytable.js @@ -90,7 +90,7 @@ QUERYTABLE_BGCOLOR_REMOVED = 2; sPaginationType: 'bootstrap', // Handle the null values & the error : Datatables warning Requested unknown parameter // http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2 - aoColumnDefs: [{sDefaultContent: '', aTargets: [ '_all' ]}], + aoColumnDefs: [{sDefaultContent: '', aTargets: [ '_all' ], "sType": "mysort"}], // WARNING: this one causes tables in a 'tabs' that are not exposed at the time this is run to show up empty // sScrollX: '100%', /* Horizontal scrolling */ bProcessing: true, /* Loading */ @@ -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 @@ -174,14 +174,16 @@ QUERYTABLE_BGCOLOR_REMOVED = 2; index['hostname'] = self.getColIndex('hostname',cols); index['urn'] = self.getColIndex('urn',cols); index['type'] = self.getColIndex('type',cols); - index['status'] = self.getColIndex('boot_state',cols); + //index['status'] = self.getColIndex('boot_state',cols); + index['available'] = self.getColIndex('available',cols); index['testbed'] = self.getColIndex('testbed_name',cols); index['facility'] = self.getColIndex('facility_name',cols); var resourceData = { 'hostname' : strip(aData[index['hostname']]), 'urn' : aData[index['urn']], 'type' : aData[index['type']], - 'status' : aData[index['status']], + //'status' : aData[index['status']], + 'available' : aData[index['available']], 'testbed' : aData[index['testbed']], 'facility' : aData[index['facility']], }; @@ -206,16 +208,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('