From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 29 Nov 2013 09:30:26 +0000 (+0100)
Subject: Merge branch 'master' into scheduler
X-Git-Tag: myslice-0.3-0~103
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=03839166e30819c37290f33056f44aaee1583bfc;hp=-c;p=unfold.git

Merge branch 'master' into scheduler

Conflicts:
	plugins/googlemap/static/js/googlemap.js
---

03839166e30819c37290f33056f44aaee1583bfc
diff --combined plugins/googlemap/static/js/googlemap.js
index 23345a27,b8bbf538..d6006744
--- a/plugins/googlemap/static/js/googlemap.js
+++ b/plugins/googlemap/static/js/googlemap.js
@@@ -27,10 -27,10 +27,10 @@@ googlemap_debug_detailed=false
              this.in_set_backlog = [];
  
              // we keep a couple of global hashes
 -	    // lat_lon --> { marker, <ul> }
 -	    // id --> { <li>, <input> }
 -	    this.by_lat_lon = {};
 -	    this.by_id = {};
 +            // lat_lon --> { marker, <ul> }
 +            // hrn --> { <li>, <input> }
 +            this.by_lat_lon = {};
 +            this.by_hrn = {};
  
              /* XXX Events */
              this.elmt().on('show', this, this.on_show);
@@@ -41,15 -41,24 +41,24 @@@
              this.object = query.object;
  
              var keys = manifold.metadata.get_key(this.object);
 -	    // 
 +            // 
              this.key = (keys && keys.length == 1) ? keys[0] : null;
  
+ 	    // xxx temporary hack
+ 	    // as of nov. 28 2013 we have here this.key='urn', but in any place where
+ 	    // the code tries to access record[this.key] the records only have
+ 	    // keys=type,hrn,network_hrn,hostname
+ 	    // so for now we force using hrn instead
+ 	    // as soon as record have their primary key set this line can be removed
+ 	    // see also same hack in querytable
+ 	    this.key= (this.key == 'urn') ? 'hrn' : this.key;
+ 
              //// Setup query and record handlers 
 -	    // this query is the one about the slice itself 
 -	    // event related to this query will trigger callbacks like on_new_record
 +            // this query is the one about the slice itself 
 +            // event related to this query will trigger callbacks like on_new_record
              this.listen_query(options.query_uuid);
 -	    // this one is the complete list of resources
 -	    // and will be bound to callbacks like on_all_new_record
 +            // this one is the complete list of resources
 +            // and will be bound to callbacks like on_all_new_record
              this.listen_query(options.query_all_uuid, 'all');
  
              /* GUI setup and event binding */
@@@ -59,7 -68,7 +68,7 @@@
          /* PLUGIN EVENTS */
  
          on_show: function(e) {
 -	    if (googlemap_debug) messages.debug("googlemap.on_show");
 +            if (googlemap_debug) messages.debug("googlemap.on_show");
              var googlemap = e.data;
              google.maps.event.trigger(googlemap.map, 'resize');
          }, // on_show
@@@ -75,132 -84,124 +84,124 @@@
              var myOptions = {
                  zoom: this.options.zoom,
                  center: center,
 -		scrollwheel: false,
 +                scrollwheel: false,
                  mapTypeId: google.maps.MapTypeId.ROADMAP,
              }
 -	    
 +            
              var domid = this.options.plugin_uuid + '--' + 'googlemap';
 -	    var elmt = document.getElementById(domid);
 -	    if (googlemap_debug) messages.debug("gmap.initialize_map based on  domid=" + domid + " elmt=" + elmt);
 +            var elmt = document.getElementById(domid);
 +            if (googlemap_debug) messages.debug("gmap.initialize_map based on  domid=" + domid + " elmt=" + elmt);
              this.map = new google.maps.Map(elmt, myOptions);
              this.infowindow = new google.maps.InfoWindow();
          }, // initialize_map
  
