X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=8b0c552ccfc818ec2c2fb3d7bb0e281a1a3cb24c;hb=63d95a63befff4f3578163ae1fdb89a29009e7ee;hp=3822321007c5ee3d9f662d5fc340d71e5275b546;hpb=78f61768d16b75e86ad003f011a16c25f777db76;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 38223210..8b0c552c 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -15,6 +15,7 @@ from plugins.querytable              import QueryTable
 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
@@ -59,7 +60,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                 'slice_hrn',
                 'resource.hrn', 'resource.hostname', 'resource.type', 
                 'resource.network_hrn',
-                #'lease.urn',
+                'lease.urn',
                 'user.user_hrn',
                 #'application.measurement_point.counter'
         )
@@ -156,6 +157,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             togglable  = False,
             query      = sq_resource,
             query_all  = query_resource_all,
+            googlemap_api_key = Config().googlemap_api_key(),
             checkboxes = True,
             # center on Paris
             latitude   = 49.,
@@ -163,16 +165,13 @@ class SliceView (LoginRequiredAutoLogoutView):
             zoom       = 4,
         )
 
-# because (senslab)map.css changes stuff for *all* canvas elements
-# it destroys the googlemap behaviour
-# turning this off for now until Anthony can fix that
-#        resources_as_3dmap = SensLabMap(
-#            page       = page,
-#            title      = '3D Map',
-#            domid      = 'senslabmap',
-#            query      = sq_resource,
-#            query_all  = query_resource_all,
-#        )
+        resources_as_3dmap = SensLabMap(
+            page       = page,
+            title      = '3D Map',
+            domid      = 'senslabmap',
+            query      = sq_resource,
+            query_all  = query_resource_all,
+        )
 
         resources_as_list = QueryTable( 
             page       = page,
@@ -189,6 +188,15 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
+        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 
 
@@ -197,9 +205,10 @@ class SliceView (LoginRequiredAutoLogoutView):
                                 togglable=True,
                                 title="Resources",
                                 outline_complete=True,
-                                sons=[ resources_as_gmap, 
-# see above
-#                                       resources_as_3dmap,
+                                sons=[ 
+                                       resources_as_scheduler,
+                                       #resources_as_gmap, 
+                                       #resources_as_3dmap,
                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
                                 )