From 2f6667949b9d4dc3f6d65410e0d943c15d8e3093 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 23 Jul 2010 18:48:06 +0200
Subject: [PATCH] has global logic, but still does not submit to the API though

---
 planetlab/css/my_slice.css |   2 +-
 planetlab/slices/leases.js | 289 ++++++++++++++++++++++---------------
 planetlab/slices/slice.php |   9 +-
 3 files changed, 185 insertions(+), 115 deletions(-)

diff --git a/planetlab/css/my_slice.css b/planetlab/css/my_slice.css
index 92d379e..787299a 100644
--- a/planetlab/css/my_slice.css
+++ b/planetlab/css/my_slice.css
@@ -20,7 +20,7 @@ div#toggle-container-my-slice-nodes-add {
 
 /* the container for the scheduler area */
 div#toggle-container-my-slice-nodes-reserve {
-    background: #d0e0f0;
+    background: #def;
 }
 
 div#leases_area {
diff --git a/planetlab/slices/leases.js b/planetlab/slices/leases.js
index bd2e1d7..4ecbe10 100644
--- a/planetlab/slices/leases.js
+++ b/planetlab/slices/leases.js
@@ -1,5 +1,6 @@
 /* need to put some place else in CSS ? */
 
+
 /* decorations / headers */
 
 var txt_nodename = {"font": '"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif', stroke: "none", fill: "#008"};
@@ -14,154 +15,216 @@ var y_sep = 20
 var x_grain = 24;
 var y_node = 15;
 var radius= 6;
-var color_otherslice="#f08080";
-var color_thisslice="#a5e0af";
-var color_free="#f0fcd4";
+/* lease was originally free and is still free */
+var color_lease_free_free="#def";
+/* lease was originally free and is now set for our usage */
+var color_lease_free_mine="#0f0";
+var color_lease_mine_mine="#beb";
+var color_lease_mine_free="#fff";
+var color_lease_other="#f88";
 
 /* other slices name */
 var txt_slice = {"font": '"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif', stroke: "none", fill: "#444",
 		 "font-size": 15 };
 
