X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fleases.js;h=9082601bcd161ab0170af61cfb9b6c726e7f7bac;hb=9fea82d06df5c051a457045595aa682c56cddefd;hp=741e32eaa77e06a1acf338831e6f15b0edaae6f4;hpb=c1471bbac67bb93d0879e5594aa5f37320649d08;p=plewww.git

diff --git a/planetlab/slices/leases.js b/planetlab/slices/leases.js
index 741e32e..9082601 100644
--- a/planetlab/slices/leases.js
+++ b/planetlab/slices/leases.js
@@ -1,3 +1,5 @@
+/*  Thierry Parmentelat -- INRIA */
+
 /* need to put some place else in CSS ? */
 
 // space for the nodenames
@@ -72,14 +74,11 @@ function Scheduler () {
     // the names of the hidden fields that hold the input to this class
     // are hard-wired for now
     this.parse_html = function () {
-	window.console.log('in parse_html');
 	
 	var table = $$("table#leases_data")[0];
 	// no reservable nodes - no data
-	if ( ! table) {
-	    window.console.log('no table');
-	    return false;
-	}
+	if ( ! table) return false;
+
 	// the nodelabels
 	var data = [], axisx = [], axisy = [];
 	table.getElementsBySelector("tbody>tr>th").each(function (cell) {
@@ -87,11 +86,7 @@ function Scheduler () {
 	});
 	// test for at least one entry; other wise this means we haven't retrieved
 	// the html dta yet
-	if (axisy.length <1) {
-	    window.console.log('no axisy');
-	    window.console.log('have retrieved html text as'+getInnerText(table));
-	    return false;
-	}
+	if (axisy.length <1) return false;
 
 	// the timeslot labels
 	table.getElementsBySelector("thead>tr>th").each(function (cell) {
@@ -115,7 +110,6 @@ function Scheduler () {
 	});
 
 	this.axisx=axisx;
-	window.console.log('in parse_html, set axisx to'+axisx.length);
 	this.axisy=axisy;
 	this.data=data;
 	return true;
@@ -127,7 +121,6 @@ function Scheduler () {
     ////////////////////
     // draw 
     this.draw_area = function (canvas_id) {
-	window.console.log('in draw_area');
 	this.total_width = x_nodelabel + this.nb_grains()*this.leases_w; 
 	this.total_height =   2*y_header /* the timelabels */
 			    + 2*y_sep    /* extra space */
@@ -150,7 +143,6 @@ function Scheduler () {
 	this.timebutton_path="M1,0L"+(this.leases_w-1)+",0L"+(this.leases_w/2)+","+y_header+"L1,0";
 
 	var axisx=this.axisx;
-	window.console.log('in draw_area, retrieved axisx' + axisx.length);
 	
 	var axisy=this.axisy;
 	// maintain the list of nodelabels for the 'all nodes' button
@@ -229,6 +221,8 @@ function Scheduler () {
 		slicename=this.data[data_index][1];
 		duration=this.data[data_index][2];
 		var lease=paper.rect (left,top,this.leases_w*duration,y_node,radius);
+		// record scheduler in lease - early as we need this in init_other
+		lease.scheduler=this;
 		lease.lease_id=lease_id;
 		lease.nodename=nodename;
 		lease.nodelabel=nodelabel;
@@ -239,14 +233,12 @@ function Scheduler () {
 		    lease.initial="mine";
 		    lease_methods.init_mine(lease);
 		} else {
-		    lease_initial="other";
+		    lease.initial="other";
 		    lease_methods.init_other(lease,slicename);
 		}
 		lease.from_time = axisx[grain%this.nb_grains()][0];
 		grain += duration;
 		lease.until_time = axisx[grain%this.nb_grains()][0];
-		// record scheduler in lease
-		lease.scheduler=this;
 		// and vice versa
 		this.leases.push(lease);
 		// move on with the loop
@@ -270,7 +262,7 @@ function Scheduler () {
 		if (lease.current=='mine') {
 		    var j=i+1;
 		    while (j<len && lease_methods.compare (lease, until_time, this.leases[j])) {
-//			window.console.log('merging index='+i+' initial='+this.leases[i].initial+' current='+this.leases[i].current);
+//			window.console.log('merging index='+i+' initial='+lease.initial+' current='+lease.current);
 //			window.console.log('merged index='+j+' initial='+this.leases[j].initial+' current='+this.leases[j].current);
 			until_time=this.leases[j].until_time;
 			++j; ++i;
@@ -293,7 +285,7 @@ function Scheduler () {
 	var ajax=new Ajax.Request('/planetlab/common/actions.php', 
 				  {method:'post',
 				   parameters:{'action':'manage-leases',
-					       'actions':actions.toJSON()},
+					       'actions':Object.toJSON(actions)},
 				   onSuccess: function(transport) {
 				       var response = transport.responseText || "no response text";
 				       document.body.style.cursor = "default";
@@ -322,13 +314,12 @@ function Scheduler () {
     // re-read settings from the html, ajax-aquire the html text for the leases_data table
     // store it in the html tree, parse it, and refresh graphic
     this.refresh = function () {
-	window.console.log('in refresh');
 	this.slice_id=getInnerText($$("span#leases_slice_id")[0]).strip();
 	this.slicename=getInnerText($$("span#leases_slicename")[0]).strip();
 	this.leases_granularity=getInnerText($$("span#leases_granularity")[0]).strip();
-	this.leases_offset=getInnerText($$("span#leases_offset")[0]).strip();
-	this.leases_slots=getInnerText($$("span#leases_slots")[0]).strip();
-	this.leases_w=parseInt(getInnerText($$("span#leases_w")[0]).strip());
+	this.leases_offset=$("leases_offset_input").value.strip();
+	this.leases_slots=$("leases_slots_input").value.strip();
+	this.leases_w=parseInt($("leases_w_input").value.strip());
 
 	document.body.style.cursor = "wait";
 	var ajax=new Ajax.Request('/planetlab/slices/leases-data.php',
@@ -341,12 +332,12 @@ function Scheduler () {
 					       'leases_w':this.leases_w},
 				   onSuccess: function (transport) {
 				       var response = transport.responseText || "no response text";
-				       window.console.log("received from ajax=[["+response+"]]");
+//				       window.console.log("received from ajax=[["+response+"]]");
 				       var scheduler=Scheduler.scheduler;
 				       if ( ! scheduler.set_html (response)) 
 					   alert ("Something wrong .. Could not store ajax result..");
 				       else if ( ! scheduler.parse_html()) 
-					   alert ("Something wrong .. Could not parse ajax result..");
+					   alert ("Error: could not parse ajax result..\nIf your session has expired, you need to log back in");
 				       else
 					   scheduler.draw_area("leases_area");
 				       document.body.style.cursor = "default";
@@ -480,9 +471,9 @@ var lease_methods = {
     init_other: function (lease, slicename) {
 	lease.animate (attr_lease_other,anim_delay);
 	/* a text obj to display the name of the slice that owns that lease */
-	var otherslicelabel = paper.text (lease.attr("x")+lease.attr("width")/2,
-					  // xxx
-					  lease.attr("y")+lease.attr("height")/2,slicename).attr(txt_otherslice);
+	var otherslicelabel = lease.scheduler.paper.text (lease.attr("x")+lease.attr("width")/2,
+							  // xxx
+							  lease.attr("y")+lease.attr("height")/2,slicename).attr(txt_otherslice);
 	/* hide it right away */
 	otherslicelabel.hide();
 	/* record it */
@@ -496,14 +487,11 @@ function init_scheduler () {
     // Grab the data
     var scheduler = new Scheduler ();
     // parse the table with data, and if not empty, draw the scheduler
-    window.console.log('in init_scheduler');
     scheduler.refresh();
     
     // attach behaviour to buttons
-    var refresh=$$("button#leases_refresh")[0];
-    if (refresh) refresh.onclick = function () { scheduler.refresh();}
-    var submit=$$("button#leases_submit")[0];
-    submit.onclick = function () { scheduler.submit(); }
+    $("leases_submit").onclick = function () { scheduler.submit(); }
+    $("leases_refresh").onclick = function () { scheduler.refresh();}
 
 }