-         // xxx probably not the right place
-         // The function accepts both records and their key 
-         record_hrn : function (record) {
-             var key_value;
-             switch (manifold.get_type(record)) {
+         // The function accepts both records and their id
+ 	// record.key points to the name of the primary key for this record
+ 	// typically this is 'urn'
+ 	record_id : function (input) {
+             var id;
+             switch (manifold.get_type(input)) {
              case TYPE_VALUE:
-                 key_value = record;
+ 		id = input;
                  break;
              case TYPE_RECORD:
-                 if ( ! this.key in record ) return;
-                 key_value = record[this.key];
+ 		if ( ! this.key in input ) return;
+                 id = input[this.key];
                  break;
              default:
-                 throw "Not implemented";
+                 throw "googlemap.record_id: not implemented";
                  break;
              }
-             // XXX BACKSLASHES original code was reading like this
-             //return this.escape_id(key_value).replace(/\\/g, '');
-             //  however this sequence removes backslashes from hrn's and as a result
-             // queryupdater was getting all mixed up
-             // querytable does publish hrn's with backslashes and that seems like the thing to do
-             return key_value;
-         },            
- 
-         // return { marker: gmap_marker, ul : <ul DOM> }
-         create_marker_struct: function (object,lat,lon) {
-             // the DOM fragment
-             var dom = $("<p>").addClass("geo").append(object+"(s)");
-             var ul = $("<ul>").addClass("geo");
-             dom.append(ul);
-             // add a gmap marker to the mix
-             var marker = new google.maps.Marker({
-                 position: new google.maps.LatLng(lat, lon),
+ 	    return id;
+ 	},
+ 
+ 	// return { marker: gmap_marker, ul : <ul DOM> }
+ 	create_marker_struct: function (object,lat,lon) {
+ 	    // the DOM fragment
+ 	    var dom = $("<p>").addClass("geo").append(object+"(s)");
+ 	    var ul = $("<ul>").addClass("geo");
+ 	    dom.append(ul);
+ 	    // add a gmap marker to the mix
+ 	    var marker = new google.maps.Marker({
+ 		position: new google.maps.LatLng(lat, lon),
                  title: object,
 -		// gmap can deal with a DOM element but not a jquery object
 +                // gmap can deal with a DOM element but not a jquery object
                  content: dom.get(0),
              }); 
-             return {marker:marker, ul:ul};
-         },
- 
-         // add an entry in the marker <ul> tag for that record
-         // returns { checkbox : <input DOM> }
-         create_record_checkbox: function (record,ul,checked) {
-             var checkbox = $("<input>", {type:'checkbox', checked:checked, class:'geo'});
-             var hrn=this.record_hrn(record);
-             ul.append($("<li>").addClass("geo").append(checkbox).
-                       append($("<span>").addClass("geo").append(hrn)));
-             var googlemap=this;
-             // the callback for when a user clicks
-             // NOTE: this will *not* be called for changes done by program
-             checkbox.change( function (e) {
-                 if (googlemap_debug) messages.debug("googlemap click handler checked= " + this.checked + " hrn=" + hrn);
-                 manifold.raise_event (googlemap.options.query_uuid, 
-                                       this.checked ? SET_ADD : SET_REMOVED, hrn);
-             });
-             return checkbox;
-         },
-             
-         // retrieve DOM checkbox and make sure it is checked/unchecked
+ 	    return {marker:marker, ul:ul};
+ 	},
+ 
+ 	// given an input <ul> element, this method inserts a <li> with embedded checkbox 
+ 	// for displaying/selecting the resource corresponding to the input record
+ 	// returns the created <input> element for further checkbox manipulation
+ 	create_record_checkbox: function (record,ul,checked) {
+ 	    var checkbox = $("<input>", {type:'checkbox', checked:checked, class:'geo'});
+ 	    var id=this.record_id(record);
+ 	    // use hrn as far as possible for displaying
+ 	    var label= ('hrn' in record) ? record.hrn : id;
+ 	    ul.append($("<li>").addClass("geo").append(checkbox).
+ 		      append($("<span>").addClass("geo").append(label)));
+ 	    var googlemap=this;
+ 	    // the callback for when a user clicks
+ 	    // NOTE: this will *not* be called for changes done by program
+ 	    checkbox.change( function (e) {
+ 		manifold.raise_event (googlemap.options.query_uuid, this.checked ? SET_ADD : SET_REMOVED, id);
+ 	    });
+ 	    return checkbox;
+ 	},
+ 	    
+ 	warning: function (record,message) {
+ 	    try {messages.warning (message+" -- hostname="+record.hostname); }
+ 	    catch (err) {messages.warning (message); }
+ 	},
+ 	    
+ 	// retrieve DOM checkbox and make sure it is checked/unchecked
          set_checkbox: function(record, checked) {
-             var hrn=this.record_hrn (record);
-             if (! hrn) { 
-                 try {messages.warning ("googlemap.set_checkbox: record has no hrn -- hostname="+record.hostname); }
-                 catch (err) {messages.warning ("googlemap.set_checkbox: record has no hrn"); }
-                 return; 
-             }
-             var checkbox_s = this.by_hrn [ hrn ];
-             if (! checkbox_s ) { messages.warning ("googlemap.set_checkbox: could not spot checkbox for hrn "+hrn); return; }
-             checkbox_s.checkbox.prop('checked',checked);
+ 	    var id=this.record_id (record);
+ 	    if (! id) { 
+ 		this.warning (record, "googlemap.set_checkbox: record has no id");
+ 		return; 
+ 	    }
+ 	    var checkbox = this.by_id [ id ];
+ 	    if (! checkbox ) { 
+ 		this.warning (record, "googlemap.set_checkbox: checkbox not found");
+ 		return; 
+ 	    }
+ 	    checkbox.prop('checked',checked);
          }, // set_checkbox
  
 -	// this record is *in* the slice
 +        // this record is *in* the slice
          new_record: function(record) {
 -	        if (googlemap_debug_detailed) messages.debug ("new_record");
 +                if (googlemap_debug_detailed) messages.debug ("new_record");
              if (!(record['latitude'])) return false;
 -	    
 +            
              // get the coordinates
              var latitude=unfold.get_value(record['latitude']);
              var longitude=unfold.get_value(record['longitude']);
              var lat_lon = latitude + longitude;
  
-                 // check if we've seen anything at that place already
-                 // xxx might make sense to allow for some fuzziness, 
-                 // i.e. consider 2 places equal if not further away than 300m or so...
-                 var marker_s = this.by_lat_lon [lat_lon];
-                 if ( marker_s == null ) {
-                         marker_s = this.create_marker_struct (this.object, latitude, longitude);
-                         this.by_lat_lon [ lat_lon ] = marker_s;
-                         this.arm_marker(marker_s.marker, this.map);
-                 }
-             
-                 // now add a line for this resource in the marker
-                 // xxx should compute checked here ?
-                 // this is where the checkbox will be appended
-                 var ul=marker_s.ul;
-                 var checkbox = this.create_record_checkbox (record, ul, false);
-                 if ( ! this.key in record ) return;
-             var key_value = record[this.key];
-                 // see XXX BACKSLASHES 
-                 //var hrn = this.escape_id(key_value).replace(/\\/g, '');
-                 var hrn = key_value;
-             this.by_hrn[hrn] = {
-                         checkbox: checkbox,
-                         // xxx Thierry sept 2013
-                         // xxx actually we might have just used a domid-based scheme instead of the hash
-                         // since at this point we only need to retrieve the checkbox from an hrn
-                         // but I was not sure enough that extra needs would not show up so I kept this in place
-                         // xxx not sure these are actually useful :
-                 value: key_value,
-                 record: record,
-             }
+     	    // check if we've seen anything at that place already
+     	    // xxx might make sense to allow for some fuzziness, 
+     	    // i.e. consider 2 places equal if not further away than 300m or so...
+     	    var marker_s = this.by_lat_lon [lat_lon];
+     	    if ( marker_s == null ) {
+         	marker_s = this.create_marker_struct (this.object, latitude, longitude);
+         	this.by_lat_lon [ lat_lon ] = marker_s;
+         	this.arm_marker(marker_s.marker, this.map);
+ 	    }
+ 	    
+     	    // now add a line for this resource in the marker
+     	    // xxx should compute checked here ?
+     	    // this is where the checkbox will be appended
+     	    var ul=marker_s.ul;
+     	    var checkbox = this.create_record_checkbox (record, ul, false);
+ 	    var id=this.record_id(record);
+ 	    // used to keep a dict here, but only checkbox is required
+             this.by_id[id] = checkbox;
          }, // new_record
  
          arm_marker: function(marker, map) {
 -	    if (googlemap_debug_detailed) messages.debug ("arm_marker content="+marker.content);
 +            if (googlemap_debug_detailed) messages.debug ("arm_marker content="+marker.content);
              var googlemap = this;
              google.maps.event.addListener(marker, 'click', function () {
                  googlemap.infowindow.close();
@@@ -213,7 -214,7 +214,7 @@@
  
          /*************************** RECORD HANDLER ***************************/
          on_new_record: function(record) {
 -	    if (googlemap_debug_detailed) messages.debug("on_new_record");
 +            if (googlemap_debug_detailed) messages.debug("on_new_record");
              if (this.received_all)
                  // update checkbox for record
                  this.set_checkbox(record, true);
@@@ -223,36 -224,36 +224,36 @@@
          },
  
          on_clear_records: function(record) {
 -	    if (googlemap_debug_detailed) messages.debug("on_clear_records");
 +            if (googlemap_debug_detailed) messages.debug("on_clear_records");
          },
  
          // Could be the default in parent
          on_query_in_progress: function() {
 -	    if (googlemap_debug) messages.debug("on_query_in_progress (spinning)");
 +            if (googlemap_debug) messages.debug("on_query_in_progress (spinning)");
              this.spin();
          },
  
          on_query_done: function() {
 -	    if (googlemap_debug) messages.debug("on_query_done");	    
 +            if (googlemap_debug) messages.debug("on_query_done");            
              if (this.received_all) {
                  this.unspin();
 -	    }
 +            }
              this.received_set = true;
          },
  
          on_field_state_changed: function(data) {
 -	    if (googlemap_debug_detailed) messages.debug("on_field_state_changed");	    
 +            if (googlemap_debug_detailed) messages.debug("on_field_state_changed");            
              switch(data.request) {
 -            case FIELD_REQUEST_ADD:
 -            case FIELD_REQUEST_ADD_RESET:
 -                this.set_checkbox(data.value, true);
 -                break;
 -            case FIELD_REQUEST_REMOVE:
 -            case FIELD_REQUEST_REMOVE_RESET:
 -                this.set_checkbox(data.value, false);
 -                break;
 -            default:
 -                break;
 +                case FIELD_REQUEST_ADD:
 +                case FIELD_REQUEST_ADD_RESET:
 +                    this.set_checkbox(data.value, true);
 +                    break;
 +                case FIELD_REQUEST_REMOVE:
 +                case FIELD_REQUEST_REMOVE_RESET:
 +                    this.set_checkbox(data.value, false);
 +                    break;
 +                default:
 +                    break;
              }
          },
  
@@@ -260,22 -261,22 +261,22 @@@
          // all : this 
  
          on_all_new_record: function(record) {
 -	    if (googlemap_debug_detailed) messages.debug("on_all_new_record");
 +            if (googlemap_debug_detailed) messages.debug("on_all_new_record");
              this.new_record(record);
          },
  
          on_all_clear_records: function() {
 -	    if (googlemap_debug) messages.debug("on_all_clear_records");	    
 +            if (googlemap_debug) messages.debug("on_all_clear_records");            
          },
  
          on_all_query_in_progress: function() {
 -	    if (googlemap_debug) messages.debug("on_all_query_in_progress (spinning)");
 +            if (googlemap_debug) messages.debug("on_all_query_in_progress (spinning)");
              // XXX parent
              this.spin();
          },
  
          on_all_query_done: function() {
 -	    if (googlemap_debug) messages.debug("on_all_query_done");
 +            if (googlemap_debug) messages.debug("on_all_query_done");
  
              // MarkerClusterer
              var markers = [];
@@@ -297,10 -298,10 +298,10 @@@
                  $.each(this.in_set_backlog, function(i, record) {
                      googlemap.set_checkbox(record, true);
                  });
 -		// reset 
 -		googlemap.in_set_backlog = [];
 +                // reset 
 +                googlemap.in_set_backlog = [];
  
 -		if (googlemap_debug) messages.debug("unspinning");
 +                if (googlemap_debug) messages.debug("unspinning");
                  this.unspin();
              }
              this.received_all = true;
diff --combined portal/sliceview.py
index 8b0c552c,753fed26..42cc8ba1
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@@ -15,7 -15,6 +15,7 @@@ from plugins.querytable              im
  from plugins.queryupdater            import QueryUpdater
  from plugins.googlemap               import GoogleMap
  from plugins.senslabmap              import SensLabMap
 +from plugins.scheduler               import Scheduler
  from plugins.querycode               import QueryCode
  from plugins.query_editor            import QueryEditor
  from plugins.active_filters          import ActiveFilters
@@@ -60,7 -59,7 +60,7 @@@ class SliceView (LoginRequiredAutoLogou
                  'slice_hrn',
                  'resource.hrn', 'resource.hostname', 'resource.type', 
                  'resource.network_hrn',
 -                #'lease.urn',
 +                'lease.urn',
                  'user.user_hrn',
                  #'application.measurement_point.counter'
          )
@@@ -188,15 -187,6 +188,15 @@@
                  },
              )
  
 +        resources_as_scheduler = Scheduler(
 +            page        = page,
 +            title       = 'Scheduler',
 +            domid       = 'scheduler',
 +            query       = sq_resource,
 +            query_all_resources = query_resource_all,
 +            query_lease = sq_lease,
 +        )
 +
         # with the new 'Filter' stuff on top, no need for anything but the querytable
          resources_as_list_area = resources_as_list 
  
@@@ -205,12 -195,11 +205,13 @@@
                                  togglable=True,
                                  title="Resources",
                                  outline_complete=True,
 -                                sons=[ resources_as_gmap, 
 -                                       resources_as_3dmap,
 +                                sons=[ 
 +                                       resources_as_scheduler,
 +                                       #resources_as_gmap, 
 +                                       #resources_as_3dmap,
                                         resources_as_list_area, ],
                                  active_domid = 'resources-map',
+                                 persistent_active=True,
                                  )
          main_stack.insert (resources_area)