-var leases_namespace = {
-
-    init_scheduler: function () {
-	// Grab the data
-	var data = [],
-        axisx = [],
-        axisy = [],
-        table = $$("table#leases_data")[0];
-	// no reservable nodes - no data
-	if ( ! table) return;
-	// the nodenames
-	table.getElementsBySelector("tbody>tr>th").each(function (cell) {
-            axisy.push(getInnerText(cell));
-	});
-	// the timeslot labels
-	table.getElementsBySelector("thead>tr>th").each(function (cell) {
-	    /* [0]: timestamp -- [1]: displayable*/
-            axisx.push(getInnerText(cell).split("&"));
-	});
-	// leases - expect colspan to describe length in grains
-	table.getElementsBySelector("tbody>tr>td").each(function (cell) {
-            data.push(new Array (getInnerText(cell),cell.colSpan));
-	});
-	// slicename : the upper-left cell
-	var this_slicename = getInnerText(table.getElementsBySelector("thead>tr>td")[0]);
-	table.hide();
-	var nb_nodes = axisy.length, nb_grains = axisx.length;
-	var total_width = x_nodename + nb_grains*x_grain;
-	var total_height = 2*y_header + nb_nodes*(y_node+y_sep);
-	// no radius supported
-	paper = Raphael("leases_area", total_width, total_height);
-//        color = table.css("color");
+////////////////////////////////////////////////////////////
+// the scheduler object
+function Scheduler (slicename, axisx, axisy, data) {
+
+    this.slicename=slicename;
+    this.axisx=axisx;
+    this.axisy=axisy;
+    this.data=data;
+
+    // utilities to keep track of all the leases
+    this.leases=[];
+    this.append_lease = function (lease) { 
+	this.leases.push(lease);
+    }
 
+    // how many time slots 
+    this.nb_grains = function () { return axisx.length;}
+
+    this.init = function (id) {
+	this.total_width = x_nodename + this.nb_grains()*x_grain; 
+	this.total_height = 2*y_header + this.axisy.length*(y_node+y_sep); 
+	paper = Raphael (id, this.total_width, this.total_height);
+
+	// create the time slots legend
 	var top=0;
-        var left=x_nodename;
+	var left=x_nodename;
 
-	// the time slots legend
 	var col=0;
-        axisx.each (function (timeslot_spec) {
-	    timeslot=timeslot_spec[1];
+	for (var i=0, len=axisx.length; i < len; ++i) {
+	    // pick the printable part
+	    timeslot=axisx[i][1];
 	    var y = top+y_header;
 	    if (col%2 == 0) y += y_header;
 	    col +=1;
 	    var timelabel=paper.text(left,y,timeslot).attr(txt_timeslot)
-		               .attr({"font-size":y_header, "text-anchor":"middle"});
-	    var path_spec="M"+left+" "+(y+y_header/2)+"L"+left+" "+total_height;
+		.attr({"font-size":y_header, "text-anchor":"middle"});
+	    var path_spec="M"+left+" "+(y+y_header/2)+"L"+left+" "+this.total_height;
 	    var rule=paper.path(path_spec).attr({'stroke':1,"fill":color_rules});
 	    left+=x_grain;
-	});
+	}
 
-        top += 2*y_header+y_sep;
-	    
+	// move to the lines below: 
+	top += 2*y_header+y_sep;
+    
 	var data_index=0;
-	axisy.each(function (node) {
+	for (var i=0, len=axisy.length; i<len; ++i) {
+	    node=axisy[i];
 	    left=0;
 	    var nodelabel = paper.text(x_nodename-x_sep,top+y_node/2,node).attr(txt_nodename)
-		                .attr ({"font-size":y_node, "text-anchor":"end","baseline":"bottom"});
-	
+		.attr ({"font-size":y_node, "text-anchor":"end","baseline":"bottom"});
+	    
 	    left += x_nodename;
 	    var grain=0;
-	    while (grain < nb_grains) {
+	    while (grain < this.nb_grains()) {
 		slicename=data[data_index][0];
 		duration=data[data_index][1];
 		var lease=paper.rect (left,top,x_grain*duration,y_node,radius);
-		var color;
+		lease.nodename=node;
 		if (slicename == "") {
-		    color=color_free;
-		    lease.click ( function (e) { window.console.log ('free ' + lease.from_time + '--' + lease.until_time); } );
-		} else if (slicename == this_slicename) {
-		    color=color_thisslice;
-		    lease.click ( function (e) { window.console.log ('mine ' + lease.from_time + '--' + lease.until_time); } );
+		    lease.initial="free";
+		    lease_methods.init_free(lease);
+		} else if (slicename == this.slicename) {
+		    lease.initial="mine";
+		    lease_methods.init_mine(lease);
 		} else {
-		    color=color_otherslice;
-		    /* to display the name of the slice that owns that lease */
-		    var slicelabel = paper.text (left+(x_grain*duration)/2,top+y_node/2,slicename) 
-			                   .attr(txt_slice);
-		    /* hide it right away */
-		    slicelabel.hide();
-		    lease.label=slicelabel;
-		    lease.hover ( function (e) { this.label.toFront(); this.label.show(); },
-				  function (e) { this.label.hide(); } ); 
+		    lease_initial="other";
+		    lease_methods.init_other(lease,slicename);
 		}
-		lease.attr("fill",color);
-		lease.from_time = axisx[grain%nb_grains][0];
+		lease.from_time = axisx[grain%this.nb_grains()][0];
 		grain += duration;
-		lease.until_time = axisx[grain%nb_grains][0];
+		lease.until_time = axisx[grain%this.nb_grains()][0];
+		// record scheduler in lease
+		lease.scheduler=this;
+		// and vice versa
+		this.append_lease(lease);
+		// move on with the loop
 		left += x_grain*duration;
 		data_index +=1;
 	    }
 	    top += y_node + y_sep;
-	});
+	};
     }
 
-/*
-	r.rect(10, 10, total_width-20, total_height-20, radius).attr({fill: "#888", stroke: "#fff"});
-	for (var i = 0, ii = axisx.length; i < ii; i++) {
-            r.text(leftgutter + X * (i + .5), 294, axisx[i]).attr(txt);
-	}
-	for (var i = 0, ii = axisy.length; i < ii; i++) {
-            r.text(10, Y * (i + .5), axisy[i]).attr(txt);
+    this.submit = function () {
+	for (var i=0, len=this.leases.length; i<len; ++i) {
+	    var lease=this.leases[i];
+	    if (lease.current != lease.initial) {
+		var method=(lease.current=='free') ? 'DeleteLeases' : 'AddLeases';
+		window.console.log(method + "(" + 
+				   "[" + lease.nodename + "]," + 
+				   this.slicename + "," +
+				   lease.from_time + "," +
+				   lease.until_time + ')');
+	    }
 	}
-	var o = 0;
-	for (var i = 0, ii = axisy.length; i < ii; i++) {
-            for (var j = 0, jj = axisx.length; j < jj; j++) {
-		var R = data[o] && Math.min(Math.round(Math.sqrt(data[o] / Math.PI) * 4), max);
-		if (R) {
-                    (function (dx, dy, R, value) {
-			var color = "hsb(" + [(1 - R / max) * .5, 1, .75] + ")";
-			var dt = r.circle(dx + 60 + R, dy + 10, R).attr({stroke: "none", fill: color});
-			if (R < 6) {
-                            var bg = r.circle(dx + 60 + R, dy + 10, 6).attr({stroke: "none", fill: "#000", opacity: .4}).hide();
-			}
-			var lbl = r.text(dx + 60 + R, dy + 10, data[o])
-                            .attr({"font": '10px Fontin-Sans, Arial', stroke: "none", fill: "#fff"}).hide();
-			var dot = r.circle(dx + 60 + R, dy + 10, max).attr({stroke: "none", fill: "#000", opacity: 0});
-			dot[0].onmouseover = function () {
-                            if (bg) {
-				bg.show();
-                            } else {
-				var clr = Raphael.rgb2hsb(color);
-				clr.b = .5;
-				dt.attr("fill", Raphael.hsb2rgb(clr).hex);
-                            }
-                            lbl.show();
-			};
-			dot[0].onmouseout = function () {
-                            if (bg) {
-				bg.hide();
-                            } else {
-				dt.attr("fill", color);
-                            }
-                            lbl.hide();
-			};
-                    })(leftgutter + X * (j + .5) - 60 - R, Y * (i + .5) - 10, R, data[o]);
-		}
-		o++;
-            }
+    }
+
+    this.clear = function () {
+	for (var i=0, len=this.leases.length; i<len; ++i) {
+	    var lease=this.leases[i];
+	    if (lease.current != lease.initial) {
+		if (lease.initial == 'free') lease_methods.init_free(lease,lease_methods.click_mine);
+		else			     lease_methods.init_mine(lease,lease_methods.click_free);
+	    }
 	}
     }
-*/
-};
+	
+
+} // Scheduler
+
+//////////////////////////////////////// couldn't find how to inhererit from the raphael objects...
+var lease_methods = {
+    
+    init_free: function (lease, unclick) {
+	lease.current="free";
+	// set color
+	lease.attr("fill", (lease.initial=="free") ? color_lease_free_free : color_lease_mine_free);
+	// keep track of the current status
+	// record action
+	lease.click (lease_methods.click_free);
+	if (unclick) lease.unclick(unclick);
+    },
+		     
+    // find out all the currently free leases that overlap this one
+    click_free: function (event) {
+	var scheduler = this.scheduler;
+	for (var i=0, len=scheduler.leases.length; i<len; ++i) {
+	    scan=scheduler.leases[i];
+	    // overlap ?
+	    if (scan.from_time<=this.from_time && scan.until_time>=this.until_time) {
+		if (scan.current == "free") lease_methods.init_mine(scan,lease_methods.click_free);
+		// the other ones just remain as they are
+	    }
+	}
+    },
+
+    init_mine: function (lease, unclick) {
+	lease.current="mine";
+	lease.attr("fill", (lease.initial=="mine") ? color_lease_mine_mine : color_lease_free_mine);
+	lease.click (lease_methods.click_mine);
+	if (unclick) lease.unclick(unclick);
+    },
+
+    click_mine: function (event) {
+	// this lease was originally free but is now marked for booking
+	// we free just this lease
+	if (this.initial=="free") 
+	    lease_methods.init_free(this, lease_methods.click_mine);
+	// this lease if ours, same for now
+	else
+	    lease_methods.init_free(this, lease_methods.click_mine);
+    },
+
+
+    init_other: function (lease, slicename) {
+	lease.attr ("fill", color_lease_other);
+	/* a text obj to display the name of the slice that owns that lease */
+	var slicelabel = paper.text (lease.attr("x")+lease.attr("width")/2,
+				     lease.attr("y")+lease.attr("height")/2,slicename).attr(txt_slice);
+	/* hide it right away */
+	slicelabel.hide();
+	/* record it */
+	lease.label=slicelabel;
+	lease.hover ( function (e) { this.label.toFront(); this.label.show(); },
+		      function (e) { this.label.hide(); } ); 
+    },
+}
+
+function init_scheduler () {
+    // Grab the data
+    var data = [], axisx = [], axisy = [];
+    var table = $$("table#leases_data")[0];
+    // no reservable nodes - no data
+    if ( ! table) return;
+    // the nodenames
+    table.getElementsBySelector("tbody>tr>th").each(function (cell) {
+        axisy.push(getInnerText(cell));
+    });
+    // the timeslot labels
+    table.getElementsBySelector("thead>tr>th").each(function (cell) {
+	/* [0]: timestamp -- [1]: displayable*/
+        axisx.push(getInnerText(cell).split("&"));
+    });
+    // leases - expect colspan to describe length in grains
+    table.getElementsBySelector("tbody>tr>td").each(function (cell) {
+        data.push(new Array (getInnerText(cell),cell.colSpan));
+    });
+    // slicename : the upper-left cell
+    var scheduler = new Scheduler (getInnerText(table.getElementsBySelector("thead>tr>td")[0]), axisx, axisy, data);
+    table.hide();
+    // leases_area is a <div> created by slice.php as a placeholder
+    scheduler.init ("leases_area");
+
+    var submit=$$("button#leases_submit")[0];
+    submit.onclick = function () { scheduler.submit(); }
+    var clear=$$("button#leases_clear")[0];
+    clear.onclick = function () { scheduler.clear(); }
+
+}
 
-Event.observe(window, 'load', leases_namespace.init_scheduler);
+Event.observe(window, 'load', init_scheduler);
diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index 64a5d05..f1dbef8 100644
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -559,6 +559,8 @@ if ($count && $privileges) {
     echo "<th>" . ($start+$i*$grain) . "&" . strftime("%H:%M",$start+$i*$grain). "</th>";
   echo "</tr></thead><tbody>";
   // todo - sort on hostnames
+  function sort_hostname ($a,$b) { return ($a['hostname']<$b['hostname'])?-1:1;}
+  usort($reservable_nodes,sort_hostname);
   foreach ($reservable_nodes as $node) {
     echo "<tr><th scope='row'>". $node['hostname'] . "</th>";
     $hostname=$node['hostname'];
@@ -583,8 +585,13 @@ if ($count && $privileges) {
     echo "</tr>";
   }
 
-  echo "</tbody></table>";
+  echo "</tbody></table>\n";
   echo "<div id='leases_area'></div>";
+  echo "<div id='leases_control'>";
+  echo "<button id='leases_submit' type='button'>Submit</button>";
+  echo "<button id='leases_clear' type='button'>Clear</button>";
+  echo "</div>";
+      
   $toggle_nodes->end();
  }
 $toggle->end();
-- 
2.47.0