Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --combined portal/sliceresourceview.py
index bdffa3f,3ba1084..7d4ab08
--- 1/portal/sliceresourceview.py
--- 2/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@@ -17,8 -17,9 +17,9 @@@ from plugins.querytable              im
  from plugins.googlemap               import GoogleMap
  from plugins.queryupdater            import QueryUpdater
  from plugins.testbeds                import TestbedsPlugin
+ from plugins.scheduler2              import Scheduler2
  
 -from theme import ThemeView
 +from myslice.theme import ThemeView
  
  class SliceResourceView (LoginRequiredView, ThemeView):
      template_name = "slice-resource-view.html"
@@@ -56,15 -57,23 +57,23 @@@
          main_query_init_key = 'urn'
          aq = AnalyzedQuery(main_query, metadata=metadata)
          page.enqueue_query(main_query, analyzed_query=aq)
+         sq_resource    = aq.subquery('resource')
+         sq_lease       = aq.subquery('lease')
  
          query_resource_all = Query.get('resource').select(resource_fields)
          page.enqueue_query(query_resource_all)
  
-         sq_resource    = aq.subquery('resource')
-         sq_lease       = aq.subquery('lease')
+         # leases query
+         lease_md = metadata.details_by_object('lease')
+         lease_fields = [column['name'] for column in lease_md['column']]
+ 
+         query_all_lease = Query.get('lease').select(lease_fields)
+         page.enqueue_query(query_all_lease)
+ 
+         print "!!!!!!!!!!   query leases = ",query_all_lease
  
          # --------------------------------------------------------------------------
-         # RESOURCES
+         # RESOURCES LIST
          # resources as a list using datatable plugin
   
          list_resources = QueryTable(
@@@ -83,7 -92,7 +92,7 @@@
          )
  
          # --------------------------------------------------------------------------
-         # RESOURCES
+         # RESOURCES MAP
          # the resources part is made of a Tabs (Geographic, List), 
  
          map_resources  = GoogleMap(
@@@ -105,6 -114,20 +114,20 @@@
              zoom       = 4,
          )
  
+         # --------------------------------------------------------------------------
+         # LEASES Nitos Scheduler
+         # Display the leases reservation timeslots of the resources
+ 
+         resources_as_scheduler2 = Scheduler2( 
+             page       = page,
+             domid      = 'scheduler',
+             title      = 'Scheduler',
+             # this is the query at the core of the slice list
+             query = sq_resource,
+             query_all_resources = query_resource_all,
+             query_lease = query_all_lease,
+         )
+ 
          # --------------------------------------------------------------------------
          # QueryUpdater (Pending Operations)
   
@@@ -125,7 -148,6 +148,6 @@@
  
          network_md = metadata.details_by_object('network')
          network_fields = [column['name'] for column in network_md['column']]
-         print "sliceresourceview.py ====> ",network_fields
  
          query_network = Query.get('network').select(network_fields)
          page.enqueue_query(query_network)
@@@ -150,6 -172,7 +172,7 @@@
          template_env['list_resources'] = list_resources.render(self.request)
          template_env['filter_testbeds'] = filter_testbeds.render(self.request)
          template_env['map_resources'] = map_resources.render(self.request)
+         template_env['scheduler'] = resources_as_scheduler2.render(self.request)
          template_env['pending_resources'] = pending_resources.render(self.request)
          template_env["theme"] = self.theme
          template_env["username"] = request.user

diff --combined portal/templates/slice-resource-view.html
index 69f8bc1,9200f00..3831a5e
--- 1/portal/templates/slice-resource-view.html
--- 2/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@@ -1,5 -1,4 +1,5 @@@
  {% extends "layout_wide.html" %}
 +{% load portal_filters %}
  
  {% block head %}
  <!-- <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyC1RUj824JAiHRVqgc2CSIg4CpKHhh84Lw&sensor=false"></script> -->
@@@ -25,7 -24,7 +25,7 @@@
        </div>
        <div class="col-md-10" style="height:100%;">
                <div class="row">
 -                      {% include theme|add:"_widget-slice-sections.html" %}
 +                      {% widget '_widget-slice-sections.html' %}
                </div>
                <!-- <div class="row slice-pending">
                        <ul class="nav nav-pills">
@@@ -64,7 -63,7 +64,7 @@@
                  {{map_resources}}
                        </div>
                        <div id="scheduler-tab" class="panel" style="height:370px;display:none;">
-                 {{scheduler_leases}}
+                 {{scheduler}}
                        </div>
                        <div id="pending" class="panel" style="height:370px;display:none;">
                  {{pending_resources}}